Commit 90fa6a42 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to PRIMPOS 



Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the PRIMPOS register macro.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4bbb3218ac25b292bea46dcba3df8ec474d578e2.1716469091.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 17c99a03

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

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static void i9xx_plane_update_arm(struct intel_plane *plane, 
		int crtc_w = drm_rect_width(&plane_state->uapi.dst);

		int crtc_h = drm_rect_height(&plane_state->uapi.dst);



		intel_de_write_fw(dev_priv, PRIMPOS(i9xx_plane),

		intel_de_write_fw(dev_priv, PRIMPOS(dev_priv, i9xx_plane),

				  PRIM_POS_Y(crtc_y) | PRIM_POS_X(crtc_x));

		intel_de_write_fw(dev_priv, PRIMSIZE(i9xx_plane),

				  PRIM_HEIGHT(crtc_h - 1) | PRIM_WIDTH(crtc_w - 1));

drivers/gpu/drm/i915/display/i9xx_plane_regs.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 


/* CHV pipe B primary plane */

#define _PRIMPOS_A			0x60a08

#define PRIMPOS(plane)		_MMIO_TRANS2(dev_priv, plane, _PRIMPOS_A)

#define PRIMPOS(dev_priv, plane)	_MMIO_TRANS2(dev_priv, plane, _PRIMPOS_A)

#define   PRIM_POS_Y_MASK	REG_GENMASK(31, 16)

#define   PRIM_POS_Y(y)		REG_FIELD_PREP(PRIM_POS_Y_MASK, (y))

#define   PRIM_POS_X_MASK	REG_GENMASK(15, 0)