Commit 99ab1a29 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to CURPOS 



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

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


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

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

+4 −4
Original line number Diff line number Diff line
@@ -298,14 +298,14 @@ static void i845_cursor_update_arm(struct intel_plane *plane, 
		intel_de_write_fw(dev_priv, CURCNTR(dev_priv, PIPE_A), 0);

		intel_de_write_fw(dev_priv, CURBASE(dev_priv, PIPE_A), base);

		intel_de_write_fw(dev_priv, CURSIZE(PIPE_A), size);

		intel_de_write_fw(dev_priv, CURPOS(PIPE_A), pos);

		intel_de_write_fw(dev_priv, CURPOS(dev_priv, PIPE_A), pos);

		intel_de_write_fw(dev_priv, CURCNTR(dev_priv, PIPE_A), cntl);



		plane->cursor.base = base;

		plane->cursor.size = size;

		plane->cursor.cntl = cntl;

	} else {

		intel_de_write_fw(dev_priv, CURPOS(PIPE_A), pos);

		intel_de_write_fw(dev_priv, CURPOS(dev_priv, PIPE_A), pos);

	}

}
@@ -647,14 +647,14 @@ static void i9xx_cursor_update_arm(struct intel_plane *plane, 
			intel_de_write_fw(dev_priv, CUR_FBC_CTL(pipe),

					  fbc_ctl);

		intel_de_write_fw(dev_priv, CURCNTR(dev_priv, pipe), cntl);

		intel_de_write_fw(dev_priv, CURPOS(pipe), pos);

		intel_de_write_fw(dev_priv, CURPOS(dev_priv, pipe), pos);

		intel_de_write_fw(dev_priv, CURBASE(dev_priv, pipe), base);



		plane->cursor.base = base;

		plane->cursor.size = fbc_ctl;

		plane->cursor.cntl = cntl;

	} else {

		intel_de_write_fw(dev_priv, CURPOS(pipe), pos);

		intel_de_write_fw(dev_priv, CURPOS(dev_priv, pipe), pos);

		intel_de_write_fw(dev_priv, CURBASE(dev_priv, pipe), base);

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 


#define CURCNTR(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURACNTR)

#define CURBASE(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURABASE)

#define CURPOS(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURAPOS)

#define CURPOS(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURAPOS)

#define CURPOS_ERLY_TPT(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURAPOS_ERLY_TPT)

#define CURSIZE(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURASIZE)

#define CUR_FBC_CTL(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CUR_FBC_CTL_A)

drivers/gpu/drm/i915/gvt/fb_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int intel_vgpu_decode_cursor_plane(struct intel_vgpu *vgpu, 
		return  -EINVAL;

	}



	val = vgpu_vreg_t(vgpu, CURPOS(pipe));

	val = vgpu_vreg_t(vgpu, CURPOS(dev_priv, pipe));

	plane->x_pos = (val & _CURSOR_POS_X_MASK) >> _CURSOR_POS_X_SHIFT;

	plane->x_sign = (val & _CURSOR_SIGN_X_MASK) >> _CURSOR_SIGN_X_SHIFT;

	plane->y_pos = (val & _CURSOR_POS_Y_MASK) >> _CURSOR_POS_Y_SHIFT;

drivers/gpu/drm/i915/intel_gvt_mmio_table.c

+3 −3
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter) 
	MMIO_D(CURCNTR(dev_priv, PIPE_A));

	MMIO_D(CURCNTR(dev_priv, PIPE_B));

	MMIO_D(CURCNTR(dev_priv, PIPE_C));

	MMIO_D(CURPOS(PIPE_A));

	MMIO_D(CURPOS(PIPE_B));

	MMIO_D(CURPOS(PIPE_C));

	MMIO_D(CURPOS(dev_priv, PIPE_A));

	MMIO_D(CURPOS(dev_priv, PIPE_B));

	MMIO_D(CURPOS(dev_priv, PIPE_C));

	MMIO_D(CURBASE(dev_priv, PIPE_A));

	MMIO_D(CURBASE(dev_priv, PIPE_B));

	MMIO_D(CURBASE(dev_priv, PIPE_C));