diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-03-22 16:23:12 +0100 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-03-29 18:14:21 +0200 |
| commit | be90cc318b4c8d5c3999eb25783d8055e6a67855 (patch) | |
| tree | 6299078c5a9a32e7ba678cb9ff17d48910470e5d /drivers/gpu/drm | |
| parent | drm/zte: Stop consulting plane->crtc (diff) | |
| download | linux-be90cc318b4c8d5c3999eb25783d8055e6a67855.tar.xz linux-be90cc318b4c8d5c3999eb25783d8055e6a67855.zip | |
drm/i915: Restore planes after load detection
Actually turn the planes back on after were done with
the load detection.
Fixes: 20bdc112bbe4 ("drm/i915: Disable all planes for load detection, v2.")
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180322152313.6561-23-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 54d4c369cae2..182f9bf98484 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9974,6 +9974,8 @@ found: ret = PTR_ERR_OR_ZERO(drm_atomic_get_connector_state(restore_state, connector)); if (!ret) ret = PTR_ERR_OR_ZERO(drm_atomic_get_crtc_state(restore_state, crtc)); + if (!ret) + ret = drm_atomic_add_affected_planes(restore_state, crtc); if (ret) { DRM_DEBUG_KMS("Failed to create a copy of old state to restore: %i\n", ret); goto fail; |