Commit f84b336a authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Get rid of the 64bit PLANE_CC_VAL mmio 



Let's just stick to 32bit mmio accesses so we can get rid
of the bare "uncore" reg access in display code. The register
are defined as 32bit in the spec anyway.

We could define a 64bit "de" variant I suppose, but doesn't
really make much sense just for this one case, and when we
start to use the DSB for this stuff we'd also need another
64bit variant for that. Just easier to do 32bit always.

While at it we can reorder stuff a bit so that we write the
registers in order of increasing offset (more or less).

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211201152552.7821-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 15162c5a

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

+7 −4
Original line number Diff line number Diff line
@@ -1057,6 +1057,13 @@ skl_program_plane_noarm(struct intel_plane *plane, 
	intel_de_write_fw(dev_priv, PLANE_SIZE(pipe, plane_id),

			  (src_h << 16) | src_w);



	if (intel_fb_is_rc_ccs_cc_modifier(fb->modifier)) {

		intel_de_write_fw(dev_priv, PLANE_CC_VAL(pipe, plane_id, 0),

				  lower_32_bits(plane_state->ccval));

		intel_de_write_fw(dev_priv, PLANE_CC_VAL(pipe, plane_id, 1),

				  upper_32_bits(plane_state->ccval));

	}



	if (icl_is_hdr_plane(dev_priv, plane_id))

		intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id),

				  plane_state->cus_ctl);
@@ -1064,10 +1071,6 @@ skl_program_plane_noarm(struct intel_plane *plane, 
	if (fb->format->is_yuv && icl_is_hdr_plane(dev_priv, plane_id))

		icl_program_input_csc(plane, crtc_state, plane_state);



	if (intel_fb_is_rc_ccs_cc_modifier(fb->modifier))

		intel_uncore_write64_fw(&dev_priv->uncore,

					PLANE_CC_VAL(pipe, plane_id), plane_state->ccval);



	skl_write_plane_wm(plane, crtc_state);



	intel_psr2_program_plane_sel_fetch(plane, crtc_state, plane_state, color_plane);

drivers/gpu/drm/i915/i915_reg.h

+6 −6
Original line number Diff line number Diff line
@@ -7291,10 +7291,10 @@ enum { 








#define _PLANE_CC_VAL_1_B		0x711b4









#define _PLANE_CC_VAL_2_B		0x712b4









#define _PLANE_CC_VAL_1(pipe)	_PIPE(pipe, _PLANE_CC_VAL_1_A, _PLANE_CC_VAL_1_B)









#define _PLANE_CC_VAL_2(pipe)	_PIPE(pipe, _PLANE_CC_VAL_2_A, _PLANE_CC_VAL_2_B)









#define PLANE_CC_VAL(pipe, plane)	\









	_MMIO_PLANE(plane, _PLANE_CC_VAL_1(pipe), _PLANE_CC_VAL_2(pipe))









#define _PLANE_CC_VAL_1(pipe, dw)	(_PIPE(pipe, _PLANE_CC_VAL_1_A, _PLANE_CC_VAL_1_B) + (dw) * 4)









#define _PLANE_CC_VAL_2(pipe, dw)	(_PIPE(pipe, _PLANE_CC_VAL_2_A, _PLANE_CC_VAL_2_B) + (dw) * 4)









#define PLANE_CC_VAL(pipe, plane, dw) \









	_MMIO_PLANE((plane), _PLANE_CC_VAL_1((pipe), (dw)), _PLANE_CC_VAL_2((pipe), (dw)))

















/* Input CSC Register Definitions */









#define _PLANE_INPUT_CSC_RY_GY_1_A	0x701E0