[Intel-gfx] [PATCH 2/2] drm/i915: Change Mipi register definitions

Shashank Sharma shashank.sharma at intel.com
Wed May 21 17:26:59 CEST 2014


Re-define MIPI register definitions in such a way that most of
the existing DSI code can be re-used for future platforms. Register
definitions are re-written using MMIO offset variable, so that without
changing the existing sequence, same code can be generically applied.

V2: Addressing review comments by Damien, added follwing changes:
1. Re-defined MIPI_DSI_FUNC_PRG using _PIPE macro, to remove
	branching.
2. Re-written _MIPIB_DSI_FUNC_PRG and _MIPIA_DSI_FUNC_PRG
	in single line.
Signed-off-by: Shashank Sharma <shashank.sharma at intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h |  689 +++++++++++++++++++++++----------------
 1 file changed, 416 insertions(+), 273 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c12a858..50d5e89 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -5655,20 +5655,23 @@ enum punit_power_well {
 #define PIPE_CSC_POSTOFF_ME(pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_ME, _PIPE_B_CSC_POSTOFF_ME)
 #define PIPE_CSC_POSTOFF_LO(pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_LO, _PIPE_B_CSC_POSTOFF_LO)
 
-/* VLV MIPI registers */
 
+/* ==== MIPI registers ==== */
+
+/* VLV port control */
 #define _MIPIA_PORT_CTRL			(VLV_DISPLAY_BASE + 0x61190)
 #define _MIPIB_PORT_CTRL			(VLV_DISPLAY_BASE + 0x61700)
 #define MIPI_PORT_CTRL(pipe)		_PIPE(pipe, _MIPIA_PORT_CTRL, _MIPIB_PORT_CTRL)
-#define  DPI_ENABLE					(1 << 31) /* A + B */
+
+#define  DPI_ENABLE					(1 << 31)
 #define  MIPIA_MIPI4DPHY_DELAY_COUNT_SHIFT		27
 #define  MIPIA_MIPI4DPHY_DELAY_COUNT_MASK		(0xf << 27)
 #define  DUAL_LINK_MODE_MASK				(1 << 26)
 #define  DUAL_LINK_MODE_FRONT_BACK			(0 << 26)
 #define  DUAL_LINK_MODE_PIXEL_ALTERNATIVE		(1 << 26)
-#define  DITHERING_ENABLE				(1 << 25) /* A + B */
+#define  DITHERING_ENABLE				(1 << 25)
 #define  FLOPPED_HSTX					(1 << 23)
-#define  DE_INVERT					(1 << 19) /* XXX */
+#define  DE_INVERT					(1 << 19)
 #define  MIPIA_FLISDSI_DELAY_COUNT_SHIFT		18
 #define  MIPIA_FLISDSI_DELAY_COUNT_MASK			(0xf << 18)
 #define  AFE_LATCHOUT					(1 << 17)
@@ -5699,33 +5702,46 @@ enum punit_power_well {
 #define  LANE_CONFIGURATION_DUAL_LINK_A			(1 << 0)
 #define  LANE_CONFIGURATION_DUAL_LINK_B			(2 << 0)
 
+/* VLV tearing effect control */
 #define _MIPIA_TEARING_CTRL			(VLV_DISPLAY_BASE + 0x61194)
 #define _MIPIB_TEARING_CTRL			(VLV_DISPLAY_BASE + 0x61704)
 #define MIPI_TEARING_CTRL(pipe)		_PIPE(pipe, _MIPIA_TEARING_CTRL, _MIPIB_TEARING_CTRL)
-#define  TEARING_EFFECT_DELAY_SHIFT			0
-#define  TEARING_EFFECT_DELAY_MASK			(0xffff << 0)
+#define TEARING_EFFECT_DELAY_SHIFT		0
+#define TEARING_EFFECT_DELAY_MASK		(0xffff << 0)
 
-/* XXX: all bits reserved */
-#define _MIPIA_AUTOPWG				(VLV_DISPLAY_BASE + 0x611a0)
+/* VLV: all bits reserved */
+#define _MIPIA_AUTOPWG			(dev_priv->mipi_mmio_base + \
+						0x611a0)
 
 /* MIPI DSI Controller and D-PHY registers */
+#define _MIPIA_DEVICE_READY		(dev_priv->mipi_mmio_base + \
+						0xb000)
+#define _MIPIB_DEVICE_READY		(dev_priv->mipi_mmio_base + \
+						0xb800)
+#define MIPI_DEVICE_READY(check)	(!check ?	\
+	_MIPIA_DEVICE_READY : _MIPIB_DEVICE_READY)
+
+#define  BUS_POSSESSION		(1 << 3) /* set to give bus to receiver */
+#define  ULPS_STATE_MASK		(3 << 1)
+#define  ULPS_STATE_ENTER		(2 << 1)
+#define  ULPS_STATE_EXIT		(1 << 1)
+#define  ULPS_STATE_NORMAL_OPERATION	(0 << 1)
+#define  DEVICE_READY			(1 << 0)
+
+#define _MIPIA_INTR_STAT		(dev_priv->mipi_mmio_base + \
+						0xb004)
+#define _MIPIB_INTR_STAT		(dev_priv->mipi_mmio_base + \
+						0xb804)
+#define MIPI_INTR_STAT(check)		(!check ?	\
+	_MIPIA_INTR_STAT : _MIPIB_INTR_STAT)
+
+#define _MIPIA_INTR_EN			(dev_priv->mipi_mmio_base + \
+						0xb008)
+#define _MIPIB_INTR_EN			(dev_priv->mipi_mmio_base + \
+						0xb808)
+#define MIPI_INTR_EN(check)		(!check ?	\
+	_MIPIA_INTR_EN : _MIPIB_INTR_EN)
 
-#define _MIPIA_DEVICE_READY			(VLV_DISPLAY_BASE + 0xb000)
-#define _MIPIB_DEVICE_READY			(VLV_DISPLAY_BASE + 0xb800)
-#define MIPI_DEVICE_READY(pipe)		_PIPE(pipe, _MIPIA_DEVICE_READY, _MIPIB_DEVICE_READY)
-#define  BUS_POSSESSION					(1 << 3) /* set to give bus to receiver */
-#define  ULPS_STATE_MASK				(3 << 1)
-#define  ULPS_STATE_ENTER				(2 << 1)
-#define  ULPS_STATE_EXIT				(1 << 1)
-#define  ULPS_STATE_NORMAL_OPERATION			(0 << 1)
-#define  DEVICE_READY					(1 << 0)
-
-#define _MIPIA_INTR_STAT			(VLV_DISPLAY_BASE + 0xb004)
-#define _MIPIB_INTR_STAT			(VLV_DISPLAY_BASE + 0xb804)
-#define MIPI_INTR_STAT(pipe)		_PIPE(pipe, _MIPIA_INTR_STAT, _MIPIB_INTR_STAT)
-#define _MIPIA_INTR_EN				(VLV_DISPLAY_BASE + 0xb008)
-#define _MIPIB_INTR_EN				(VLV_DISPLAY_BASE + 0xb808)
-#define MIPI_INTR_EN(pipe)		_PIPE(pipe, _MIPIA_INTR_EN, _MIPIB_INTR_EN)
 #define  TEARING_EFFECT					(1 << 31)
 #define  SPL_PKT_SENT_INTERRUPT				(1 << 30)
 #define  GEN_READ_DATA_AVAIL				(1 << 29)
