Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46972c03 authored Oct 11, 2018 by Dave Airlie

Merge tag 'drm-misc-next-fixes-2018-10-10' of...

Merge tag 'drm-misc-next-fixes-2018-10-10' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

- Fix build failure without CONFIG_DRM_FBDEV_EMULATION (Arnd)
- Add Maxime to drm-misc maintainer group (Sean)

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sean Paul <sean@poorly.run>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181010203951.GA229456@art_vandelay

parents 66c9e573 7372fd04

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -4755,8 +4755,8 @@ F: include/uapi/drm/
		F: include/linux/vga*

		DRM DRIVERS AND MISC GPU PATCHES
		M: Gustavo Padovan <gustavo@padovan.org>
		M: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
		M: Maxime Ripard <maxime.ripard@bootlin.com>
		M: Sean Paul <sean@poorly.run>
		W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
		S: Maintained

drivers/gpu/drm/imx/imx-drm-core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,10 +35,8 @@

		#define MAX_CRTC 4

		#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)
		static int legacyfb_depth = 16;
		module_param(legacyfb_depth, int, 0444);
		#endif

		DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops);