diff options
author | Dave Airlie <airlied@redhat.com> | 2018-07-18 21:13:14 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-07-18 21:27:57 +0200 |
commit | 54c88a029a0a86fe00a0ee7d2a15ee08e6d04db9 (patch) | |
tree | 57c28532f31aa88b452bc2cf947dbe4e0b1f9ddb /drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | |
parent | Merge tag 'vmwgfx-next-4.19-3' of git://people.freedesktop.org/~thomash/linux... (diff) | |
parent | drm/client: Fix: drm_client_new: Don't require DRM to be registered (diff) | |
download | linux-54c88a029a0a86fe00a0ee7d2a15ee08e6d04db9.tar.xz linux-54c88a029a0a86fe00a0ee7d2a15ee08e6d04db9.zip |
Merge tag 'drm-misc-next-2018-07-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19:
Cross-subsystem Changes:
- many dt-bindings Doc changes
Core Changes:
- Encoder clean ups (Ville Syrjälä)
- Connector Writeback improvements(Boris Brezillon)
- Fake vblank support (Boris Brezillon)
- API for in-kernel clients (Noralf Trønnes)
- improvements to the path of finding panels(Boris Brezillon)
Driver Changes:
- initial support for the virtual display driver - vkms(Haneen Mohammed and Rodrigo Siqueira)
- panel: add Rocktech RK070ER9427 LCD support (Jagan Teki)
- panel: add support for the EDT ETM0700G0EDH6 and EDT ETM0700G0BDH6(Jan Tuerk)
- panel: add DLC DLC0700YZG-1 (Philipp Zabel)
- panel: add support for BOE HV070WSA-100 (Andrzej Hajda)
- panel: add newhaven, nhd-4.3-480272ef-atxl LCD (Tomi Valkeinen)
- panel: add support for Innolux G070Y2-L01 (Christoph Fritz)
- panel: add support for DataImage SCF0700C48GGU18 (Michal Vokáč)
- panel: add support for Sharp LQ035Q7DB03 (Vladimir Zapolskiy)
- panel: p079zca: Refactor panel driver to support multiple panels (Lin Huang)
- sun4i: Add R40 display engine compatible(Jernej Skrabec)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180712011137.GA26620@juma
Diffstat (limited to 'drivers/gpu/drm/panel/panel-ilitek-ili9881c.c')
-rw-r--r-- | drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c index e848af235df5..3ad4a46c4e94 100644 --- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c @@ -334,7 +334,7 @@ static int ili9881c_prepare(struct drm_panel *panel) if (ret) return ret; - mipi_dsi_dcs_exit_sleep_mode(ctx->dsi); + ret = mipi_dsi_dcs_exit_sleep_mode(ctx->dsi); if (ret) return ret; |