@@ -5759,9 +5775,11 @@ enum punit_power_well {
 #define  RXSOT_SYNC_ERROR				(1 << 1)
 #define  RXSOT_ERROR					(1 << 0)
 
-#define _MIPIA_DSI_FUNC_PRG			(VLV_DISPLAY_BASE + 0xb00c)
-#define _MIPIB_DSI_FUNC_PRG			(VLV_DISPLAY_BASE + 0xb80c)
-#define MIPI_DSI_FUNC_PRG(pipe)		_PIPE(pipe, _MIPIA_DSI_FUNC_PRG, _MIPIB_DSI_FUNC_PRG)
+#define _MIPIA_DSI_FUNC_PRG	(dev_priv->mipi_mmio_base + 0xb00c)
+#define _MIPIB_DSI_FUNC_PRG	(dev_priv->mipi_mmio_base + 0xb80c)
+#define MIPI_DSI_FUNC_PRG(check) (_PIPE(		\
+		check, _MIPIA_DSI_FUNC_PRG, _MIPIB_DSI_FUNC_PRG))
+
 #define  CMD_MODE_DATA_WIDTH_MASK			(7 << 13)
 #define  CMD_MODE_NOT_SUPPORTED				(0 << 13)
 #define  CMD_MODE_DATA_WIDTH_16_BIT			(1 << 13)
@@ -5782,161 +5800,242 @@ enum punit_power_well {
 #define  DATA_LANES_PRG_REG_SHIFT			0
 #define  DATA_LANES_PRG_REG_MASK			(7 << 0)
 
-#define _MIPIA_HS_TX_TIMEOUT			(VLV_DISPLAY_BASE + 0xb010)
-#define _MIPIB_HS_TX_TIMEOUT			(VLV_DISPLAY_BASE + 0xb810)
-#define MIPI_HS_TX_TIMEOUT(pipe)	_PIPE(pipe, _MIPIA_HS_TX_TIMEOUT, _MIPIB_HS_TX_TIMEOUT)
-#define  HIGH_SPEED_TX_TIMEOUT_COUNTER_MASK		0xffffff
-
-#define _MIPIA_LP_RX_TIMEOUT			(VLV_DISPLAY_BASE + 0xb014)
-#define _MIPIB_LP_RX_TIMEOUT			(VLV_DISPLAY_BASE + 0xb814)
-#define MIPI_LP_RX_TIMEOUT(pipe)	_PIPE(pipe, _MIPIA_LP_RX_TIMEOUT, _MIPIB_LP_RX_TIMEOUT)
-#define  LOW_POWER_RX_TIMEOUT_COUNTER_MASK		0xffffff
-
-#define _MIPIA_TURN_AROUND_TIMEOUT		(VLV_DISPLAY_BASE + 0xb018)
-#define _MIPIB_TURN_AROUND_TIMEOUT		(VLV_DISPLAY_BASE + 0xb818)
-#define MIPI_TURN_AROUND_TIMEOUT(pipe)	_PIPE(pipe, _MIPIA_TURN_AROUND_TIMEOUT, _MIPIB_TURN_AROUND_TIMEOUT)
-#define  TURN_AROUND_TIMEOUT_MASK			0x3f
-
-#define _MIPIA_DEVICE_RESET_TIMER		(VLV_DISPLAY_BASE + 0xb01c)
-#define _MIPIB_DEVICE_RESET_TIMER		(VLV_DISPLAY_BASE + 0xb81c)
-#define MIPI_DEVICE_RESET_TIMER(pipe)	_PIPE(pipe, _MIPIA_DEVICE_RESET_TIMER, _MIPIB_DEVICE_RESET_TIMER)
-#define  DEVICE_RESET_TIMER_MASK			0xffff
-
-#define _MIPIA_DPI_RESOLUTION			(VLV_DISPLAY_BASE + 0xb020)
-#define _MIPIB_DPI_RESOLUTION			(VLV_DISPLAY_BASE + 0xb820)
-#define MIPI_DPI_RESOLUTION(pipe)	_PIPE(pipe, _MIPIA_DPI_RESOLUTION, _MIPIB_DPI_RESOLUTION)
-#define  VERTICAL_ADDRESS_SHIFT				16
-#define  VERTICAL_ADDRESS_MASK				(0xffff << 16)
-#define  HORIZONTAL_ADDRESS_SHIFT			0
-#define  HORIZONTAL_ADDRESS_MASK			0xffff
-
-#define _MIPIA_DBI_FIFO_THROTTLE		(VLV_DISPLAY_BASE + 0xb024)
-#define _MIPIB_DBI_FIFO_THROTTLE		(VLV_DISPLAY_BASE + 0xb824)
-#define MIPI_DBI_FIFO_THROTTLE(pipe)	_PIPE(pipe, _MIPIA_DBI_FIFO_THROTTLE, _MIPIB_DBI_FIFO_THROTTLE)
-#define  DBI_FIFO_EMPTY_HALF				(0 << 0)
-#define  DBI_FIFO_EMPTY_QUARTER				(1 << 0)
-#define  DBI_FIFO_EMPTY_7_LOCATIONS			(2 << 0)
+#define _MIPIA_HS_TX_TIMEOUT			(dev_priv->mipi_mmio_base + \
+							0xb010)
+#define _MIPIB_HS_TX_TIMEOUT			(dev_priv->mipi_mmio_base + \
+							0xb810)
+#define MIPI_HS_TX_TIMEOUT(check)		(!check ?	\
+	_MIPIA_HS_TX_TIMEOUT : _MIPIB_HS_TX_TIMEOUT)
+#define  HIGH_SPEED_TX_TIMEOUT_COUNTER_MASK	0xffffff
+
+#define _MIPIA_LP_RX_TIMEOUT			(dev_priv->mipi_mmio_base + \
+							0xb014)
+#define _MIPIB_LP_RX_TIMEOUT			(dev_priv->mipi_mmio_base + \
+							0xb814)
+#define MIPI_LP_RX_TIMEOUT(check)		(!check ?	\
+	_MIPIA_LP_RX_TIMEOUT : _MIPIB_LP_RX_TIMEOUT)
+#define  LOW_POWER_RX_TIMEOUT_COUNTER_MASK	0xffffff
+
+#define _MIPIA_TURN_AROUND_TIMEOUT		(dev_priv->mipi_mmio_base + \
+							0xb018)
+#define _MIPIB_TURN_AROUND_TIMEOUT		(dev_priv->mipi_mmio_base + \
+							0xb818)
+#define MIPI_TURN_AROUND_TIMEOUT(check)	(check	\
+	? _MIPIA_TURN_AROUND_TIMEOUT : _MIPIB_TURN_AROUND_TIMEOUT)
+#define  TURN_AROUND_TIMEOUT_MASK		0x3f
+
+#define _MIPIA_DEVICE_RESET_TIMER		(dev_priv->mipi_mmio_base + \
+							0xb01c)
+#define _MIPIB_DEVICE_RESET_TIMER		(dev_priv->mipi_mmio_base + \
+							0xb81c)
+#define MIPI_DEVICE_RESET_TIMER(check)	(!check ?	\
+	_MIPIA_DEVICE_RESET_TIMER : _MIPIB_DEVICE_RESET_TIMER)
+#define  DEVICE_RESET_TIMER_MASK		0xffff
+
+#define _MIPIA_DPI_RESOLUTION			(dev_priv->mipi_mmio_base + \
+							0xb020)
+#define _MIPIB_DPI_RESOLUTION			(dev_priv->mipi_mmio_base + \
+							0xb820)
+#define MIPI_DPI_RESOLUTION(check)		(!check ?	\
+	_MIPIA_DPI_RESOLUTION : _MIPIB_DPI_RESOLUTION)
+#define  VERTICAL_ADDRESS_SHIFT			16
+#define  VERTICAL_ADDRESS_MASK			(0xffff << 16)
+#define  HORIZONTAL_ADDRESS_SHIFT		0
+#define  HORIZONTAL_ADDRESS_MASK		0xffff
+
+#define _MIPIA_DBI_FIFO_THROTTLE		(dev_priv->mipi_mmio_base + \
+							0xb024)
+#define _MIPIB_DBI_FIFO_THROTTLE		(dev_priv->mipi_mmio_base + \
+							0xb824)
+#define MIPI_DBI_FIFO_THROTTLE(check)	(!check ?	\
+	_MIPIA_DBI_FIFO_THROTTLE : _MIPIB_DBI_FIFO_THROTTLE)
+#define  DBI_FIFO_EMPTY_HALF			(0 << 0)
+#define  DBI_FIFO_EMPTY_QUARTER			(1 << 0)
+#define  DBI_FIFO_EMPTY_7_LOCATIONS		(2 << 0)
 
 /* regs below are bits 15:0 */
