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

Commit 4d1608ee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2018-08-22' of... 

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

 into drm-next

- Add an unprepare delay to the tv123wam panel (Sean)
- Update seanpaul's email in MAINTAINERS (Sean)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180822193850.GA214158@art_vandelay
parents 3d63a3c1 4acd8d01

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -4663,7 +4663,7 @@ F: include/linux/vga* 
DRM DRIVERS AND MISC GPU PATCHES

DRM DRIVERS AND MISC GPU PATCHES

M:	Gustavo Padovan <gustavo@padovan.org>

M:	Gustavo Padovan <gustavo@padovan.org>

M:	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

M:	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

M:	Sean Paul <seanpaul@chromium.org>

M:	Sean Paul <sean@poorly.run>

W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html

W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html

S:	Maintained

S:	Maintained

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

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

drivers/gpu/drm/panel/panel-simple.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1385,6 +1385,9 @@ static const struct panel_desc innolux_tv123wam = { 
		.width = 259,

		.width = 259,

		.height = 173,

		.height = 173,

	},

	},

	.delay = {

		.unprepare = 500,

	},

};

};





static const struct drm_display_mode innolux_zj070na_01p_mode = {

static const struct drm_display_mode innolux_zj070na_01p_mode = {