Commit 1db7aa26 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-05-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Remove an unused function and a MAINTAINERS update.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210513133617.xq77wwrehpuh7yn2@hendrix
parents 875d598d c55b44c9

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com> 
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ F: drivers/clk/sunxi/ 
ARM/Allwinner sunXi SoC support

M:	Maxime Ripard <mripard@kernel.org>

M:	Chen-Yu Tsai <wens@csie.org>

R:	Jernej Skrabec <jernej.skrabec@siol.net>

R:	Jernej Skrabec <jernej.skrabec@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@ -5089,7 +5089,7 @@ S: Maintained 
F:	drivers/net/fddi/defza.*









DEINTERLACE DRIVERS FOR ALLWINNER H3









M:	Jernej Skrabec <jernej.skrabec@siol.net>









M:	Jernej Skrabec <jernej.skrabec@gmail.com>









L:	linux-media@vger.kernel.org









S:	Maintained









T:	git git://linuxtv.org/media_tree.git








@@ -5632,7 +5632,7 @@ F:	include/linux/power/smartreflex.h







DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE









M:	Maxime Ripard <mripard@kernel.org>









M:	Chen-Yu Tsai <wens@csie.org>









R:	Jernej Skrabec <jernej.skrabec@siol.net>









R:	Jernej Skrabec <jernej.skrabec@gmail.com>









L:	dri-devel@lists.freedesktop.org









S:	Supported









T:	git git://anongit.freedesktop.org/drm/drm-misc








@@ -6023,7 +6023,7 @@ M:	Neil Armstrong <narmstrong@baylibre.com>







M:	Robert Foss <robert.foss@linaro.org>









R:	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>









R:	Jonas Karlman <jonas@kwiboo.se>









R:	Jernej Skrabec <jernej.skrabec@siol.net>









R:	Jernej Skrabec <jernej.skrabec@gmail.com>









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc









F:	drivers/gpu/drm/bridge/








@@ -15815,7 +15815,7 @@ F:	include/uapi/linux/rose.h







F:	net/rose/

















ROTATION DRIVER FOR ALLWINNER A83T









M:	Jernej Skrabec <jernej.skrabec@siol.net>









M:	Jernej Skrabec <jernej.skrabec@gmail.com>









L:	linux-media@vger.kernel.org









S:	Maintained









T:	git git://linuxtv.org/media_tree.git
































drivers/gpu/drm/vc4/vc4_vec.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -197,12 +197,6 @@ struct vc4_vec_connector {







	struct drm_encoder *encoder;









};



















static inline struct vc4_vec_connector *









to_vc4_vec_connector(struct drm_connector *connector)









{









	return container_of(connector, struct vc4_vec_connector, base);









}



















enum vc4_vec_tv_mode_id {









	VC4_VEC_TV_MODE_NTSC,









	VC4_VEC_TV_MODE_NTSC_J,