-#define _MIPIA_HSYNC_PADDING_COUNT		(VLV_DISPLAY_BASE + 0xb028)
-#define _MIPIB_HSYNC_PADDING_COUNT		(VLV_DISPLAY_BASE + 0xb828)
-#define MIPI_HSYNC_PADDING_COUNT(pipe)	_PIPE(pipe, _MIPIA_HSYNC_PADDING_COUNT, _MIPIB_HSYNC_PADDING_COUNT)
-
-#define _MIPIA_HBP_COUNT			(VLV_DISPLAY_BASE + 0xb02c)
-#define _MIPIB_HBP_COUNT			(VLV_DISPLAY_BASE + 0xb82c)
-#define MIPI_HBP_COUNT(pipe)		_PIPE(pipe, _MIPIA_HBP_COUNT, _MIPIB_HBP_COUNT)
-
-#define _MIPIA_HFP_COUNT			(VLV_DISPLAY_BASE + 0xb030)
-#define _MIPIB_HFP_COUNT			(VLV_DISPLAY_BASE + 0xb830)
-#define MIPI_HFP_COUNT(pipe)		_PIPE(pipe, _MIPIA_HFP_COUNT, _MIPIB_HFP_COUNT)
-
-#define _MIPIA_HACTIVE_AREA_COUNT		(VLV_DISPLAY_BASE + 0xb034)
-#define _MIPIB_HACTIVE_AREA_COUNT		(VLV_DISPLAY_BASE + 0xb834)
-#define MIPI_HACTIVE_AREA_COUNT(pipe)	_PIPE(pipe, _MIPIA_HACTIVE_AREA_COUNT, _MIPIB_HACTIVE_AREA_COUNT)
+#define _MIPIA_HSYNC_PADDING_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb028)
+#define _MIPIB_HSYNC_PADDING_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb828)
+#define MIPI_HSYNC_PADDING_COUNT(check)	(!check ?	\
+	_MIPIA_HSYNC_PADDING_COUNT : _MIPIB_HSYNC_PADDING_COUNT)
+
+#define _MIPIA_HBP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb02c)
+#define _MIPIB_HBP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb82c)
+#define MIPI_HBP_COUNT(check)		(!check ?	\
+	_MIPIA_HBP_COUNT : _MIPIB_HBP_COUNT)
+
+#define _MIPIA_HFP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb030)
+#define _MIPIB_HFP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb830)
+#define MIPI_HFP_COUNT(check)		(!check ?	\
+	_MIPIA_HFP_COUNT : _MIPIB_HFP_COUNT)
+
+#define _MIPIA_HACTIVE_AREA_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb034)
+#define _MIPIB_HACTIVE_AREA_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb834)
+#define MIPI_HACTIVE_AREA_COUNT(check)	(!check ?	\
+	_MIPIA_HACTIVE_AREA_COUNT : _MIPIB_HACTIVE_AREA_COUNT)
+
+#define _MIPIA_VSYNC_PADDING_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb038)
+#define _MIPIB_VSYNC_PADDING_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb838)
+#define MIPI_VSYNC_PADDING_COUNT(check)	(!check ?	\
+	_MIPIA_VSYNC_PADDING_COUNT : _MIPIB_VSYNC_PADDING_COUNT)
+
+#define _MIPIA_VBP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb03c)
+#define _MIPIB_VBP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb83c)
+#define MIPI_VBP_COUNT(check)		(!check ?	\
+	_MIPIA_VBP_COUNT : _MIPIB_VBP_COUNT)
+
+#define _MIPIA_VFP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb040)
+#define _MIPIB_VFP_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb840)
+#define MIPI_VFP_COUNT(check)		(!check ?	\
+	_MIPIA_VFP_COUNT : _MIPIB_VFP_COUNT)
+
+#define _MIPIA_HIGH_LOW_SWITCH_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb044)
+#define _MIPIB_HIGH_LOW_SWITCH_COUNT		(dev_priv->mipi_mmio_base + \
+							0xb844)
+#define MIPI_HIGH_LOW_SWITCH_COUNT(check)	(!check ?	\
+	_MIPIA_HIGH_LOW_SWITCH_COUNT : _MIPIB_HIGH_LOW_SWITCH_COUNT)
 
-#define _MIPIA_VSYNC_PADDING_COUNT		(VLV_DISPLAY_BASE + 0xb038)
-#define _MIPIB_VSYNC_PADDING_COUNT		(VLV_DISPLAY_BASE + 0xb838)
-#define MIPI_VSYNC_PADDING_COUNT(pipe)	_PIPE(pipe, _MIPIA_VSYNC_PADDING_COUNT, _MIPIB_VSYNC_PADDING_COUNT)
-
-#define _MIPIA_VBP_COUNT			(VLV_DISPLAY_BASE + 0xb03c)
-#define _MIPIB_VBP_COUNT			(VLV_DISPLAY_BASE + 0xb83c)
-#define MIPI_VBP_COUNT(pipe)		_PIPE(pipe, _MIPIA_VBP_COUNT, _MIPIB_VBP_COUNT)
-
-#define _MIPIA_VFP_COUNT			(VLV_DISPLAY_BASE + 0xb040)
-#define _MIPIB_VFP_COUNT			(VLV_DISPLAY_BASE + 0xb840)
-#define MIPI_VFP_COUNT(pipe)		_PIPE(pipe, _MIPIA_VFP_COUNT, _MIPIB_VFP_COUNT)
-
-#define _MIPIA_HIGH_LOW_SWITCH_COUNT		(VLV_DISPLAY_BASE + 0xb044)
-#define _MIPIB_HIGH_LOW_SWITCH_COUNT		(VLV_DISPLAY_BASE + 0xb844)
-#define MIPI_HIGH_LOW_SWITCH_COUNT(pipe)	_PIPE(pipe, _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIB_HIGH_LOW_SWITCH_COUNT)
 /* regs above are bits 15:0 */
 
