]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/skl: Ensure pipes with changed wms get added to the state
authorLyude <cpaul@redhat.com>
Wed, 17 Aug 2016 19:55:57 +0000 (15:55 -0400)
committerJani Nikula <jani.nikula@intel.com>
Mon, 22 Aug 2016 13:08:09 +0000 (16:08 +0300)
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: stable@vger.kernel.org
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
(cherry picked from commit 05a76d3d6ad1ee9f9814f88949cc9305fc165460)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_pm.c

index 70dcf8d35568420b88ea980fe1ad34dbff5c321e..53e13c10e4ea858e79999e4a86cd4907e1c29d63 100644 (file)
@@ -4104,6 +4104,10 @@ skl_compute_ddb(struct drm_atomic_state *state)
                ret = skl_allocate_pipe_ddb(cstate, ddb);
                if (ret)
                        return ret;
+
+               ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);
+               if (ret)
+                       return ret;
        }
 
        return 0;