aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/display/intel_fbc.c
diff options
context:
space:
mode:
authorGravatar Ville Syrjälä <ville.syrjala@linux.intel.com> 2023-10-03 22:42:51 +0300
committerGravatar Ville Syrjälä <ville.syrjala@linux.intel.com> 2023-10-05 13:25:36 +0300
commitda7b3b03f4c5f02e83dbd7cf9215e0fe6683e930 (patch)
tree5791f465c14aeb84192139ecbfefa509c08707e5 /drivers/gpu/drm/i915/display/intel_fbc.c
parentdrm/i915/pmu: Use local64_try_cmpxchg in i915_pmu_event_read (diff)
downloadlinux-da7b3b03f4c5f02e83dbd7cf9215e0fe6683e930.tar.gz
linux-da7b3b03f4c5f02e83dbd7cf9215e0fe6683e930.tar.bz2
linux-da7b3b03f4c5f02e83dbd7cf9215e0fe6683e930.zip
drm/i915/fbc: Remove ancient 16k plane stride limit
The 16k max plane stride limit seems to be originally from i965gm, and no explicit limit has been specified since (g4x+). So let's assume the max plane stride itself is a suitable limit also for the more recent FBC hardware. In fact even for i965gm the max X-tiled stride is also 16k so technically we don't need the check there either, but let's keep it there anyway since it's explicitly mentioned in the spec. Gen2/3 have more strict limits checked separately. Reviewed-by: Swati Sharma <swati2.sharma@intel.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231003194256.28569-1-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_fbc.c')
-rw-r--r--drivers/gpu/drm/i915/display/intel_fbc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 5f13c6776c7d..f12ea170b748 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -871,7 +871,8 @@ static bool stride_is_valid(const struct intel_plane_state *plane_state)
if (DISPLAY_VER(i915) == 2 || DISPLAY_VER(i915) == 3)
return stride == 4096 || stride == 8192;
- if (DISPLAY_VER(i915) == 4 && !IS_G4X(i915) && stride < 2048)
+ if (DISPLAY_VER(i915) == 4 && !IS_G4X(i915) &&
+ (stride < 2048 || stride > 16384))
return false;
/* Display WA #1105: skl,bxt,kbl,cfl,glk */
@@ -879,9 +880,6 @@ static bool stride_is_valid(const struct intel_plane_state *plane_state)
fb->modifier == DRM_FORMAT_MOD_LINEAR && stride & 511)
return false;
- if (stride > 16384)
- return false;
-
return true;
}