-#define _MIPIA_DPI_CONTROL			(VLV_DISPLAY_BASE + 0xb048)
-#define _MIPIB_DPI_CONTROL			(VLV_DISPLAY_BASE + 0xb848)
-#define MIPI_DPI_CONTROL(pipe)		_PIPE(pipe, _MIPIA_DPI_CONTROL, _MIPIB_DPI_CONTROL)
-#define  DPI_LP_MODE					(1 << 6)
-#define  BACKLIGHT_OFF					(1 << 5)
-#define  BACKLIGHT_ON					(1 << 4)
-#define  COLOR_MODE_OFF					(1 << 3)
-#define  COLOR_MODE_ON					(1 << 2)
-#define  TURN_ON					(1 << 1)
-#define  SHUTDOWN					(1 << 0)
-
-#define _MIPIA_DPI_DATA				(VLV_DISPLAY_BASE + 0xb04c)
-#define _MIPIB_DPI_DATA				(VLV_DISPLAY_BASE + 0xb84c)
-#define MIPI_DPI_DATA(pipe)		_PIPE(pipe, _MIPIA_DPI_DATA, _MIPIB_DPI_DATA)
-#define  COMMAND_BYTE_SHIFT				0
-#define  COMMAND_BYTE_MASK				(0x3f << 0)
-
-#define _MIPIA_INIT_COUNT			(VLV_DISPLAY_BASE + 0xb050)
-#define _MIPIB_INIT_COUNT			(VLV_DISPLAY_BASE + 0xb850)
-#define MIPI_INIT_COUNT(pipe)		_PIPE(pipe, _MIPIA_INIT_COUNT, _MIPIB_INIT_COUNT)
-#define  MASTER_INIT_TIMER_SHIFT			0
-#define  MASTER_INIT_TIMER_MASK				(0xffff << 0)
-
-#define _MIPIA_MAX_RETURN_PKT_SIZE		(VLV_DISPLAY_BASE + 0xb054)
-#define _MIPIB_MAX_RETURN_PKT_SIZE		(VLV_DISPLAY_BASE + 0xb854)
-#define MIPI_MAX_RETURN_PKT_SIZE(pipe)	_PIPE(pipe, _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIB_MAX_RETURN_PKT_SIZE)
-#define  MAX_RETURN_PKT_SIZE_SHIFT			0
-#define  MAX_RETURN_PKT_SIZE_MASK			(0x3ff << 0)
-
-#define _MIPIA_VIDEO_MODE_FORMAT		(VLV_DISPLAY_BASE + 0xb058)
-#define _MIPIB_VIDEO_MODE_FORMAT		(VLV_DISPLAY_BASE + 0xb858)
-#define MIPI_VIDEO_MODE_FORMAT(pipe)	_PIPE(pipe, _MIPIA_VIDEO_MODE_FORMAT, _MIPIB_VIDEO_MODE_FORMAT)
-#define  RANDOM_DPI_DISPLAY_RESOLUTION			(1 << 4)
-#define  DISABLE_VIDEO_BTA				(1 << 3)
-#define  IP_TG_CONFIG					(1 << 2)
-#define  VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE		(1 << 0)
-#define  VIDEO_MODE_NON_BURST_WITH_SYNC_EVENTS		(2 << 0)
-#define  VIDEO_MODE_BURST				(3 << 0)
-
-#define _MIPIA_EOT_DISABLE			(VLV_DISPLAY_BASE + 0xb05c)
-#define _MIPIB_EOT_DISABLE			(VLV_DISPLAY_BASE + 0xb85c)
-#define MIPI_EOT_DISABLE(pipe)		_PIPE(pipe, _MIPIA_EOT_DISABLE, _MIPIB_EOT_DISABLE)
-#define  LP_RX_TIMEOUT_ERROR_RECOVERY_DISABLE		(1 << 7)
-#define  HS_RX_TIMEOUT_ERROR_RECOVERY_DISABLE		(1 << 6)
-#define  LOW_CONTENTION_RECOVERY_DISABLE		(1 << 5)
-#define  HIGH_CONTENTION_RECOVERY_DISABLE		(1 << 4)
+#define _MIPIA_DPI_CONTROL			(dev_priv->mipi_mmio_base + \
+							0xb048)
+#define _MIPIB_DPI_CONTROL			(dev_priv->mipi_mmio_base + \
+							0xb848)
+#define MIPI_DPI_CONTROL(check)		(!check ?	\
+	_MIPIA_DPI_CONTROL : _MIPIB_DPI_CONTROL)
+#define  DPI_LP_MODE				(1 << 6)
+#define  BACKLIGHT_OFF				(1 << 5)
+#define  BACKLIGHT_ON				(1 << 4)
+#define  COLOR_MODE_OFF				(1 << 3)
+#define  COLOR_MODE_ON				(1 << 2)
+#define  TURN_ON				(1 << 1)
+#define  SHUTDOWN				(1 << 0)
+
+#define _MIPIA_DPI_DATA				(dev_priv->mipi_mmio_base + \
+							0xb04c)
+#define _MIPIB_DPI_DATA				(dev_priv->mipi_mmio_base + \
+							0xb84c)
+#define MIPI_DPI_DATA(check)		(!check ?	\
+	_MIPIA_DPI_DATA : _MIPIB_DPI_DATA)
+#define  COMMAND_BYTE_SHIFT			0
+#define  COMMAND_BYTE_MASK			(0x3f << 0)
+
+#define _MIPIA_INIT_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb050)
+#define _MIPIB_INIT_COUNT			(dev_priv->mipi_mmio_base + \
+							0xb850)
+#define MIPI_INIT_COUNT(check)		(!check ?	\
+	_MIPIA_INIT_COUNT : _MIPIB_INIT_COUNT)
+#define  MASTER_INIT_TIMER_SHIFT		0
+#define  MASTER_INIT_TIMER_MASK			(0xffff << 0)
+
+#define _MIPIA_MAX_RETURN_PKT_SIZE		(dev_priv->mipi_mmio_base + \
+							0xb054)
+#define _MIPIB_MAX_RETURN_PKT_SIZE		(dev_priv->mipi_mmio_base + \
+							0xb854)
+#define MIPI_MAX_RETURN_PKT_SIZE(check)	(!check ?	\
+	_MIPIA_MAX_RETURN_PKT_SIZE : _MIPIB_MAX_RETURN_PKT_SIZE)
+#define  MAX_RETURN_PKT_SIZE_SHIFT		0
+#define  MAX_RETURN_PKT_SIZE_MASK		(0x3ff << 0)
+
+#define _MIPIA_VIDEO_MODE_FORMAT		(dev_priv->mipi_mmio_base + \
+							0xb058)
+#define _MIPIB_VIDEO_MODE_FORMAT		(dev_priv->mipi_mmio_base + \
+							0xb858)
+#define MIPI_VIDEO_MODE_FORMAT(check)	(!check ?	\
+	_MIPIA_VIDEO_MODE_FORMAT : _MIPIB_VIDEO_MODE_FORMAT)
+#define  RANDOM_DPI_DISPLAY_RESOLUTION	(1 << 4)
+#define  DISABLE_VIDEO_BTA			(1 << 3)
+#define  IP_TG_CONFIG				(1 << 2)
+#define  VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE	(1 << 0)
+#define  VIDEO_MODE_NON_BURST_WITH_SYNC_EVENTS	(2 << 0)
+#define  VIDEO_MODE_BURST			(3 << 0)
+
+#define _MIPIA_EOT_DISABLE			(dev_priv->mipi_mmio_base + \
+							0xb05c)
+#define _MIPIB_EOT_DISABLE			(dev_priv->mipi_mmio_base + \
+							0xb85c)
+#define MIPI_EOT_DISABLE(check)		(!check ?	\
+	_MIPIA_EOT_DISABLE : _MIPIB_EOT_DISABLE)
+#define  LP_RX_TIMEOUT_ERROR_RECOVERY_DISABLE	(1 << 7)
+#define  HS_RX_TIMEOUT_ERROR_RECOVERY_DISABLE	(1 << 6)
+#define  LOW_CONTENTION_RECOVERY_DISABLE	(1 << 5)
+#define  HIGH_CONTENTION_RECOVERY_DISABLE	(1 << 4)
 #define  TXDSI_TYPE_NOT_RECOGNISED_ERROR_RECOVERY_DISABLE (1 << 3)
