From: Ville Syrjälä Date: Fri, 5 Jul 2024 14:52:43 +0000 (+0300) Subject: drm/i915/fbc: s/lines/height/ X-Git-Tag: v6.12-rc1~126^2~22^2~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=566ad72ba636b745beb8a440bd4c05e779b95728;p=thirdparty%2Flinux.git drm/i915/fbc: s/lines/height/ Use the more customary name 'height' instead of 'lines'. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20240705145254.3355-10-ville.syrjala@linux.intel.com Reviewed-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index e9adb1b8b9a7a..da54cb55906ca 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -203,14 +203,14 @@ static unsigned int intel_fbc_cfb_stride(const struct intel_plane_state *plane_s static unsigned int intel_fbc_cfb_size(const struct intel_plane_state *plane_state) { struct intel_display *display = to_intel_display(plane_state->uapi.plane->dev); - int lines = drm_rect_height(&plane_state->uapi.src) >> 16; + int height = drm_rect_height(&plane_state->uapi.src) >> 16; if (DISPLAY_VER(display) == 7) - lines = min(lines, 2048); + height = min(height, 2048); else if (DISPLAY_VER(display) >= 8) - lines = min(lines, 2560); + height = min(height, 2560); - return lines * intel_fbc_cfb_stride(plane_state); + return height * intel_fbc_cfb_stride(plane_state); } static u16 intel_fbc_override_cfb_stride(const struct intel_plane_state *plane_state)