drm/i915: Generalize skl_ddb_allocation_overlaps()

Make skl_ddb_allocation_overlaps() useful for other callers
besides skl_update_crtcs(). We'll need it to do plane updates
as well.

And while we're here we can reduce the stack utilization a
bit by noting that each struct skl_ddb_entry is 4 bytes whereas
a pointer to one is 8 bytes (on 64bit). So we'll switch to an
array of structs from the array of pointers we used before.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181101150605.18235-9-ville.syrjala@linux.intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c112bf758a66..a7fa032310ae 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12651,13 +12651,12 @@ static void skl_update_crtcs(struct drm_atomic_state *state)
         int i;
         u8 hw_enabled_slices = dev_priv->wm.skl_hw.ddb.enabled_slices;
         u8 required_slices = intel_state->wm_results.ddb.enabled_slices;
-
-        const struct skl_ddb_entry *entries[I915_MAX_PIPES] = {};
+        struct skl_ddb_entry entries[I915_MAX_PIPES] = {};
 
         for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i)
                 /* ignore allocations for crtc's that have been turned off. */
                 if (new_crtc_state->active)
-                        entries[i] = &to_intel_crtc_state(old_crtc_state)->wm.skl.ddb;
+                        entries[i] = to_intel_crtc_state(old_crtc_state)->wm.skl.ddb;
 
         /* If 2nd DBuf slice required, enable it here */
         if (INTEL_GEN(dev_priv) >= 11 && required_slices > hw_enabled_slices)
@@ -12683,14 +12682,13 @@ static void skl_update_crtcs(struct drm_atomic_state *state)
                         if (updated & cmask || !cstate->base.active)
                                 continue;
 
-                        if (skl_ddb_allocation_overlaps(dev_priv,
+                        if (skl_ddb_allocation_overlaps(&cstate->wm.skl.ddb,
                                                         entries,
-                                                        &cstate->wm.skl.ddb,
-                                                        i))
+                                                        INTEL_INFO(dev_priv)->num_pipes, i))
                                 continue;
 
                         updated |= cmask;
-                        entries[i] = &cstate->wm.skl.ddb;
+                        entries[i] = cstate->wm.skl.ddb;
 
                         /*
                          * If this is an already active pipe, it's DDB changed,