-#define  TXECC_MULTIBIT_ERROR_RECOVERY_DISABLE		(1 << 2)
-#define  CLOCKSTOP					(1 << 1)
-#define  EOT_DISABLE					(1 << 0)
-
-#define _MIPIA_LP_BYTECLK			(VLV_DISPLAY_BASE + 0xb060)
-#define _MIPIB_LP_BYTECLK			(VLV_DISPLAY_BASE + 0xb860)
-#define MIPI_LP_BYTECLK(pipe)		_PIPE(pipe, _MIPIA_LP_BYTECLK, _MIPIB_LP_BYTECLK)
-#define  LP_BYTECLK_SHIFT				0
-#define  LP_BYTECLK_MASK				(0xffff << 0)
+#define  TXECC_MULTIBIT_ERROR_RECOVERY_DISABLE	(1 << 2)
+#define  CLOCKSTOP				(1 << 1)
+#define  EOT_DISABLE				(1 << 0)
+
+#define _MIPIA_LP_BYTECLK			(dev_priv->mipi_mmio_base + \
+							0xb060)
+#define _MIPIB_LP_BYTECLK			(dev_priv->mipi_mmio_base + \
+							0xb860)
+#define MIPI_LP_BYTECLK(check)		(!check ?	\
+	_MIPIA_LP_BYTECLK : _MIPIB_LP_BYTECLK)
+#define  LP_BYTECLK_SHIFT			0
+#define  LP_BYTECLK_MASK			(0xffff << 0)
 
 /* bits 31:0 */
-#define _MIPIA_LP_GEN_DATA			(VLV_DISPLAY_BASE + 0xb064)
-#define _MIPIB_LP_GEN_DATA			(VLV_DISPLAY_BASE + 0xb864)
-#define MIPI_LP_GEN_DATA(pipe)		_PIPE(pipe, _MIPIA_LP_GEN_DATA, _MIPIB_LP_GEN_DATA)
+#define _MIPIA_LP_GEN_DATA			(dev_priv->mipi_mmio_base + \
+							0xb064)
+#define _MIPIB_LP_GEN_DATA			(dev_priv->mipi_mmio_base + \
+							0xb864)
+#define MIPI_LP_GEN_DATA(check)		(!check ?	\
+	_MIPIA_LP_GEN_DATA : _MIPIB_LP_GEN_DATA)
 
 /* bits 31:0 */
-#define _MIPIA_HS_GEN_DATA			(VLV_DISPLAY_BASE + 0xb068)
-#define _MIPIB_HS_GEN_DATA			(VLV_DISPLAY_BASE + 0xb868)
-#define MIPI_HS_GEN_DATA(pipe)		_PIPE(pipe, _MIPIA_HS_GEN_DATA, _MIPIB_HS_GEN_DATA)
-
-#define _MIPIA_LP_GEN_CTRL			(VLV_DISPLAY_BASE + 0xb06c)
-#define _MIPIB_LP_GEN_CTRL			(VLV_DISPLAY_BASE + 0xb86c)
-#define MIPI_LP_GEN_CTRL(pipe)		_PIPE(pipe, _MIPIA_LP_GEN_CTRL, _MIPIB_LP_GEN_CTRL)
-#define _MIPIA_HS_GEN_CTRL			(VLV_DISPLAY_BASE + 0xb070)
-#define _MIPIB_HS_GEN_CTRL			(VLV_DISPLAY_BASE + 0xb870)
-#define MIPI_HS_GEN_CTRL(pipe)		_PIPE(pipe, _MIPIA_HS_GEN_CTRL, _MIPIB_HS_GEN_CTRL)
-#define  LONG_PACKET_WORD_COUNT_SHIFT			8
-#define  LONG_PACKET_WORD_COUNT_MASK			(0xffff << 8)
-#define  SHORT_PACKET_PARAM_SHIFT			8
-#define  SHORT_PACKET_PARAM_MASK			(0xffff << 8)
-#define  VIRTUAL_CHANNEL_SHIFT				6
-#define  VIRTUAL_CHANNEL_MASK				(3 << 6)
-#define  DATA_TYPE_SHIFT				0
-#define  DATA_TYPE_MASK					(3f << 0)
+#define _MIPIA_HS_GEN_DATA			(dev_priv->mipi_mmio_base + \
+							0xb068)
+#define _MIPIB_HS_GEN_DATA			(dev_priv->mipi_mmio_base + \
+							0xb868)
+#define MIPI_HS_GEN_DATA(check)		(!check ?	\
+	_MIPIA_HS_GEN_DATA : _MIPIB_HS_GEN_DATA)
+
+#define _MIPIA_LP_GEN_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb06c)
+#define _MIPIB_LP_GEN_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb86c)
+#define MIPI_LP_GEN_CTRL(check)		(!check ?	\
+	_MIPIA_LP_GEN_CTRL : _MIPIB_LP_GEN_CTRL)
+#define _MIPIA_HS_GEN_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb070)
+#define _MIPIB_HS_GEN_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb870)
+#define MIPI_HS_GEN_CTRL(check)		(!check ?	\
+	_MIPIA_HS_GEN_CTRL : _MIPIB_HS_GEN_CTRL)
+
+#define  LONG_PACKET_WORD_COUNT_SHIFT		8
+#define  LONG_PACKET_WORD_COUNT_MASK		(0xffff << 8)
+#define  SHORT_PACKET_PARAM_SHIFT		8
+#define  SHORT_PACKET_PARAM_MASK		(0xffff << 8)
+#define  VIRTUAL_CHANNEL_SHIFT			6
+#define  VIRTUAL_CHANNEL_MASK			(3 << 6)
+#define  DATA_TYPE_SHIFT			0
+#define  DATA_TYPE_MASK				(3f << 0)
+
 /* data type values, see include/video/mipi_display.h */
 
