Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a919db90 authored by Sonika Jindal's avatar Sonika Jindal Committed by Daniel Vetter
Browse files

drm/i915: Update plane parameters for cursor plane (v2) 



This allows the cursor plane to be updated the same way as primary and sprites,
and same set_property handler is used for all of these planes.

v2 (by Matt Roper): Rework to apply to latest di-nightly codebase.  The
        switch to split check/commit plane programming changed the code
        flow enough that the original patch could no longer be applied.

Signed-off-by: default avatarSonika Jindal <sonika.jindal@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Tested-by (IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent aff43766

drivers/gpu/drm/i915/intel_display.c

+12 −0
Original line number Diff line number Diff line
@@ -11955,12 +11955,24 @@ intel_commit_cursor_plane(struct drm_plane *plane, 
	struct drm_crtc *crtc = state->crtc;

	struct drm_framebuffer *fb = state->fb;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);

	struct drm_i915_gem_object *obj = intel_fb->obj;

	int crtc_w, crtc_h;



	crtc->cursor_x = state->orig_dst.x1;

	crtc->cursor_y = state->orig_dst.y1;



	intel_plane->crtc_x = state->orig_dst.x1;

	intel_plane->crtc_y = state->orig_dst.y1;

	intel_plane->crtc_w = drm_rect_width(&state->orig_dst);

	intel_plane->crtc_h = drm_rect_height(&state->orig_dst);

	intel_plane->src_x = state->orig_src.x1;

	intel_plane->src_y = state->orig_src.y1;

	intel_plane->src_w = drm_rect_width(&state->orig_src);

	intel_plane->src_h = drm_rect_height(&state->orig_src);

	intel_plane->obj = obj;



	if (fb != crtc->cursor->fb) {

		crtc_w = drm_rect_width(&state->orig_dst);

		crtc_h = drm_rect_height(&state->orig_dst);