diff options
| author | Lyude <cpaul@redhat.com> | 2016-08-17 15:55:57 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-31 05:02:07 -0600 |
| commit | 1e599a0d3f71a5e7d821796c269f07e6d022ad5c (patch) | |
| tree | 31a77f4f62be631de903c5ca5e4c57dd6b4df61b | |
| parent | 1acb5944cc849f68615e27805c67cf9ea47ab09b (diff) | |
drm/i915/skl: Ensure pipes with changed wms get added to the state
commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460 upstream.
If we're enabling a pipe, we'll need to modify the watermarks on all
active planes. Since those planes won't be added to the state on
their own, we need to add them ourselves.
Signed-off-by: Lyude <cpaul@redhat.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 48ef0bdde0c0..e59a28cb3158 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4065,6 +4065,10 @@ skl_compute_ddb(struct drm_atomic_state *state) ret = skl_ddb_add_affected_planes(cstate); if (ret) return ret; + + ret = drm_atomic_add_affected_planes(state, &intel_crtc->base); + if (ret) + return ret; } return 0; |