-#define _MIPIA_GEN_FIFO_STAT			(VLV_DISPLAY_BASE + 0xb074)
-#define _MIPIB_GEN_FIFO_STAT			(VLV_DISPLAY_BASE + 0xb874)
-#define MIPI_GEN_FIFO_STAT(pipe)	_PIPE(pipe, _MIPIA_GEN_FIFO_STAT, _MIPIB_GEN_FIFO_STAT)
+#define _MIPIA_GEN_FIFO_STAT			(dev_priv->mipi_mmio_base + \
+							0xb074)
+#define _MIPIB_GEN_FIFO_STAT			(dev_priv->mipi_mmio_base + \
+							0xb874)
+#define MIPI_GEN_FIFO_STAT(check)	(!check ?	\
+	_MIPIA_GEN_FIFO_STAT : _MIPIB_GEN_FIFO_STAT)
 #define  DPI_FIFO_EMPTY					(1 << 28)
 #define  DBI_FIFO_EMPTY					(1 << 27)
 #define  LP_CTRL_FIFO_EMPTY				(1 << 26)
@@ -5952,118 +6051,162 @@ enum punit_power_well {
 #define  HS_DATA_FIFO_HALF_EMPTY			(1 << 1)
 #define  HS_DATA_FIFO_FULL				(1 << 0)
 
-#define _MIPIA_HS_LS_DBI_ENABLE			(VLV_DISPLAY_BASE + 0xb078)
-#define _MIPIB_HS_LS_DBI_ENABLE			(VLV_DISPLAY_BASE + 0xb878)
-#define MIPI_HS_LP_DBI_ENABLE(pipe)	_PIPE(pipe, _MIPIA_HS_LS_DBI_ENABLE, _MIPIB_HS_LS_DBI_ENABLE)
+#define _MIPIA_HS_LS_DBI_ENABLE			(dev_priv->mipi_mmio_base + \
+							0xb078)
+#define _MIPIB_HS_LS_DBI_ENABLE			(dev_priv->mipi_mmio_base + \
+							0xb878)
+#define MIPI_HS_LP_DBI_ENABLE(check)	(!check ?	\
+	_MIPIA_HS_LS_DBI_ENABLE : _MIPIB_HS_LS_DBI_ENABLE)
 #define  DBI_HS_LP_MODE_MASK				(1 << 0)
 #define  DBI_LP_MODE					(1 << 0)
 #define  DBI_HS_MODE					(0 << 0)
 
-#define _MIPIA_DPHY_PARAM			(VLV_DISPLAY_BASE + 0xb080)
-#define _MIPIB_DPHY_PARAM			(VLV_DISPLAY_BASE + 0xb880)
-#define MIPI_DPHY_PARAM(pipe)		_PIPE(pipe, _MIPIA_DPHY_PARAM, _MIPIB_DPHY_PARAM)
-#define  EXIT_ZERO_COUNT_SHIFT				24
-#define  EXIT_ZERO_COUNT_MASK				(0x3f << 24)
-#define  TRAIL_COUNT_SHIFT				16
-#define  TRAIL_COUNT_MASK				(0x1f << 16)
-#define  CLK_ZERO_COUNT_SHIFT				8
-#define  CLK_ZERO_COUNT_MASK				(0xff << 8)
-#define  PREPARE_COUNT_SHIFT				0
-#define  PREPARE_COUNT_MASK				(0x3f << 0)
+#define _MIPIA_DPHY_PARAM			(dev_priv->mipi_mmio_base + \
+							0xb080)
+#define _MIPIB_DPHY_PARAM			(dev_priv->mipi_mmio_base + \
+							0xb880)
+#define MIPI_DPHY_PARAM(check)		(!check ?	\
+	_MIPIA_DPHY_PARAM : _MIPIB_DPHY_PARAM)
+#define  EXIT_ZERO_COUNT_SHIFT			24
+#define  EXIT_ZERO_COUNT_MASK			(0x3f << 24)
+#define  TRAIL_COUNT_SHIFT			16
+#define  TRAIL_COUNT_MASK			(0x1f << 16)
+#define  CLK_ZERO_COUNT_SHIFT			8
+#define  CLK_ZERO_COUNT_MASK			(0xff << 8)
+#define  PREPARE_COUNT_SHIFT			0
+#define  PREPARE_COUNT_MASK			(0x3f << 0)
 
 /* bits 31:0 */
