Commit bf473cb5 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Manasi Navare

drm/i915: Fix cursor src/dst rectangle with bigjoiner

We can't call drm_plane_state_src() this late for the slave plane since
it would consult the wrong uapi state. We've alreayd done the correct
uapi->hw copy earlier, so let's just preserve the unclipped src/dst
rects using a temp copy across the intel_atomic_plane_check_clipping()
call.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201117194718.11462-14-manasi.d.navare@intel.com
parent 756c1b87
...@@ -11689,6 +11689,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, ...@@ -11689,6 +11689,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
{ {
const struct drm_framebuffer *fb = plane_state->hw.fb; const struct drm_framebuffer *fb = plane_state->hw.fb;
struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev); struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);
const struct drm_rect src = plane_state->uapi.src;
const struct drm_rect dst = plane_state->uapi.dst;
int ret; int ret;
if (fb && fb->modifier != DRM_FORMAT_MOD_LINEAR) { if (fb && fb->modifier != DRM_FORMAT_MOD_LINEAR) {
...@@ -11704,8 +11706,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, ...@@ -11704,8 +11706,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
return ret; return ret;
/* Use the unclipped src/dst rectangles, which we program to hw */ /* Use the unclipped src/dst rectangles, which we program to hw */
plane_state->uapi.src = drm_plane_state_src(&plane_state->uapi); plane_state->uapi.src = src;
plane_state->uapi.dst = drm_plane_state_dest(&plane_state->uapi); plane_state->uapi.dst = dst;
ret = intel_cursor_check_surface(plane_state); ret = intel_cursor_check_surface(plane_state);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment