diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-08-23 11:23:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-08-23 11:23:46 +1000 |
| commit | 4d1608eebcb2191b10ac3aa4ca743a38ac05e100 (patch) | |
| tree | 158fe5f3fefdaae88fcccc75e9f7b8e3ea5fdd6c | |
| parent | 3d63a3c14741ed015948943076f3c6a2f2cd7b27 (diff) | |
| parent | 4acd8d01a2393f2145ad1db10b2d5c764582a98d (diff) | |
| download | linux-4d1608eebcb2191b10ac3aa4ca743a38ac05e100.tar.gz linux-4d1608eebcb2191b10ac3aa4ca743a38ac05e100.tar.bz2 linux-4d1608eebcb2191b10ac3aa4ca743a38ac05e100.zip | |
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: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180822193850.GA214158@art_vandelay
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/panel/panel-simple.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9b2bf134964e..cc2df7c4aa36 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4663,7 +4663,7 @@ 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: Sean Paul <seanpaul@chromium.org> +M: Sean Paul <sean@poorly.run> 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 index 5b5d0a24e713..97964f7f2ace 100644 --- 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 = { |