-#define _MIPIA_DBI_BW_CTRL			(VLV_DISPLAY_BASE + 0xb084)
-#define _MIPIB_DBI_BW_CTRL			(VLV_DISPLAY_BASE + 0xb884)
-#define MIPI_DBI_BW_CTRL(pipe)		_PIPE(pipe, _MIPIA_DBI_BW_CTRL, _MIPIB_DBI_BW_CTRL)
-
-#define _MIPIA_CLK_LANE_SWITCH_TIME_CNT		(VLV_DISPLAY_BASE + 0xb088)
-#define _MIPIB_CLK_LANE_SWITCH_TIME_CNT		(VLV_DISPLAY_BASE + 0xb888)
-#define MIPI_CLK_LANE_SWITCH_TIME_CNT(pipe)	_PIPE(pipe, _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIB_CLK_LANE_SWITCH_TIME_CNT)
-#define  LP_HS_SSW_CNT_SHIFT				16
-#define  LP_HS_SSW_CNT_MASK				(0xffff << 16)
-#define  HS_LP_PWR_SW_CNT_SHIFT				0
-#define  HS_LP_PWR_SW_CNT_MASK				(0xffff << 0)
-
-#define _MIPIA_STOP_STATE_STALL			(VLV_DISPLAY_BASE + 0xb08c)
-#define _MIPIB_STOP_STATE_STALL			(VLV_DISPLAY_BASE + 0xb88c)
-#define MIPI_STOP_STATE_STALL(pipe)	_PIPE(pipe, _MIPIA_STOP_STATE_STALL, _MIPIB_STOP_STATE_STALL)
-#define  STOP_STATE_STALL_COUNTER_SHIFT			0
-#define  STOP_STATE_STALL_COUNTER_MASK			(0xff << 0)
-
-#define _MIPIA_INTR_STAT_REG_1			(VLV_DISPLAY_BASE + 0xb090)
-#define _MIPIB_INTR_STAT_REG_1			(VLV_DISPLAY_BASE + 0xb890)
-#define MIPI_INTR_STAT_REG_1(pipe)	_PIPE(pipe, _MIPIA_INTR_STAT_REG_1, _MIPIB_INTR_STAT_REG_1)
-#define _MIPIA_INTR_EN_REG_1			(VLV_DISPLAY_BASE + 0xb094)
-#define _MIPIB_INTR_EN_REG_1			(VLV_DISPLAY_BASE + 0xb894)
-#define MIPI_INTR_EN_REG_1(pipe)	_PIPE(pipe, _MIPIA_INTR_EN_REG_1, _MIPIB_INTR_EN_REG_1)
-#define  RX_CONTENTION_DETECTED				(1 << 0)
-
-/* XXX: only pipe A ?!? */
-#define MIPIA_DBI_TYPEC_CTRL			(VLV_DISPLAY_BASE + 0xb100)
-#define  DBI_TYPEC_ENABLE				(1 << 31)
-#define  DBI_TYPEC_WIP					(1 << 30)
-#define  DBI_TYPEC_OPTION_SHIFT				28
-#define  DBI_TYPEC_OPTION_MASK				(3 << 28)
-#define  DBI_TYPEC_FREQ_SHIFT				24
-#define  DBI_TYPEC_FREQ_MASK				(0xf << 24)
-#define  DBI_TYPEC_OVERRIDE				(1 << 8)
-#define  DBI_TYPEC_OVERRIDE_COUNTER_SHIFT		0
-#define  DBI_TYPEC_OVERRIDE_COUNTER_MASK		(0xff << 0)
-
+#define _MIPIA_DBI_BW_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb084)
+#define _MIPIB_DBI_BW_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb884)
+#define MIPI_DBI_BW_CTRL(check)		(!check ?	\
+	_MIPIA_DBI_BW_CTRL : _MIPIB_DBI_BW_CTRL)
+
+
+#define _MIPIA_CLK_LANE_SWITCH_TIME_CNT		(dev_priv->mipi_mmio_base + \
+							0xb088)
+#define _MIPIB_CLK_LANE_SWITCH_TIME_CNT		(dev_priv->mipi_mmio_base + \
+							0xb888)
+#define MIPI_CLK_LANE_SWITCH_TIME_CNT(check)	(!check ?	\
+	_MIPIA_CLK_LANE_SWITCH_TIME_CNT : _MIPIB_CLK_LANE_SWITCH_TIME_CNT)
+#define  LP_HS_SSW_CNT_SHIFT			16
+#define  LP_HS_SSW_CNT_MASK			(0xffff << 16)
+#define  HS_LP_PWR_SW_CNT_SHIFT			0
+#define  HS_LP_PWR_SW_CNT_MASK			(0xffff << 0)
+
+#define _MIPIA_STOP_STATE_STALL			(dev_priv->mipi_mmio_base + \
+							0xb08c)
+#define _MIPIB_STOP_STATE_STALL			(dev_priv->mipi_mmio_base + \
+							0xb88c)
+#define MIPI_STOP_STATE_STALL(check)	(!check ?	\
+	_MIPIA_STOP_STATE_STALL : _MIPIB_STOP_STATE_STALL)
+#define  STOP_STATE_STALL_COUNTER_SHIFT		0
+#define  STOP_STATE_STALL_COUNTER_MASK		(0xff << 0)
+
+#define _MIPIA_INTR_STAT_REG_1			(dev_priv->mipi_mmio_base + \
+							0xb090)
+#define _MIPIB_INTR_STAT_REG_1			(dev_priv->mipi_mmio_base + \
+							0xb890)
+#define MIPI_INTR_STAT_REG_1(check)		(!check ?	\
+	_MIPIA_INTR_STAT_REG_1 : _MIPIB_INTR_STAT_REG_1)
+
+#define _MIPIA_INTR_EN_REG_1			(dev_priv->mipi_mmio_base + \
+							0xb094)
+#define _MIPIB_INTR_EN_REG_1			(dev_priv->mipi_mmio_base + \
+							0xb894)
+#define MIPI_INTR_EN_REG_1(check)		(!check ?	\
+	_MIPIA_INTR_EN_REG_1 : _MIPIB_INTR_EN_REG_1)
+#define  RX_CONTENTION_DETECTED			(1 << 0)
+
+/* XXX: only check A ?!? */
+#define MIPIA_DBI_TYPEC_CTRL			(dev_priv->mipi_mmio_base + \
+							0xb100)
+#define  DBI_TYPEC_ENABLE			(1 << 31)
+#define  DBI_TYPEC_WIP				(1 << 30)
+#define  DBI_TYPEC_OPTION_SHIFT			28
+#define  DBI_TYPEC_OPTION_MASK			(3 << 28)
+#define  DBI_TYPEC_FREQ_SHIFT			24
+#define  DBI_TYPEC_FREQ_MASK			(0xf << 24)
+#define  DBI_TYPEC_OVERRIDE			(1 << 8)
+#define  DBI_TYPEC_OVERRIDE_COUNTER_SHIFT	0
+#define  DBI_TYPEC_OVERRIDE_COUNTER_MASK	(0xff << 0)
 
 /* MIPI adapter registers */
 
