]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/wm: Use drm_get_format_info() in SKL+ cursor DDB allocation
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 7 Nov 2025 18:11:23 +0000 (20:11 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 12 Nov 2025 21:00:22 +0000 (23:00 +0200)
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251107181126.5743-7-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/skl_watermark.c

index 36a266f882d15b4391c78338391feb9fdbcfa700..16d74ab3a2b5836d41650c5ca7fba1b62943f79b 100644 (file)
@@ -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);