Commit 4229dd0b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: add VLV_ prefix to VLV only register macros 



All the BXT specific macros have BXT_ prefix, do the same for VLV for
consistency. This is helpful because the platform specific macros can
use the static MIPI MMIO base rather than dynamic.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7e101167c52746748dbff739bc9247a664ca2840.1713520813.git.jani.nikula@intel.com


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

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

+3 −3
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static void vlv_dsi_device_ready(struct intel_encoder *encoder) 
		 * Common bit for both MIPI Port A & MIPI Port C

		 * No similar bit in MIPI Port C reg

		 */

		intel_de_rmw(dev_priv, MIPI_PORT_CTRL(PORT_A), 0, LP_OUTPUT_HOLD);

		intel_de_rmw(dev_priv, VLV_MIPI_PORT_CTRL(PORT_A), 0, LP_OUTPUT_HOLD);

		usleep_range(1000, 1500);



		intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
@@ -563,7 +563,7 @@ static void glk_dsi_clear_device_ready(struct intel_encoder *encoder) 
static i915_reg_t port_ctrl_reg(struct drm_i915_private *i915, enum port port)

{

	return IS_GEMINILAKE(i915) || IS_BROXTON(i915) ?

		BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);

		BXT_MIPI_PORT_CTRL(port) : VLV_MIPI_PORT_CTRL(port);

}



static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder)
@@ -576,7 +576,7 @@ static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) 
	for_each_dsi_port(port, intel_dsi->ports) {

		/* Common bit for both MIPI Port A & MIPI Port C on VLV/CHV */

		i915_reg_t port_ctrl = IS_BROXTON(dev_priv) ?

			BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(PORT_A);

			BXT_MIPI_PORT_CTRL(port) : VLV_MIPI_PORT_CTRL(PORT_A);



		intel_de_write(dev_priv, MIPI_DEVICE_READY(port),

			       DEVICE_READY | ULPS_STATE_ENTER);

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

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


#define _MIPIA_PORT_CTRL			(VLV_DISPLAY_BASE + 0x61190)

#define _MIPIC_PORT_CTRL			(VLV_DISPLAY_BASE + 0x61700)

#define MIPI_PORT_CTRL(port)	_MMIO_MIPI(port, _MIPIA_PORT_CTRL, _MIPIC_PORT_CTRL)

#define VLV_MIPI_PORT_CTRL(port)	_MMIO_MIPI(port, _MIPIA_PORT_CTRL, _MIPIC_PORT_CTRL)



 /* BXT port control */

#define _BXT_MIPIA_PORT_CTRL				0x6B0C0
@@ -89,7 +89,7 @@ 


#define _MIPIA_TEARING_CTRL			(VLV_DISPLAY_BASE + 0x61194)

#define _MIPIC_TEARING_CTRL			(VLV_DISPLAY_BASE + 0x61704)

#define MIPI_TEARING_CTRL(port)			_MMIO_MIPI(port, _MIPIA_TEARING_CTRL, _MIPIC_TEARING_CTRL)

#define VLV_MIPI_TEARING_CTRL(port)		_MMIO_MIPI(port, _MIPIA_TEARING_CTRL, _MIPIC_TEARING_CTRL)

#define  TEARING_EFFECT_DELAY_SHIFT			0

#define  TEARING_EFFECT_DELAY_MASK			(0xffff << 0)