-#define _MIPIA_CTRL				(VLV_DISPLAY_BASE + 0xb104)
-#define _MIPIB_CTRL				(VLV_DISPLAY_BASE + 0xb904)
-#define MIPI_CTRL(pipe)			_PIPE(pipe, _MIPIA_CTRL, _MIPIB_CTRL)
-#define  ESCAPE_CLOCK_DIVIDER_SHIFT			5 /* A only */
-#define  ESCAPE_CLOCK_DIVIDER_MASK			(3 << 5)
-#define  ESCAPE_CLOCK_DIVIDER_1				(0 << 5)
-#define  ESCAPE_CLOCK_DIVIDER_2				(1 << 5)
-#define  ESCAPE_CLOCK_DIVIDER_4				(2 << 5)
-#define  READ_REQUEST_PRIORITY_SHIFT			3
-#define  READ_REQUEST_PRIORITY_MASK			(3 << 3)
-#define  READ_REQUEST_PRIORITY_LOW			(0 << 3)
-#define  READ_REQUEST_PRIORITY_HIGH			(3 << 3)
-#define  RGB_FLIP_TO_BGR				(1 << 2)
-
-#define _MIPIA_DATA_ADDRESS			(VLV_DISPLAY_BASE + 0xb108)
-#define _MIPIB_DATA_ADDRESS			(VLV_DISPLAY_BASE + 0xb908)
-#define MIPI_DATA_ADDRESS(pipe)		_PIPE(pipe, _MIPIA_DATA_ADDRESS, _MIPIB_DATA_ADDRESS)
-#define  DATA_MEM_ADDRESS_SHIFT				5
-#define  DATA_MEM_ADDRESS_MASK				(0x7ffffff << 5)
-#define  DATA_VALID					(1 << 0)
-
-#define _MIPIA_DATA_LENGTH			(VLV_DISPLAY_BASE + 0xb10c)
-#define _MIPIB_DATA_LENGTH			(VLV_DISPLAY_BASE + 0xb90c)
-#define MIPI_DATA_LENGTH(pipe)		_PIPE(pipe, _MIPIA_DATA_LENGTH, _MIPIB_DATA_LENGTH)
-#define  DATA_LENGTH_SHIFT				0
-#define  DATA_LENGTH_MASK				(0xfffff << 0)
-
-#define _MIPIA_COMMAND_ADDRESS			(VLV_DISPLAY_BASE + 0xb110)
-#define _MIPIB_COMMAND_ADDRESS			(VLV_DISPLAY_BASE + 0xb910)
-#define MIPI_COMMAND_ADDRESS(pipe)	_PIPE(pipe, _MIPIA_COMMAND_ADDRESS, _MIPIB_COMMAND_ADDRESS)
-#define  COMMAND_MEM_ADDRESS_SHIFT			5
-#define  COMMAND_MEM_ADDRESS_MASK			(0x7ffffff << 5)
-#define  AUTO_PWG_ENABLE				(1 << 2)
-#define  MEMORY_WRITE_DATA_FROM_PIPE_RENDERING		(1 << 1)
-#define  COMMAND_VALID					(1 << 0)
-
-#define _MIPIA_COMMAND_LENGTH			(VLV_DISPLAY_BASE + 0xb114)
-#define _MIPIB_COMMAND_LENGTH			(VLV_DISPLAY_BASE + 0xb914)
-#define MIPI_COMMAND_LENGTH(pipe)	_PIPE(pipe, _MIPIA_COMMAND_LENGTH, _MIPIB_COMMAND_LENGTH)
-#define  COMMAND_LENGTH_SHIFT(n)			(8 * (n)) /* n: 0...3 */
-#define  COMMAND_LENGTH_MASK(n)				(0xff << (8 * (n)))
-
-#define _MIPIA_READ_DATA_RETURN0		(VLV_DISPLAY_BASE + 0xb118)
-#define _MIPIB_READ_DATA_RETURN0		(VLV_DISPLAY_BASE + 0xb918)
-#define MIPI_READ_DATA_RETURN(pipe, n) \
-	(_PIPE(pipe, _MIPIA_READ_DATA_RETURN0, _MIPIB_READ_DATA_RETURN0) + 4 * (n)) /* n: 0...7 */
-
-#define _MIPIA_READ_DATA_VALID			(VLV_DISPLAY_BASE + 0xb138)
-#define _MIPIB_READ_DATA_VALID			(VLV_DISPLAY_BASE + 0xb938)
-#define MIPI_READ_DATA_VALID(pipe)	_PIPE(pipe, _MIPIA_READ_DATA_VALID, _MIPIB_READ_DATA_VALID)
-#define  READ_DATA_VALID(n)				(1 << (n))
+#define _MIPIA_CTRL				(dev_priv->mipi_mmio_base + \
+							0xb104)
+#define _MIPIB_CTRL				(dev_priv->mipi_mmio_base + \
+							0xb904)
+#define MIPI_CTRL(check)			(!check ?	\
+	_MIPIA_CTRL : _MIPIB_CTRL)
+#define  ESCAPE_CLOCK_DIVIDER_SHIFT		5 /* A only */
+#define  ESCAPE_CLOCK_DIVIDER_MASK		(3 << 5)
+#define  ESCAPE_CLOCK_DIVIDER_1			(0 << 5)
+#define  ESCAPE_CLOCK_DIVIDER_2			(1 << 5)
+#define  ESCAPE_CLOCK_DIVIDER_4			(2 << 5)
+#define  READ_REQUEST_PRIORITY_SHIFT		3
+#define  READ_REQUEST_PRIORITY_MASK		(3 << 3)
+#define  READ_REQUEST_PRIORITY_LOW		(0 << 3)
+#define  READ_REQUEST_PRIORITY_HIGH		(3 << 3)
+#define  RGB_FLIP_TO_BGR			(1 << 2)
+
+#define _MIPIA_DATA_ADDRESS			(dev_priv->mipi_mmio_base + \
+							0xb108)
+#define _MIPIB_DATA_ADDRESS			(dev_priv->mipi_mmio_base + \
+							0xb908)
+#define MIPI_DATA_ADDRESS(check)	(!check ?	\
+	_MIPIA_DATA_ADDRESS : _MIPIB_DATA_ADDRESS)
+#define  DATA_MEM_ADDRESS_SHIFT			5
+#define  DATA_MEM_ADDRESS_MASK			(0x7ffffff << 5)
+#define  DATA_VALID				(1 << 0)
+
+#define _MIPIA_DATA_LENGTH			(dev_priv->mipi_mmio_base + \
+							0xb10c)
+#define _MIPIB_DATA_LENGTH			(dev_priv->mipi_mmio_base + \
+							0xb90c)
+#define MIPI_DATA_LENGTH(check)		(!check ?	\
+	_MIPIA_DATA_LENGTH : _MIPIB_DATA_LENGTH)
+#define  DATA_LENGTH_SHIFT			0
+#define  DATA_LENGTH_MASK			(0xfffff << 0)
+
+#define _MIPIA_COMMAND_ADDRESS			(dev_priv->mipi_mmio_base + \
+							0xb110)
+#define _MIPIB_COMMAND_ADDRESS			(dev_priv->mipi_mmio_base + \
+							0xb910)
+#define MIPI_COMMAND_ADDRESS(check)		(heck ?	\
+	_MIPIA_COMMAND_ADDRESS : _MIPIB_COMMAND_ADDRESS)
+#define  COMMAND_MEM_ADDRESS_SHIFT		5
+#define  COMMAND_MEM_ADDRESS_MASK		(0x7ffffff << 5)
+#define  AUTO_PWG_ENABLE			(1 << 2)
+#define  MEMORY_WRITE_DATA_FROM_PIPE_RENDERING	(1 << 1)
+#define  COMMAND_VALID				(1 << 0)
+
+#define _MIPIA_COMMAND_LENGTH			(dev_priv->mipi_mmio_base + \
+							0xb114)
+#define _MIPIB_COMMAND_LENGTH			(dev_priv->mipi_mmio_base + \
+							0xb914)
+#define MIPI_COMMAND_LENGTH(check)		(!check ?	\
+	_MIPIA_COMMAND_LENGTH : _MIPIB_COMMAND_LENGTH)
+#define  COMMAND_LENGTH_SHIFT(n)		(8 * (n)) /* n: 0...3 */
+#define  COMMAND_LENGTH_MASK(n)			(0xff << (8 * (n)))
+
+
+#define _MIPIA_READ_DATA_RETURN0		(dev_priv->mipi_mmio_base + \
+							0xb118)
+#define _MIPIB_READ_DATA_RETURN0		(dev_priv->mipi_mmio_base + \
+							0xb918)
+/* n: 0...7 */
+#define MIPI_READ_DATA_RETURN(check, n) ((!check ?	\
+	_MIPIA_READ_DATA_RETURN0, _MIPIB_READ_DATA_RETURN0) + 4 * (n))
+
+#define _MIPIA_READ_DATA_VALID			(dev_priv->mipi_mmio_base + \
+							0xb138)
+#define _MIPIB_READ_DATA_VALID			(dev_priv->mipi_mmio_base + \
+							0xb938)
+#define MIPI_READ_DATA_VALID(check)		(!check ?	\
+	_MIPIA_READ_DATA_VALID : _MIPIB_READ_DATA_VALID)
 
 /* For UMS only (deprecated): */
 #define _PALETTE_A (dev_priv->info.display_mmio_offset + 0xa000)
-- 
1.7.10.4




More information about the Intel-gfx mailing list