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

…op.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: Dave Airlie <[email protected]> From: Sean Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20180822193850.GA214158@art_vandelay
imcsk8 · Aug 23, 2018 · 4d1608e · 4d1608e
2 parents 3d63a3c + 4acd8d0
commit 4d1608e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -4663,7 +4663,7 @@ F:	include/linux/vga*
 DRM DRIVERS AND MISC GPU PATCHES
 M:	Gustavo Padovan <[email protected]>
 M:	Maarten Lankhorst <[email protected]>
-M:	Sean Paul <[email protected]>
+M:	Sean Paul <[email protected]>
 W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:	Maintained
 T:	git git://anongit.freedesktop.org/drm/drm-misc

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
@@ -1385,6 +1385,9 @@ static const struct panel_desc innolux_tv123wam = {
 		.width = 259,
 		.height = 173,
 	},
+	.delay = {
+		.unprepare = 500,
+	},
 };
 
 static const struct drm_display_mode innolux_zj070na_01p_mode = {