diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-22 10:54:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-22 10:54:50 +1000 |
| commit | 35904d6e9683e8d0ea742d6889d93bea2e79888a (patch) | |
| tree | 6bb60d39d7e65973ba69af747948a8df0205b96c /drivers/gpu | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
| parent | 643ca198aacc671f32ef7c0c2783f0b539070a36 (diff) | |
| download | linux-35904d6e9683e8d0ea742d6889d93bea2e79888a.tar.bz2 | |
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
Diffstat (limited to 'drivers/gpu')
| -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, const struct drm_display_mode *panel_mode; struct drm_crtc_state *crtc_state; + if (!state->crtc) + return 0; + if (list_empty(&connector->modes)) { dev_dbg(lvds->dev, "connector: empty modes list\n"); return -EINVAL; |