aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2021-11-24 13:36:34 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2021-12-03 12:49:23 +0200
commitb6e201f5f13bd61ab8e5187daa0e149826cda154 (patch)
tree04cad5437e5fc70f64ae944ca5bc6286b3e2fd6d /drivers
parentdrm/i915/fbc: Eliminate racy intel_fbc_is_active() usage (diff)
downloadlinux-dev-b6e201f5f13bd61ab8e5187daa0e149826cda154.tar.xz
linux-dev-b6e201f5f13bd61ab8e5187daa0e149826cda154.zip
drm/i915/fbc: Pass whole plane state to intel_fbc_min_limit()
No reason to burden the caller with the details on how the minimum compression limit is calculated, so just pass in the whole plane state instead of just the cpp value. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211124113652.22090-3-ville.syrjala@linux.intel.com Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/display/intel_fbc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index d0c34bc3af6c..083c0cab4847 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -679,8 +679,10 @@ static u64 intel_fbc_stolen_end(struct drm_i915_private *i915)
return min(end, intel_fbc_cfb_base_max(i915));
}
-static int intel_fbc_min_limit(int fb_cpp)
+static int intel_fbc_min_limit(const struct intel_plane_state *plane_state)
{
+ int fb_cpp = plane_state->hw.fb ? plane_state->hw.fb->format->cpp[0] : 0;
+
return fb_cpp == 2 ? 2 : 1;
}
@@ -1466,8 +1468,7 @@ static void intel_fbc_enable(struct intel_atomic_state *state,
cache = &fbc->state_cache;
- min_limit = intel_fbc_min_limit(plane_state->hw.fb ?
- plane_state->hw.fb->format->cpp[0] : 0);
+ min_limit = intel_fbc_min_limit(plane_state);
mutex_lock(&fbc->lock);