Commit 608a7d3f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/wm: Use drm_get_format_info() in SKL+ cursor DDB allocation 



Replace the technically inaccurate drm_format_info() with the
accurate drm_get_format_info() in the SKL+ cursor DDB
allocation code.

Since we're only interested in the linear modifier here, the two
functions do actually return the same information. But let's not
use drm_format_info() to avoid setting a bad example.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251107181126.5743-7-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent f5255f90

drivers/gpu/drm/i915/display/skl_watermark.c

+9 −3
Original line number Diff line number Diff line
@@ -635,15 +635,21 @@ skl_cursor_allocation(const struct intel_crtc_state *crtc_state, 
{

	struct intel_display *display = to_intel_display(crtc_state);

	struct intel_plane *plane = to_intel_plane(crtc_state->uapi.crtc->cursor);

	const struct drm_format_info *info;

	struct skl_wm_level wm = {};

	int ret, min_ddb_alloc = 0;

	struct skl_wm_params wp;

	u64 modifier;

	u32 format;

	int level;



	format = DRM_FORMAT_ARGB8888;

	modifier = DRM_FORMAT_MOD_LINEAR;



	info  = drm_get_format_info(display->drm, format, modifier);



	ret = skl_compute_wm_params(crtc_state, 256,

				    drm_format_info(DRM_FORMAT_ARGB8888),

				    DRM_FORMAT_MOD_LINEAR,

				    DRM_MODE_ROTATE_0,

				    info, modifier, DRM_MODE_ROTATE_0,

				    crtc_state->pixel_rate, &wp, 0, 0);

	drm_WARN_ON(display->drm, ret);