diff options
author | Dave Airlie <airlied@redhat.com> | 2018-05-21 20:54:50 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-05-21 20:54:50 -0400 |
commit | 35904d6e9683e8d0ea742d6889d93bea2e79888a (patch) | |
tree | 6bb60d39d7e65973ba69af747948a8df0205b96c | |
parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
parent | 643ca198aacc671f32ef7c0c2783f0b539070a36 (diff) |
Merge branch 'drm/du/fixes' of git://linuxtv.org/pinchartl/media into drm-fixes
Single regression fix for rcar-du lvds
* 'drm/du/fixes' of git://linuxtv.org/pinchartl/media:
drm: rcar-du: lvds: Fix crash in .atomic_check when disabling connector
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_lvds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index 3d2d3bbd1342..155ad840f3c5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c | |||
@@ -88,6 +88,9 @@ static int rcar_lvds_connector_atomic_check(struct drm_connector *connector, | |||
88 | const struct drm_display_mode *panel_mode; | 88 | const struct drm_display_mode *panel_mode; |
89 | struct drm_crtc_state *crtc_state; | 89 | struct drm_crtc_state *crtc_state; |
90 | 90 | ||
91 | if (!state->crtc) | ||
92 | return 0; | ||
93 | |||
91 | if (list_empty(&connector->modes)) { | 94 | if (list_empty(&connector->modes)) { |
92 | dev_dbg(lvds->dev, "connector: empty modes list\n"); | 95 | dev_dbg(lvds->dev, "connector: empty modes list\n"); |
93 | return -EINVAL; | 96 | return -EINVAL; |