drm/i915: Fix cursor coordinates on bigjoiner slave

Adjust the cursor dst coordinates appripriately when it's on
the bigjoiner slave pipe. intel_atomic_plane_check_clipping()
already did this but with the cursor we discard those results
(apart from uapi.visible and error checks) since the hardware
will be doing the clipping for us.

v2: Rebase due to bigjoiner bitmask usage

Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220223131315.18016-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index b648be744cf2e3c6e5e35d119e5d7b91a3466c27..57ef9403f4e9ed56af31002342be20e836803724 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -152,6 +152,9 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
        /* Use the unclipped src/dst rectangles, which we program to hw */
        plane_state->uapi.src = src;
        plane_state->uapi.dst = dst;
+       if (intel_crtc_is_bigjoiner_slave(crtc_state))
+               drm_rect_translate(&plane_state->uapi.dst,
+                                  -crtc_state->pipe_src_w, 0);
 
        ret = intel_cursor_check_surface(plane_state);
        if (ret)