Message ID | 6d36c6473939f564f593f5d363dacdb92539db83.1415976065.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 11/14/2014 8:24 PM, Jani Nikula wrote: > MIPI DSI works on ports A and C, which map to pipes A and B, > respectively. Things are going to get more complicated with the > introduction of dual link DSI support, so clean up the register defines > and code to match reality. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 303 ++++++++++++++++++----------------- > drivers/gpu/drm/i915/intel_dsi.c | 148 ++++++++--------- > drivers/gpu/drm/i915/intel_dsi.h | 16 ++ > drivers/gpu/drm/i915/intel_dsi_cmd.c | 64 ++++---- > 4 files changed, 277 insertions(+), 254 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index a143127eb451..250043f3f22e 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -31,6 +31,8 @@ > #define _PORT(port, a, b) ((a) + (port)*((b)-(a))) > #define _PIPE3(pipe, a, b, c) ((pipe) == PIPE_A ? (a) : \ > (pipe) == PIPE_B ? (b) : (c)) > +#define _PORT3(port, a, b, c) ((port) == PORT_A ? (a) : \ > + (port) == PORT_B ? (b) : (c)) > > #define _MASKED_BIT_ENABLE(a) (((a) << 16) | (a)) > #define _MASKED_BIT_DISABLE(a) ((a) << 16) > @@ -1492,7 +1494,7 @@ enum punit_power_well { > #define I915_ISP_INTERRUPT (1<<22) > #define I915_LPE_PIPE_B_INTERRUPT (1<<21) > #define I915_LPE_PIPE_A_INTERRUPT (1<<20) > -#define I915_MIPIB_INTERRUPT (1<<19) > +#define I915_MIPIC_INTERRUPT (1<<19) > #define I915_MIPIA_INTERRUPT (1<<18) > #define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1<<18) > #define I915_DISPLAY_PORT_INTERRUPT (1<<17) > @@ -6612,29 +6614,30 @@ 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 DSI registers */ > + > +#define _MIPI_PORT(port, a, c) _PORT3(port, a, 0, c) /* ports A and C only */ > > #define _MIPIA_PORT_CTRL (VLV_DISPLAY_BASE + 0x61190) > -#define _MIPIB_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700) > -#define MIPI_PORT_CTRL(tc) _TRANSCODER(tc, _MIPIA_PORT_CTRL, \ > - _MIPIB_PORT_CTRL) > -#define DPI_ENABLE (1 << 31) /* A + B */ > +#define _MIPIC_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700) > +#define MIPI_PORT_CTRL(port) _MIPI_PORT(port, _MIPIA_PORT_CTRL, _MIPIC_PORT_CTRL) > +#define DPI_ENABLE (1 << 31) /* A + C */ > #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) /* A + C */ > #define FLOPPED_HSTX (1 << 23) > #define DE_INVERT (1 << 19) /* XXX */ > #define MIPIA_FLISDSI_DELAY_COUNT_SHIFT 18 > #define MIPIA_FLISDSI_DELAY_COUNT_MASK (0xf << 18) > #define AFE_LATCHOUT (1 << 17) > #define LP_OUTPUT_HOLD (1 << 16) > -#define MIPIB_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15 > -#define MIPIB_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15) > -#define MIPIB_MIPI4DPHY_DELAY_COUNT_SHIFT 11 > -#define MIPIB_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11) > +#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15 > +#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15) > +#define MIPIC_MIPI4DPHY_DELAY_COUNT_SHIFT 11 > +#define MIPIC_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11) > #define CSB_SHIFT 9 > #define CSB_MASK (3 << 9) > #define CSB_20MHZ (0 << 9) > @@ -6643,10 +6646,10 @@ enum punit_power_well { > #define BANDGAP_MASK (1 << 8) > #define BANDGAP_PNW_CIRCUIT (0 << 8) > #define BANDGAP_LNC_CIRCUIT (1 << 8) > -#define MIPIB_FLISDSI_DELAY_COUNT_LOW_SHIFT 5 > -#define MIPIB_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5) > -#define TEARING_EFFECT_DELAY (1 << 4) /* A + B */ > -#define TEARING_EFFECT_SHIFT 2 /* A + B */ > +#define MIPIC_FLISDSI_DELAY_COUNT_LOW_SHIFT 5 > +#define MIPIC_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5) > +#define TEARING_EFFECT_DELAY (1 << 4) /* A + C */ > +#define TEARING_EFFECT_SHIFT 2 /* A + C */ > #define TEARING_EFFECT_MASK (3 << 2) > #define TEARING_EFFECT_OFF (0 << 2) > #define TEARING_EFFECT_DSI (1 << 2) > @@ -6658,9 +6661,9 @@ enum punit_power_well { > #define LANE_CONFIGURATION_DUAL_LINK_B (2 << 0) > > #define _MIPIA_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61194) > -#define _MIPIB_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704) > -#define MIPI_TEARING_CTRL(tc) _TRANSCODER(tc, \ > - _MIPIA_TEARING_CTRL, _MIPIB_TEARING_CTRL) > +#define _MIPIC_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704) > +#define MIPI_TEARING_CTRL(port) _MIPI_PORT(port, \ > + _MIPIA_TEARING_CTRL, _MIPIC_TEARING_CTRL) > #define TEARING_EFFECT_DELAY_SHIFT 0 > #define TEARING_EFFECT_DELAY_MASK (0xffff << 0) > > @@ -6670,9 +6673,9 @@ enum punit_power_well { > /* 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(tc) _TRANSCODER(tc, _MIPIA_DEVICE_READY, \ > - _MIPIB_DEVICE_READY) > +#define _MIPIC_DEVICE_READY (dev_priv->mipi_mmio_base + 0xb800) > +#define MIPI_DEVICE_READY(port) _MIPI_PORT(port, _MIPIA_DEVICE_READY, \ > + _MIPIC_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) > @@ -6681,13 +6684,13 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_INTR_STAT, \ > - _MIPIB_INTR_STAT) > +#define _MIPIC_INTR_STAT (dev_priv->mipi_mmio_base + 0xb804) > +#define MIPI_INTR_STAT(port) _MIPI_PORT(port, _MIPIA_INTR_STAT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INTR_EN, \ > - _MIPIB_INTR_EN) > +#define _MIPIC_INTR_EN (dev_priv->mipi_mmio_base + 0xb808) > +#define MIPI_INTR_EN(port) _MIPI_PORT(port, _MIPIA_INTR_EN, \ > + _MIPIC_INTR_EN) > #define TEARING_EFFECT (1 << 31) > #define SPL_PKT_SENT_INTERRUPT (1 << 30) > #define GEN_READ_DATA_AVAIL (1 << 29) > @@ -6722,9 +6725,9 @@ enum punit_power_well { > #define RXSOT_ERROR (1 << 0) > > #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(tc) _TRANSCODER(tc, _MIPIA_DSI_FUNC_PRG, \ > - _MIPIB_DSI_FUNC_PRG) > +#define _MIPIC_DSI_FUNC_PRG (dev_priv->mipi_mmio_base + 0xb80c) > +#define MIPI_DSI_FUNC_PRG(port) _MIPI_PORT(port, _MIPIA_DSI_FUNC_PRG, \ > + _MIPIC_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) > @@ -6746,93 +6749,93 @@ enum punit_power_well { > #define DATA_LANES_PRG_REG_MASK (7 << 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(tc) _TRANSCODER(tc, _MIPIA_HS_TX_TIMEOUT, \ > - _MIPIB_HS_TX_TIMEOUT) > +#define _MIPIC_HS_TX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb810) > +#define MIPI_HS_TX_TIMEOUT(port) _MIPI_PORT(port, _MIPIA_HS_TX_TIMEOUT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_LP_RX_TIMEOUT, \ > - _MIPIB_LP_RX_TIMEOUT) > +#define _MIPIC_LP_RX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb814) > +#define MIPI_LP_RX_TIMEOUT(port) _MIPI_PORT(port, _MIPIA_LP_RX_TIMEOUT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_TURN_AROUND_TIMEOUT, _MIPIB_TURN_AROUND_TIMEOUT) > +#define _MIPIC_TURN_AROUND_TIMEOUT (dev_priv->mipi_mmio_base + 0xb818) > +#define MIPI_TURN_AROUND_TIMEOUT(port) _MIPI_PORT(port, \ > + _MIPIA_TURN_AROUND_TIMEOUT, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_DEVICE_RESET_TIMER, _MIPIB_DEVICE_RESET_TIMER) > +#define _MIPIC_DEVICE_RESET_TIMER (dev_priv->mipi_mmio_base + 0xb81c) > +#define MIPI_DEVICE_RESET_TIMER(port) _MIPI_PORT(port, \ > + _MIPIA_DEVICE_RESET_TIMER, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_DPI_RESOLUTION, \ > - _MIPIB_DPI_RESOLUTION) > +#define _MIPIC_DPI_RESOLUTION (dev_priv->mipi_mmio_base + 0xb820) > +#define MIPI_DPI_RESOLUTION(port) _MIPI_PORT(port, _MIPIA_DPI_RESOLUTION, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_DBI_FIFO_THROTTLE, _MIPIB_DBI_FIFO_THROTTLE) > +#define _MIPIC_DBI_FIFO_THROTTLE (dev_priv->mipi_mmio_base + 0xb824) > +#define MIPI_DBI_FIFO_THROTTLE(port) _MIPI_PORT(port, \ > + _MIPIA_DBI_FIFO_THROTTLE, _MIPIC_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 (dev_priv->mipi_mmio_base + 0xb028) > -#define _MIPIB_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828) > -#define MIPI_HSYNC_PADDING_COUNT(tc) _TRANSCODER(tc, \ > - _MIPIA_HSYNC_PADDING_COUNT, _MIPIB_HSYNC_PADDING_COUNT) > +#define _MIPIC_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828) > +#define MIPI_HSYNC_PADDING_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_HSYNC_PADDING_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HBP_COUNT, \ > - _MIPIB_HBP_COUNT) > +#define _MIPIC_HBP_COUNT (dev_priv->mipi_mmio_base + 0xb82c) > +#define MIPI_HBP_COUNT(port) _MIPI_PORT(port, _MIPIA_HBP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HFP_COUNT, \ > - _MIPIB_HFP_COUNT) > +#define _MIPIC_HFP_COUNT (dev_priv->mipi_mmio_base + 0xb830) > +#define MIPI_HFP_COUNT(port) _MIPI_PORT(port, _MIPIA_HFP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_HACTIVE_AREA_COUNT, _MIPIB_HACTIVE_AREA_COUNT) > +#define _MIPIC_HACTIVE_AREA_COUNT (dev_priv->mipi_mmio_base + 0xb834) > +#define MIPI_HACTIVE_AREA_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_HACTIVE_AREA_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_VSYNC_PADDING_COUNT, _MIPIB_VSYNC_PADDING_COUNT) > +#define _MIPIC_VSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb838) > +#define MIPI_VSYNC_PADDING_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_VSYNC_PADDING_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_VBP_COUNT, \ > - _MIPIB_VBP_COUNT) > +#define _MIPIC_VBP_COUNT (dev_priv->mipi_mmio_base + 0xb83c) > +#define MIPI_VBP_COUNT(port) _MIPI_PORT(port, _MIPIA_VBP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_VFP_COUNT, \ > - _MIPIB_VFP_COUNT) > +#define _MIPIC_VFP_COUNT (dev_priv->mipi_mmio_base + 0xb840) > +#define MIPI_VFP_COUNT(port) _MIPI_PORT(port, _MIPIA_VFP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIB_HIGH_LOW_SWITCH_COUNT) > +#define _MIPIC_HIGH_LOW_SWITCH_COUNT (dev_priv->mipi_mmio_base + 0xb844) > +#define MIPI_HIGH_LOW_SWITCH_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIC_HIGH_LOW_SWITCH_COUNT) > > /* regs above are bits 15:0 */ > > #define _MIPIA_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb048) > -#define _MIPIB_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848) > -#define MIPI_DPI_CONTROL(tc) _TRANSCODER(tc, _MIPIA_DPI_CONTROL, \ > - _MIPIB_DPI_CONTROL) > +#define _MIPIC_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848) > +#define MIPI_DPI_CONTROL(port) _MIPI_PORT(port, _MIPIA_DPI_CONTROL, \ > + _MIPIC_DPI_CONTROL) > #define DPI_LP_MODE (1 << 6) > #define BACKLIGHT_OFF (1 << 5) > #define BACKLIGHT_ON (1 << 4) > @@ -6842,30 +6845,30 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_DPI_DATA, \ > - _MIPIB_DPI_DATA) > +#define _MIPIC_DPI_DATA (dev_priv->mipi_mmio_base + 0xb84c) > +#define MIPI_DPI_DATA(port) _MIPI_PORT(port, _MIPIA_DPI_DATA, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INIT_COUNT, \ > - _MIPIB_INIT_COUNT) > +#define _MIPIC_INIT_COUNT (dev_priv->mipi_mmio_base + 0xb850) > +#define MIPI_INIT_COUNT(port) _MIPI_PORT(port, _MIPIA_INIT_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIB_MAX_RETURN_PKT_SIZE) > +#define _MIPIC_MAX_RETURN_PKT_SIZE (dev_priv->mipi_mmio_base + 0xb854) > +#define MIPI_MAX_RETURN_PKT_SIZE(port) _MIPI_PORT(port, \ > + _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_VIDEO_MODE_FORMAT, _MIPIB_VIDEO_MODE_FORMAT) > +#define _MIPIC_VIDEO_MODE_FORMAT (dev_priv->mipi_mmio_base + 0xb858) > +#define MIPI_VIDEO_MODE_FORMAT(port) _MIPI_PORT(port, \ > + _MIPIA_VIDEO_MODE_FORMAT, _MIPIC_VIDEO_MODE_FORMAT) > #define RANDOM_DPI_DISPLAY_RESOLUTION (1 << 4) > #define DISABLE_VIDEO_BTA (1 << 3) > #define IP_TG_CONFIG (1 << 2) > @@ -6874,9 +6877,9 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_EOT_DISABLE, \ > - _MIPIB_EOT_DISABLE) > +#define _MIPIC_EOT_DISABLE (dev_priv->mipi_mmio_base + 0xb85c) > +#define MIPI_EOT_DISABLE(port) _MIPI_PORT(port, _MIPIA_EOT_DISABLE, \ > + _MIPIC_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) > @@ -6887,32 +6890,32 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_LP_BYTECLK, \ > - _MIPIB_LP_BYTECLK) > +#define _MIPIC_LP_BYTECLK (dev_priv->mipi_mmio_base + 0xb860) > +#define MIPI_LP_BYTECLK(port) _MIPI_PORT(port, _MIPIA_LP_BYTECLK, \ > + _MIPIC_LP_BYTECLK) > #define LP_BYTECLK_SHIFT 0 > #define LP_BYTECLK_MASK (0xffff << 0) > > /* bits 31:0 */ > #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(tc) _TRANSCODER(tc, _MIPIA_LP_GEN_DATA, \ > - _MIPIB_LP_GEN_DATA) > +#define _MIPIC_LP_GEN_DATA (dev_priv->mipi_mmio_base + 0xb864) > +#define MIPI_LP_GEN_DATA(port) _MIPI_PORT(port, _MIPIA_LP_GEN_DATA, \ > + _MIPIC_LP_GEN_DATA) > > /* bits 31: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(tc) _TRANSCODER(tc, _MIPIA_HS_GEN_DATA, \ > - _MIPIB_HS_GEN_DATA) > +#define _MIPIC_HS_GEN_DATA (dev_priv->mipi_mmio_base + 0xb868) > +#define MIPI_HS_GEN_DATA(port) _MIPI_PORT(port, _MIPIA_HS_GEN_DATA, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_LP_GEN_CTRL, \ > - _MIPIB_LP_GEN_CTRL) > +#define _MIPIC_LP_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb86c) > +#define MIPI_LP_GEN_CTRL(port) _MIPI_PORT(port, _MIPIA_LP_GEN_CTRL, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HS_GEN_CTRL, \ > - _MIPIB_HS_GEN_CTRL) > +#define _MIPIC_HS_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb870) > +#define MIPI_HS_GEN_CTRL(port) _MIPI_PORT(port, _MIPIA_HS_GEN_CTRL, \ > + _MIPIC_HS_GEN_CTRL) > #define LONG_PACKET_WORD_COUNT_SHIFT 8 > #define LONG_PACKET_WORD_COUNT_MASK (0xffff << 8) > #define SHORT_PACKET_PARAM_SHIFT 8 > @@ -6924,9 +6927,9 @@ enum punit_power_well { > /* data type values, see include/video/mipi_display.h */ > > #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(tc) _TRANSCODER(tc, _MIPIA_GEN_FIFO_STAT, \ > - _MIPIB_GEN_FIFO_STAT) > +#define _MIPIC_GEN_FIFO_STAT (dev_priv->mipi_mmio_base + 0xb874) > +#define MIPI_GEN_FIFO_STAT(port) _MIPI_PORT(port, _MIPIA_GEN_FIFO_STAT, \ > + _MIPIC_GEN_FIFO_STAT) > #define DPI_FIFO_EMPTY (1 << 28) > #define DBI_FIFO_EMPTY (1 << 27) > #define LP_CTRL_FIFO_EMPTY (1 << 26) > @@ -6943,17 +6946,17 @@ enum punit_power_well { > #define HS_DATA_FIFO_FULL (1 << 0) > > #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(tc) _TRANSCODER(tc, \ > - _MIPIA_HS_LS_DBI_ENABLE, _MIPIB_HS_LS_DBI_ENABLE) > +#define _MIPIC_HS_LS_DBI_ENABLE (dev_priv->mipi_mmio_base + 0xb878) > +#define MIPI_HS_LP_DBI_ENABLE(port) _MIPI_PORT(port, \ > + _MIPIA_HS_LS_DBI_ENABLE, _MIPIC_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 (dev_priv->mipi_mmio_base + 0xb080) > -#define _MIPIB_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880) > -#define MIPI_DPHY_PARAM(tc) _TRANSCODER(tc, _MIPIA_DPHY_PARAM, \ > - _MIPIB_DPHY_PARAM) > +#define _MIPIC_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880) > +#define MIPI_DPHY_PARAM(port) _MIPI_PORT(port, _MIPIA_DPHY_PARAM, \ > + _MIPIC_DPHY_PARAM) > #define EXIT_ZERO_COUNT_SHIFT 24 > #define EXIT_ZERO_COUNT_MASK (0x3f << 24) > #define TRAIL_COUNT_SHIFT 16 > @@ -6965,36 +6968,36 @@ enum punit_power_well { > > /* bits 31: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(tc) _TRANSCODER(tc, _MIPIA_DBI_BW_CTRL, \ > - _MIPIB_DBI_BW_CTRL) > +#define _MIPIC_DBI_BW_CTRL (dev_priv->mipi_mmio_base + 0xb884) > +#define MIPI_DBI_BW_CTRL(port) _MIPI_PORT(port, _MIPIA_DBI_BW_CTRL, \ > + _MIPIC_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 \ > +#define _MIPIC_CLK_LANE_SWITCH_TIME_CNT (dev_priv->mipi_mmio_base \ > + 0xb888) > -#define MIPI_CLK_LANE_SWITCH_TIME_CNT(tc) _TRANSCODER(tc, \ > - _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIB_CLK_LANE_SWITCH_TIME_CNT) > +#define MIPI_CLK_LANE_SWITCH_TIME_CNT(port) _MIPI_PORT(port, \ > + _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_STOP_STATE_STALL, _MIPIB_STOP_STATE_STALL) > +#define _MIPIC_STOP_STATE_STALL (dev_priv->mipi_mmio_base + 0xb88c) > +#define MIPI_STOP_STATE_STALL(port) _MIPI_PORT(port, \ > + _MIPIA_STOP_STATE_STALL, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_INTR_STAT_REG_1, _MIPIB_INTR_STAT_REG_1) > +#define _MIPIC_INTR_STAT_REG_1 (dev_priv->mipi_mmio_base + 0xb890) > +#define MIPI_INTR_STAT_REG_1(port) _MIPI_PORT(port, \ > + _MIPIA_INTR_STAT_REG_1, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INTR_EN_REG_1, \ > - _MIPIB_INTR_EN_REG_1) > +#define _MIPIC_INTR_EN_REG_1 (dev_priv->mipi_mmio_base + 0xb894) > +#define MIPI_INTR_EN_REG_1(port) _MIPI_PORT(port, _MIPIA_INTR_EN_REG_1, \ > + _MIPIC_INTR_EN_REG_1) > #define RX_CONTENTION_DETECTED (1 << 0) > > /* XXX: only pipe A ?!? */ > @@ -7013,9 +7016,9 @@ enum punit_power_well { > /* MIPI adapter registers */ > > #define _MIPIA_CTRL (dev_priv->mipi_mmio_base + 0xb104) > -#define _MIPIB_CTRL (dev_priv->mipi_mmio_base + 0xb904) > -#define MIPI_CTRL(tc) _TRANSCODER(tc, _MIPIA_CTRL, \ > - _MIPIB_CTRL) > +#define _MIPIC_CTRL (dev_priv->mipi_mmio_base + 0xb904) > +#define MIPI_CTRL(port) _MIPI_PORT(port, _MIPIA_CTRL, \ > + _MIPIC_CTRL) > #define ESCAPE_CLOCK_DIVIDER_SHIFT 5 /* A only */ > #define ESCAPE_CLOCK_DIVIDER_MASK (3 << 5) > #define ESCAPE_CLOCK_DIVIDER_1 (0 << 5) > @@ -7028,24 +7031,24 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_DATA_ADDRESS, \ > - _MIPIB_DATA_ADDRESS) > +#define _MIPIC_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb908) > +#define MIPI_DATA_ADDRESS(port) _MIPI_PORT(port, _MIPIA_DATA_ADDRESS, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_DATA_LENGTH, \ > - _MIPIB_DATA_LENGTH) > +#define _MIPIC_DATA_LENGTH (dev_priv->mipi_mmio_base + 0xb90c) > +#define MIPI_DATA_LENGTH(port) _MIPI_PORT(port, _MIPIA_DATA_LENGTH, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_COMMAND_ADDRESS, _MIPIB_COMMAND_ADDRESS) > +#define _MIPIC_COMMAND_ADDRESS (dev_priv->mipi_mmio_base + 0xb910) > +#define MIPI_COMMAND_ADDRESS(port) _MIPI_PORT(port, \ > + _MIPIA_COMMAND_ADDRESS, _MIPIC_COMMAND_ADDRESS) > #define COMMAND_MEM_ADDRESS_SHIFT 5 > #define COMMAND_MEM_ADDRESS_MASK (0x7ffffff << 5) > #define AUTO_PWG_ENABLE (1 << 2) > @@ -7053,22 +7056,22 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_COMMAND_LENGTH, \ > - _MIPIB_COMMAND_LENGTH) > +#define _MIPIC_COMMAND_LENGTH (dev_priv->mipi_mmio_base + 0xb914) > +#define MIPI_COMMAND_LENGTH(port) _MIPI_PORT(port, _MIPIA_COMMAND_LENGTH, \ > + _MIPIC_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) > -#define MIPI_READ_DATA_RETURN(tc, n) \ > - (_TRANSCODER(tc, _MIPIA_READ_DATA_RETURN0, _MIPIB_READ_DATA_RETURN0) \ > +#define _MIPIC_READ_DATA_RETURN0 (dev_priv->mipi_mmio_base + 0xb918) > +#define MIPI_READ_DATA_RETURN(port, n) \ > + (_MIPI_PORT(port, _MIPIA_READ_DATA_RETURN0, _MIPIC_READ_DATA_RETURN0) \ > + 4 * (n)) /* n: 0...7 */ > > #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(tc) _TRANSCODER(tc, \ > - _MIPIA_READ_DATA_VALID, _MIPIB_READ_DATA_VALID) > +#define _MIPIC_READ_DATA_VALID (dev_priv->mipi_mmio_base + 0xb938) > +#define MIPI_READ_DATA_VALID(port) _MIPI_PORT(port, \ > + _MIPIA_READ_DATA_VALID, _MIPIC_READ_DATA_VALID) > #define READ_DATA_VALID(n) (1 << (n)) > > /* For UMS only (deprecated): */ > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 0b184079de14..35842a6687d8 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -106,7 +106,7 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder) > { > struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 val; > > DRM_DEBUG_KMS("\n"); > @@ -120,17 +120,17 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder) > /* bandgap reset is needed after everytime we do power gate */ > band_gap_reset(dev_priv); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), ULPS_STATE_ENTER); > + I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_ENTER); > usleep_range(2500, 3000); > > - val = I915_READ(MIPI_PORT_CTRL(pipe)); > - I915_WRITE(MIPI_PORT_CTRL(pipe), val | LP_OUTPUT_HOLD); > + val = I915_READ(MIPI_PORT_CTRL(port)); > + I915_WRITE(MIPI_PORT_CTRL(port), val | LP_OUTPUT_HOLD); > usleep_range(1000, 1500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), ULPS_STATE_EXIT); > + I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_EXIT); > usleep_range(2500, 3000); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY); > usleep_range(2500, 3000); > } > > @@ -140,13 +140,13 @@ static void intel_dsi_enable(struct intel_encoder *encoder) > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 temp; > > DRM_DEBUG_KMS("\n"); > > if (is_cmd_mode(intel_dsi)) > - I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(pipe), 8 * 4); > + I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4); > else { > msleep(20); /* XXX */ > dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN); > @@ -158,10 +158,10 @@ static void intel_dsi_enable(struct intel_encoder *encoder) > wait_for_dsi_fifo_empty(intel_dsi); > > /* assert ip_tg_enable signal */ > - temp = I915_READ(MIPI_PORT_CTRL(pipe)) & ~LANE_CONFIGURATION_MASK; > + temp = I915_READ(MIPI_PORT_CTRL(port)) & ~LANE_CONFIGURATION_MASK; > temp = temp | intel_dsi->port_bits; > - I915_WRITE(MIPI_PORT_CTRL(pipe), temp | DPI_ENABLE); > - POSTING_READ(MIPI_PORT_CTRL(pipe)); > + I915_WRITE(MIPI_PORT_CTRL(port), temp | DPI_ENABLE); > + POSTING_READ(MIPI_PORT_CTRL(port)); > } > } > > @@ -237,7 +237,7 @@ static void intel_dsi_disable(struct intel_encoder *encoder) > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 temp; > > DRM_DEBUG_KMS("\n"); > @@ -246,29 +246,29 @@ static void intel_dsi_disable(struct intel_encoder *encoder) > wait_for_dsi_fifo_empty(intel_dsi); > > /* de-assert ip_tg_enable signal */ > - temp = I915_READ(MIPI_PORT_CTRL(pipe)); > - I915_WRITE(MIPI_PORT_CTRL(pipe), temp & ~DPI_ENABLE); > - POSTING_READ(MIPI_PORT_CTRL(pipe)); > + temp = I915_READ(MIPI_PORT_CTRL(port)); > + I915_WRITE(MIPI_PORT_CTRL(port), temp & ~DPI_ENABLE); > + POSTING_READ(MIPI_PORT_CTRL(port)); > > msleep(2); > } > > /* Panel commands can be sent when clock is in LP11 */ > - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x0); > + I915_WRITE(MIPI_DEVICE_READY(port), 0x0); > > - temp = I915_READ(MIPI_CTRL(pipe)); > + temp = I915_READ(MIPI_CTRL(port)); > temp &= ~ESCAPE_CLOCK_DIVIDER_MASK; > - I915_WRITE(MIPI_CTRL(pipe), temp | > + I915_WRITE(MIPI_CTRL(port), temp | > intel_dsi->escape_clk_div << > ESCAPE_CLOCK_DIVIDER_SHIFT); > > - I915_WRITE(MIPI_EOT_DISABLE(pipe), CLOCKSTOP); > + I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP); > > - temp = I915_READ(MIPI_DSI_FUNC_PRG(pipe)); > + temp = I915_READ(MIPI_DSI_FUNC_PRG(port)); > temp &= ~VID_MODE_FORMAT_MASK; > - I915_WRITE(MIPI_DSI_FUNC_PRG(pipe), temp); > + I915_WRITE(MIPI_DSI_FUNC_PRG(port), temp); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x1); > + I915_WRITE(MIPI_DEVICE_READY(port), 0x1); > > /* if disable packets are sent before sending shutdown packet then in > * some next enable sequence send turn on packet error is observed */ > @@ -282,29 +282,29 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) > { > struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 val; > > DRM_DEBUG_KMS("\n"); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_ENTER); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_ENTER); > usleep_range(2000, 2500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_EXIT); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_EXIT); > usleep_range(2000, 2500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_ENTER); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_ENTER); > usleep_range(2000, 2500); > > - if (wait_for(((I915_READ(MIPI_PORT_CTRL(pipe)) & AFE_LATCHOUT) > + if (wait_for(((I915_READ(MIPI_PORT_CTRL(port)) & AFE_LATCHOUT) > == 0x00000), 30)) > DRM_ERROR("DSI LP not going Low\n"); > > - val = I915_READ(MIPI_PORT_CTRL(pipe)); > - I915_WRITE(MIPI_PORT_CTRL(pipe), val & ~LP_OUTPUT_HOLD); > + val = I915_READ(MIPI_PORT_CTRL(port)); > + I915_WRITE(MIPI_PORT_CTRL(port), val & ~LP_OUTPUT_HOLD); > usleep_range(1000, 1500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x00); > + I915_WRITE(MIPI_DEVICE_READY(port), 0x00); > usleep_range(2000, 2500); > > vlv_disable_dsi_pll(encoder); > @@ -338,8 +338,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, > { > struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > enum intel_display_power_domain power_domain; > - u32 port, func; > - enum pipe p; > + u32 port_ctl, func; > + enum port port; > > DRM_DEBUG_KMS("\n"); > > @@ -348,13 +348,13 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, > return false; > > /* XXX: this only works for one DSI output */ > - for (p = PIPE_A; p <= PIPE_B; p++) { > - port = I915_READ(MIPI_PORT_CTRL(p)); > - func = I915_READ(MIPI_DSI_FUNC_PRG(p)); > + for_each_dsi_port(port, (1 << PORT_A) | (1 << PORT_C)) { > + port_ctl = I915_READ(MIPI_PORT_CTRL(port)); > + func = I915_READ(MIPI_DSI_FUNC_PRG(port)); > > - if ((port & DPI_ENABLE) || (func & CMD_MODE_DATA_WIDTH_MASK)) { > - if (I915_READ(MIPI_DEVICE_READY(p)) & DEVICE_READY) { > - *pipe = p; > + if ((port_ctl & DPI_ENABLE) || (func & CMD_MODE_DATA_WIDTH_MASK)) { > + if (I915_READ(MIPI_DEVICE_READY(port)) & DEVICE_READY) { > + *pipe = port == PORT_A ? PIPE_A : PIPE_C; > return true; > } > } > @@ -437,7 +437,7 @@ static void set_dsi_timings(struct drm_encoder *encoder, > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > unsigned int bpp = intel_crtc->config.pipe_bpp; > unsigned int lane_count = intel_dsi->lane_count; > > @@ -460,18 +460,18 @@ static void set_dsi_timings(struct drm_encoder *encoder, > intel_dsi->burst_mode_ratio); > hbp = txbyteclkhs(hbp, bpp, lane_count, intel_dsi->burst_mode_ratio); > > - I915_WRITE(MIPI_HACTIVE_AREA_COUNT(pipe), hactive); > - I915_WRITE(MIPI_HFP_COUNT(pipe), hfp); > + I915_WRITE(MIPI_HACTIVE_AREA_COUNT(port), hactive); > + I915_WRITE(MIPI_HFP_COUNT(port), hfp); > > /* meaningful for video mode non-burst sync pulse mode only, can be zero > * for non-burst sync events and burst modes */ > - I915_WRITE(MIPI_HSYNC_PADDING_COUNT(pipe), hsync); > - I915_WRITE(MIPI_HBP_COUNT(pipe), hbp); > + I915_WRITE(MIPI_HSYNC_PADDING_COUNT(port), hsync); > + I915_WRITE(MIPI_HBP_COUNT(port), hbp); > > /* vertical values are in terms of lines */ > - I915_WRITE(MIPI_VFP_COUNT(pipe), vfp); > - I915_WRITE(MIPI_VSYNC_PADDING_COUNT(pipe), vsync); > - I915_WRITE(MIPI_VBP_COUNT(pipe), vbp); > + I915_WRITE(MIPI_VFP_COUNT(port), vfp); > + I915_WRITE(MIPI_VSYNC_PADDING_COUNT(port), vsync); > + I915_WRITE(MIPI_VBP_COUNT(port), vbp); > } > > static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > @@ -483,30 +483,30 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > struct drm_display_mode *adjusted_mode = > &intel_crtc->config.adjusted_mode; > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > unsigned int bpp = intel_crtc->config.pipe_bpp; > u32 val, tmp; > > - DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe)); > + DRM_DEBUG_KMS("pipe %c\n", pipe_name(intel_crtc->pipe)); > > /* escape clock divider, 20MHz, shared for A and C. device ready must be > * off when doing this! txclkesc? */ > - tmp = I915_READ(MIPI_CTRL(0)); > + tmp = I915_READ(MIPI_CTRL(PORT_A)); > tmp &= ~ESCAPE_CLOCK_DIVIDER_MASK; > - I915_WRITE(MIPI_CTRL(0), tmp | ESCAPE_CLOCK_DIVIDER_1); > + I915_WRITE(MIPI_CTRL(PORT_A), tmp | ESCAPE_CLOCK_DIVIDER_1); > > /* read request priority is per pipe */ > - tmp = I915_READ(MIPI_CTRL(pipe)); > + tmp = I915_READ(MIPI_CTRL(port)); > tmp &= ~READ_REQUEST_PRIORITY_MASK; > - I915_WRITE(MIPI_CTRL(pipe), tmp | READ_REQUEST_PRIORITY_HIGH); > + I915_WRITE(MIPI_CTRL(port), tmp | READ_REQUEST_PRIORITY_HIGH); > > /* XXX: why here, why like this? handling in irq handler?! */ > - I915_WRITE(MIPI_INTR_STAT(pipe), 0xffffffff); > - I915_WRITE(MIPI_INTR_EN(pipe), 0xffffffff); > + I915_WRITE(MIPI_INTR_STAT(port), 0xffffffff); > + I915_WRITE(MIPI_INTR_EN(port), 0xffffffff); > > - I915_WRITE(MIPI_DPHY_PARAM(pipe), intel_dsi->dphy_reg); > + I915_WRITE(MIPI_DPHY_PARAM(port), intel_dsi->dphy_reg); > > - I915_WRITE(MIPI_DPI_RESOLUTION(pipe), > + I915_WRITE(MIPI_DPI_RESOLUTION(port), > adjusted_mode->vdisplay << VERTICAL_ADDRESS_SHIFT | > adjusted_mode->hdisplay << HORIZONTAL_ADDRESS_SHIFT); > > @@ -522,7 +522,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > /* XXX: cross-check bpp vs. pixel format? */ > val |= intel_dsi->pixel_format; > } > - I915_WRITE(MIPI_DSI_FUNC_PRG(pipe), val); > + I915_WRITE(MIPI_DSI_FUNC_PRG(port), val); > > /* timeouts for recovery. one frame IIUC. if counter expires, EOT and > * stop state. */ > @@ -543,25 +543,25 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > > if (is_vid_mode(intel_dsi) && > intel_dsi->video_mode_format == VIDEO_MODE_BURST) { > - I915_WRITE(MIPI_HS_TX_TIMEOUT(pipe), > + I915_WRITE(MIPI_HS_TX_TIMEOUT(port), > txbyteclkhs(adjusted_mode->htotal, bpp, > intel_dsi->lane_count, > intel_dsi->burst_mode_ratio) + 1); > } else { > - I915_WRITE(MIPI_HS_TX_TIMEOUT(pipe), > + I915_WRITE(MIPI_HS_TX_TIMEOUT(port), > txbyteclkhs(adjusted_mode->vtotal * > adjusted_mode->htotal, > bpp, intel_dsi->lane_count, > intel_dsi->burst_mode_ratio) + 1); > } > - I915_WRITE(MIPI_LP_RX_TIMEOUT(pipe), intel_dsi->lp_rx_timeout); > - I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(pipe), intel_dsi->turn_arnd_val); > - I915_WRITE(MIPI_DEVICE_RESET_TIMER(pipe), intel_dsi->rst_timer_val); > + I915_WRITE(MIPI_LP_RX_TIMEOUT(port), intel_dsi->lp_rx_timeout); > + I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(port), intel_dsi->turn_arnd_val); > + I915_WRITE(MIPI_DEVICE_RESET_TIMER(port), intel_dsi->rst_timer_val); > > /* dphy stuff */ > > /* in terms of low power clock */ > - I915_WRITE(MIPI_INIT_COUNT(pipe), txclkesc(intel_dsi->escape_clk_div, 100)); > + I915_WRITE(MIPI_INIT_COUNT(port), txclkesc(intel_dsi->escape_clk_div, 100)); > > val = 0; > if (intel_dsi->eotp_pkt == 0) > @@ -571,17 +571,17 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > val |= CLOCKSTOP; > > /* recovery disables */ > - I915_WRITE(MIPI_EOT_DISABLE(pipe), val); > + I915_WRITE(MIPI_EOT_DISABLE(port), val); > > /* in terms of low power clock */ > - I915_WRITE(MIPI_INIT_COUNT(pipe), intel_dsi->init_count); > + I915_WRITE(MIPI_INIT_COUNT(port), intel_dsi->init_count); > > /* in terms of txbyteclkhs. actual high to low switch + > * MIPI_STOP_STATE_STALL * MIPI_LP_BYTECLK. > * > * XXX: write MIPI_STOP_STATE_STALL? > */ > - I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe), > + I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(port), > intel_dsi->hs_to_lp_count); > > /* XXX: low power clock equivalence in terms of byte clock. the number > @@ -589,16 +589,16 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > * and txclkesc. txclkesc time / txbyteclk time * (105 + > * MIPI_STOP_STATE_STALL) / 105.??? > */ > - I915_WRITE(MIPI_LP_BYTECLK(pipe), intel_dsi->lp_byte_clk); > + I915_WRITE(MIPI_LP_BYTECLK(port), intel_dsi->lp_byte_clk); > > /* the bw essential for transmitting 16 long packets containing 252 > * bytes meant for dcs write memory command is programmed in this > * register in terms of byte clocks. based on dsi transfer rate and the > * number of lanes configured the time taken to transmit 16 long packets > * in a dsi stream varies. */ > - I915_WRITE(MIPI_DBI_BW_CTRL(pipe), intel_dsi->bw_timer); > + I915_WRITE(MIPI_DBI_BW_CTRL(port), intel_dsi->bw_timer); > > - I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(pipe), > + I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(port), > intel_dsi->clk_lp_to_hs_count << LP_HS_SSW_CNT_SHIFT | > intel_dsi->clk_hs_to_lp_count << HS_LP_PWR_SW_CNT_SHIFT); > > @@ -606,7 +606,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > /* Some panels might have resolution which is not a multiple of > * 64 like 1366 x 768. Enable RANDOM resolution support for such > * panels by default */ > - I915_WRITE(MIPI_VIDEO_MODE_FORMAT(pipe), > + I915_WRITE(MIPI_VIDEO_MODE_FORMAT(port), > intel_dsi->video_frmt_cfg_bits | > intel_dsi->video_mode_format | > IP_TG_CONFIG | > @@ -748,6 +748,12 @@ void intel_dsi_init(struct drm_device *dev) > intel_connector->get_hw_state = intel_connector_get_hw_state; > intel_connector->unregister = intel_connector_unregister; > > + /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */ > + if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) > + intel_encoder->crtc_mask = (1 << PIPE_A); > + else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) > + intel_encoder->crtc_mask = (1 << PIPE_B); > + > for (i = 0; i < ARRAY_SIZE(intel_dsi_devices); i++) { > dsi = &intel_dsi_devices[i]; > intel_dsi->dev = *dsi; > @@ -762,8 +768,6 @@ void intel_dsi_init(struct drm_device *dev) > } > > intel_encoder->type = INTEL_OUTPUT_DSI; > - intel_encoder->crtc_mask = (1 << 0); /* XXX */ > - > intel_encoder->cloneable = 0; > drm_connector_init(dev, connector, &intel_dsi_connector_funcs, > DRM_MODE_CONNECTOR_DSI); > diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h > index 657eb5c1b9d8..97a6f621774f 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.h > +++ b/drivers/gpu/drm/i915/intel_dsi.h > @@ -127,6 +127,22 @@ struct intel_dsi { > u16 panel_pwr_cycle_delay; > }; > > +/* XXX: Transitional before dual port configuration */ > +static inline enum port intel_dsi_pipe_to_port(enum pipe pipe) > +{ > + if (pipe == PIPE_A) > + return PORT_A; > + else if (pipe == PIPE_B) > + return PORT_C; > + > + WARN(1, "DSI on pipe %c, assuming port C\n", pipe_name(pipe)); > + return PORT_C; > +} > + > +#define for_each_dsi_port(__port, __ports_mask) \ > + for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ > + if ((__ports_mask) & (1 << (__port))) > + > static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder) > { > return container_of(encoder, struct intel_dsi, base.base); > diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.c b/drivers/gpu/drm/i915/intel_dsi_cmd.c > index f4767fd2ebeb..004fa918ca03 100644 > --- a/drivers/gpu/drm/i915/intel_dsi_cmd.c > +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.c > @@ -54,15 +54,15 @@ static void print_stat(struct intel_dsi *intel_dsi) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 val; > > - val = I915_READ(MIPI_INTR_STAT(pipe)); > + val = I915_READ(MIPI_INTR_STAT(port)); > > #define STAT_BIT(val, bit) (val) & (bit) ? " " #bit : "" > - DRM_DEBUG_KMS("MIPI_INTR_STAT(%d) = %08x" > + DRM_DEBUG_KMS("MIPI_INTR_STAT(%c) = %08x" > "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" > - "\n", pipe, val, > + "\n", port_name(port), val, > STAT_BIT(val, TEARING_EFFECT), > STAT_BIT(val, SPL_PKT_SENT_INTERRUPT), > STAT_BIT(val, GEN_READ_DATA_AVAIL), > @@ -110,16 +110,16 @@ void dsi_hs_mode_enable(struct intel_dsi *intel_dsi, bool enable) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 temp; > u32 mask = DBI_FIFO_EMPTY; > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 50)) > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 50)) > DRM_ERROR("Timeout waiting for DBI FIFO empty\n"); > > - temp = I915_READ(MIPI_HS_LP_DBI_ENABLE(pipe)); > + temp = I915_READ(MIPI_HS_LP_DBI_ENABLE(port)); > temp &= DBI_HS_LP_MODE_MASK; > - I915_WRITE(MIPI_HS_LP_DBI_ENABLE(pipe), enable ? DBI_HS_MODE : DBI_LP_MODE); > + I915_WRITE(MIPI_HS_LP_DBI_ENABLE(port), enable ? DBI_HS_MODE : DBI_LP_MODE); > > intel_dsi->hs = enable; > } > @@ -131,7 +131,7 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 ctrl_reg; > u32 ctrl; > u32 mask; > @@ -140,14 +140,14 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, > channel, data_type, data); > > if (intel_dsi->hs) { > - ctrl_reg = MIPI_HS_GEN_CTRL(pipe); > + ctrl_reg = MIPI_HS_GEN_CTRL(port); > mask = HS_CTRL_FIFO_FULL; > } else { > - ctrl_reg = MIPI_LP_GEN_CTRL(pipe); > + ctrl_reg = MIPI_LP_GEN_CTRL(port); > mask = LP_CTRL_FIFO_FULL; > } > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == 0, 50)) { > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == 0, 50)) { > DRM_ERROR("Timeout waiting for HS/LP CTRL FIFO !full\n"); > print_stat(intel_dsi); > } > @@ -173,7 +173,7 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 data_reg; > int i, j, n; > u32 mask; > @@ -182,14 +182,14 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, > channel, data_type, len); > > if (intel_dsi->hs) { > - data_reg = MIPI_HS_GEN_DATA(pipe); > + data_reg = MIPI_HS_GEN_DATA(port); > mask = HS_DATA_FIFO_FULL; > } else { > - data_reg = MIPI_LP_GEN_DATA(pipe); > + data_reg = MIPI_LP_GEN_DATA(port); > mask = LP_DATA_FIFO_FULL; > } > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == 0, 50)) > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == 0, 50)) > DRM_ERROR("Timeout waiting for HS/LP DATA FIFO !full\n"); > > for (i = 0; i < len; i += n) { > @@ -292,14 +292,14 @@ static int dsi_read_data_return(struct intel_dsi *intel_dsi, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > int i, len = 0; > u32 data_reg, val; > > if (intel_dsi->hs) { > - data_reg = MIPI_HS_GEN_DATA(pipe); > + data_reg = MIPI_HS_GEN_DATA(port); > } else { > - data_reg = MIPI_LP_GEN_DATA(pipe); > + data_reg = MIPI_LP_GEN_DATA(port); > } > > while (len < buflen) { > @@ -318,7 +318,7 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > int ret; > > @@ -327,14 +327,14 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, > * longer than MIPI_MAX_RETURN_PKT_SIZE > */ > > - I915_WRITE(MIPI_INTR_STAT(pipe), GEN_READ_DATA_AVAIL); > + I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL); > > ret = dsi_vc_dcs_send_read_request(intel_dsi, channel, dcs_cmd); > if (ret) > return ret; > > mask = GEN_READ_DATA_AVAIL; > - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 50)) > + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 50)) > DRM_ERROR("Timeout waiting for read data.\n"); > > ret = dsi_read_data_return(intel_dsi, buf, buflen); > @@ -354,7 +354,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > int ret; > > @@ -363,7 +363,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, > * longer than MIPI_MAX_RETURN_PKT_SIZE > */ > > - I915_WRITE(MIPI_INTR_STAT(pipe), GEN_READ_DATA_AVAIL); > + I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL); > > ret = dsi_vc_generic_send_read_request(intel_dsi, channel, reqdata, > reqlen); > @@ -371,7 +371,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, > return ret; > > mask = GEN_READ_DATA_AVAIL; > - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 50)) > + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 50)) > DRM_ERROR("Timeout waiting for read data.\n"); > > ret = dsi_read_data_return(intel_dsi, buf, buflen); > @@ -395,7 +395,7 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > > /* XXX: pipe, hs */ > @@ -405,16 +405,16 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs) > cmd |= DPI_LP_MODE; > > /* clear bit */ > - I915_WRITE(MIPI_INTR_STAT(pipe), SPL_PKT_SENT_INTERRUPT); > + I915_WRITE(MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT); > > /* XXX: old code skips write if control unchanged */ > - if (cmd == I915_READ(MIPI_DPI_CONTROL(pipe))) > + if (cmd == I915_READ(MIPI_DPI_CONTROL(port))) > DRM_ERROR("Same special packet %02x twice in a row.\n", cmd); > > - I915_WRITE(MIPI_DPI_CONTROL(pipe), cmd); > + I915_WRITE(MIPI_DPI_CONTROL(port), cmd); > > mask = SPL_PKT_SENT_INTERRUPT; > - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 100)) > + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 100)) > DRM_ERROR("Video mode command 0x%08x send failed.\n", cmd); > > return 0; > @@ -426,12 +426,12 @@ void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > > mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY | > LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY; > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 100)) > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100)) > DRM_ERROR("DPI FIFOs are not empty\n"); > } This patch has some style issues. Please address them.
On Wed, Nov 26, 2014 at 10:50:46PM +0530, Singh, Gaurav K wrote:
> This patch has some style issues. Please address them.
Please be more specific, that's rather non-actionable review.
Also general rule of thumb is that if it doesn't look offensive and the
patch is otherwise good it still deserves an r-b. I can easily fix up
small things while applying (and do that all the time).
-Daniel
On 11/26/2014 11:38 PM, Daniel Vetter wrote: > On Wed, Nov 26, 2014 at 10:50:46PM +0530, Singh, Gaurav K wrote: >> This patch has some style issues. Please address them. > Please be more specific, that's rather non-actionable review. > > Also general rule of thumb is that if it doesn't look offensive and the > patch is otherwise good it still deserves an r-b. I can easily fix up > small things while applying (and do that all the time). > -Daniel checkpatch.pl is throwing few warnings and one error which are mainly because of lines more than 80 characters. The patch is otherwise looking good. I will add Reviewed-by field in the patch. with regards, Gaurav
On 11/14/2014 8:24 PM, Jani Nikula wrote: > MIPI DSI works on ports A and C, which map to pipes A and B, > respectively. Things are going to get more complicated with the > introduction of dual link DSI support, so clean up the register defines > and code to match reality. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Gaurav K Singh <gaurav.k.singh@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 303 ++++++++++++++++++----------------- > drivers/gpu/drm/i915/intel_dsi.c | 148 ++++++++--------- > drivers/gpu/drm/i915/intel_dsi.h | 16 ++ > drivers/gpu/drm/i915/intel_dsi_cmd.c | 64 ++++---- > 4 files changed, 277 insertions(+), 254 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index a143127eb451..250043f3f22e 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -31,6 +31,8 @@ > #define _PORT(port, a, b) ((a) + (port)*((b)-(a))) > #define _PIPE3(pipe, a, b, c) ((pipe) == PIPE_A ? (a) : \ > (pipe) == PIPE_B ? (b) : (c)) > +#define _PORT3(port, a, b, c) ((port) == PORT_A ? (a) : \ > + (port) == PORT_B ? (b) : (c)) > > #define _MASKED_BIT_ENABLE(a) (((a) << 16) | (a)) > #define _MASKED_BIT_DISABLE(a) ((a) << 16) > @@ -1492,7 +1494,7 @@ enum punit_power_well { > #define I915_ISP_INTERRUPT (1<<22) > #define I915_LPE_PIPE_B_INTERRUPT (1<<21) > #define I915_LPE_PIPE_A_INTERRUPT (1<<20) > -#define I915_MIPIB_INTERRUPT (1<<19) > +#define I915_MIPIC_INTERRUPT (1<<19) > #define I915_MIPIA_INTERRUPT (1<<18) > #define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1<<18) > #define I915_DISPLAY_PORT_INTERRUPT (1<<17) > @@ -6612,29 +6614,30 @@ 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 DSI registers */ > + > +#define _MIPI_PORT(port, a, c) _PORT3(port, a, 0, c) /* ports A and C only */ > > #define _MIPIA_PORT_CTRL (VLV_DISPLAY_BASE + 0x61190) > -#define _MIPIB_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700) > -#define MIPI_PORT_CTRL(tc) _TRANSCODER(tc, _MIPIA_PORT_CTRL, \ > - _MIPIB_PORT_CTRL) > -#define DPI_ENABLE (1 << 31) /* A + B */ > +#define _MIPIC_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700) > +#define MIPI_PORT_CTRL(port) _MIPI_PORT(port, _MIPIA_PORT_CTRL, _MIPIC_PORT_CTRL) > +#define DPI_ENABLE (1 << 31) /* A + C */ > #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) /* A + C */ > #define FLOPPED_HSTX (1 << 23) > #define DE_INVERT (1 << 19) /* XXX */ > #define MIPIA_FLISDSI_DELAY_COUNT_SHIFT 18 > #define MIPIA_FLISDSI_DELAY_COUNT_MASK (0xf << 18) > #define AFE_LATCHOUT (1 << 17) > #define LP_OUTPUT_HOLD (1 << 16) > -#define MIPIB_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15 > -#define MIPIB_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15) > -#define MIPIB_MIPI4DPHY_DELAY_COUNT_SHIFT 11 > -#define MIPIB_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11) > +#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15 > +#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15) > +#define MIPIC_MIPI4DPHY_DELAY_COUNT_SHIFT 11 > +#define MIPIC_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11) > #define CSB_SHIFT 9 > #define CSB_MASK (3 << 9) > #define CSB_20MHZ (0 << 9) > @@ -6643,10 +6646,10 @@ enum punit_power_well { > #define BANDGAP_MASK (1 << 8) > #define BANDGAP_PNW_CIRCUIT (0 << 8) > #define BANDGAP_LNC_CIRCUIT (1 << 8) > -#define MIPIB_FLISDSI_DELAY_COUNT_LOW_SHIFT 5 > -#define MIPIB_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5) > -#define TEARING_EFFECT_DELAY (1 << 4) /* A + B */ > -#define TEARING_EFFECT_SHIFT 2 /* A + B */ > +#define MIPIC_FLISDSI_DELAY_COUNT_LOW_SHIFT 5 > +#define MIPIC_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5) > +#define TEARING_EFFECT_DELAY (1 << 4) /* A + C */ > +#define TEARING_EFFECT_SHIFT 2 /* A + C */ > #define TEARING_EFFECT_MASK (3 << 2) > #define TEARING_EFFECT_OFF (0 << 2) > #define TEARING_EFFECT_DSI (1 << 2) > @@ -6658,9 +6661,9 @@ enum punit_power_well { > #define LANE_CONFIGURATION_DUAL_LINK_B (2 << 0) > > #define _MIPIA_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61194) > -#define _MIPIB_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704) > -#define MIPI_TEARING_CTRL(tc) _TRANSCODER(tc, \ > - _MIPIA_TEARING_CTRL, _MIPIB_TEARING_CTRL) > +#define _MIPIC_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704) > +#define MIPI_TEARING_CTRL(port) _MIPI_PORT(port, \ > + _MIPIA_TEARING_CTRL, _MIPIC_TEARING_CTRL) > #define TEARING_EFFECT_DELAY_SHIFT 0 > #define TEARING_EFFECT_DELAY_MASK (0xffff << 0) > > @@ -6670,9 +6673,9 @@ enum punit_power_well { > /* 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(tc) _TRANSCODER(tc, _MIPIA_DEVICE_READY, \ > - _MIPIB_DEVICE_READY) > +#define _MIPIC_DEVICE_READY (dev_priv->mipi_mmio_base + 0xb800) > +#define MIPI_DEVICE_READY(port) _MIPI_PORT(port, _MIPIA_DEVICE_READY, \ > + _MIPIC_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) > @@ -6681,13 +6684,13 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_INTR_STAT, \ > - _MIPIB_INTR_STAT) > +#define _MIPIC_INTR_STAT (dev_priv->mipi_mmio_base + 0xb804) > +#define MIPI_INTR_STAT(port) _MIPI_PORT(port, _MIPIA_INTR_STAT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INTR_EN, \ > - _MIPIB_INTR_EN) > +#define _MIPIC_INTR_EN (dev_priv->mipi_mmio_base + 0xb808) > +#define MIPI_INTR_EN(port) _MIPI_PORT(port, _MIPIA_INTR_EN, \ > + _MIPIC_INTR_EN) > #define TEARING_EFFECT (1 << 31) > #define SPL_PKT_SENT_INTERRUPT (1 << 30) > #define GEN_READ_DATA_AVAIL (1 << 29) > @@ -6722,9 +6725,9 @@ enum punit_power_well { > #define RXSOT_ERROR (1 << 0) > > #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(tc) _TRANSCODER(tc, _MIPIA_DSI_FUNC_PRG, \ > - _MIPIB_DSI_FUNC_PRG) > +#define _MIPIC_DSI_FUNC_PRG (dev_priv->mipi_mmio_base + 0xb80c) > +#define MIPI_DSI_FUNC_PRG(port) _MIPI_PORT(port, _MIPIA_DSI_FUNC_PRG, \ > + _MIPIC_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) > @@ -6746,93 +6749,93 @@ enum punit_power_well { > #define DATA_LANES_PRG_REG_MASK (7 << 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(tc) _TRANSCODER(tc, _MIPIA_HS_TX_TIMEOUT, \ > - _MIPIB_HS_TX_TIMEOUT) > +#define _MIPIC_HS_TX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb810) > +#define MIPI_HS_TX_TIMEOUT(port) _MIPI_PORT(port, _MIPIA_HS_TX_TIMEOUT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_LP_RX_TIMEOUT, \ > - _MIPIB_LP_RX_TIMEOUT) > +#define _MIPIC_LP_RX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb814) > +#define MIPI_LP_RX_TIMEOUT(port) _MIPI_PORT(port, _MIPIA_LP_RX_TIMEOUT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_TURN_AROUND_TIMEOUT, _MIPIB_TURN_AROUND_TIMEOUT) > +#define _MIPIC_TURN_AROUND_TIMEOUT (dev_priv->mipi_mmio_base + 0xb818) > +#define MIPI_TURN_AROUND_TIMEOUT(port) _MIPI_PORT(port, \ > + _MIPIA_TURN_AROUND_TIMEOUT, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_DEVICE_RESET_TIMER, _MIPIB_DEVICE_RESET_TIMER) > +#define _MIPIC_DEVICE_RESET_TIMER (dev_priv->mipi_mmio_base + 0xb81c) > +#define MIPI_DEVICE_RESET_TIMER(port) _MIPI_PORT(port, \ > + _MIPIA_DEVICE_RESET_TIMER, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_DPI_RESOLUTION, \ > - _MIPIB_DPI_RESOLUTION) > +#define _MIPIC_DPI_RESOLUTION (dev_priv->mipi_mmio_base + 0xb820) > +#define MIPI_DPI_RESOLUTION(port) _MIPI_PORT(port, _MIPIA_DPI_RESOLUTION, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_DBI_FIFO_THROTTLE, _MIPIB_DBI_FIFO_THROTTLE) > +#define _MIPIC_DBI_FIFO_THROTTLE (dev_priv->mipi_mmio_base + 0xb824) > +#define MIPI_DBI_FIFO_THROTTLE(port) _MIPI_PORT(port, \ > + _MIPIA_DBI_FIFO_THROTTLE, _MIPIC_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 (dev_priv->mipi_mmio_base + 0xb028) > -#define _MIPIB_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828) > -#define MIPI_HSYNC_PADDING_COUNT(tc) _TRANSCODER(tc, \ > - _MIPIA_HSYNC_PADDING_COUNT, _MIPIB_HSYNC_PADDING_COUNT) > +#define _MIPIC_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828) > +#define MIPI_HSYNC_PADDING_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_HSYNC_PADDING_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HBP_COUNT, \ > - _MIPIB_HBP_COUNT) > +#define _MIPIC_HBP_COUNT (dev_priv->mipi_mmio_base + 0xb82c) > +#define MIPI_HBP_COUNT(port) _MIPI_PORT(port, _MIPIA_HBP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HFP_COUNT, \ > - _MIPIB_HFP_COUNT) > +#define _MIPIC_HFP_COUNT (dev_priv->mipi_mmio_base + 0xb830) > +#define MIPI_HFP_COUNT(port) _MIPI_PORT(port, _MIPIA_HFP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_HACTIVE_AREA_COUNT, _MIPIB_HACTIVE_AREA_COUNT) > +#define _MIPIC_HACTIVE_AREA_COUNT (dev_priv->mipi_mmio_base + 0xb834) > +#define MIPI_HACTIVE_AREA_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_HACTIVE_AREA_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_VSYNC_PADDING_COUNT, _MIPIB_VSYNC_PADDING_COUNT) > +#define _MIPIC_VSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb838) > +#define MIPI_VSYNC_PADDING_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_VSYNC_PADDING_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_VBP_COUNT, \ > - _MIPIB_VBP_COUNT) > +#define _MIPIC_VBP_COUNT (dev_priv->mipi_mmio_base + 0xb83c) > +#define MIPI_VBP_COUNT(port) _MIPI_PORT(port, _MIPIA_VBP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_VFP_COUNT, \ > - _MIPIB_VFP_COUNT) > +#define _MIPIC_VFP_COUNT (dev_priv->mipi_mmio_base + 0xb840) > +#define MIPI_VFP_COUNT(port) _MIPI_PORT(port, _MIPIA_VFP_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIB_HIGH_LOW_SWITCH_COUNT) > +#define _MIPIC_HIGH_LOW_SWITCH_COUNT (dev_priv->mipi_mmio_base + 0xb844) > +#define MIPI_HIGH_LOW_SWITCH_COUNT(port) _MIPI_PORT(port, \ > + _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIC_HIGH_LOW_SWITCH_COUNT) > > /* regs above are bits 15:0 */ > > #define _MIPIA_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb048) > -#define _MIPIB_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848) > -#define MIPI_DPI_CONTROL(tc) _TRANSCODER(tc, _MIPIA_DPI_CONTROL, \ > - _MIPIB_DPI_CONTROL) > +#define _MIPIC_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848) > +#define MIPI_DPI_CONTROL(port) _MIPI_PORT(port, _MIPIA_DPI_CONTROL, \ > + _MIPIC_DPI_CONTROL) > #define DPI_LP_MODE (1 << 6) > #define BACKLIGHT_OFF (1 << 5) > #define BACKLIGHT_ON (1 << 4) > @@ -6842,30 +6845,30 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_DPI_DATA, \ > - _MIPIB_DPI_DATA) > +#define _MIPIC_DPI_DATA (dev_priv->mipi_mmio_base + 0xb84c) > +#define MIPI_DPI_DATA(port) _MIPI_PORT(port, _MIPIA_DPI_DATA, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INIT_COUNT, \ > - _MIPIB_INIT_COUNT) > +#define _MIPIC_INIT_COUNT (dev_priv->mipi_mmio_base + 0xb850) > +#define MIPI_INIT_COUNT(port) _MIPI_PORT(port, _MIPIA_INIT_COUNT, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIB_MAX_RETURN_PKT_SIZE) > +#define _MIPIC_MAX_RETURN_PKT_SIZE (dev_priv->mipi_mmio_base + 0xb854) > +#define MIPI_MAX_RETURN_PKT_SIZE(port) _MIPI_PORT(port, \ > + _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_VIDEO_MODE_FORMAT, _MIPIB_VIDEO_MODE_FORMAT) > +#define _MIPIC_VIDEO_MODE_FORMAT (dev_priv->mipi_mmio_base + 0xb858) > +#define MIPI_VIDEO_MODE_FORMAT(port) _MIPI_PORT(port, \ > + _MIPIA_VIDEO_MODE_FORMAT, _MIPIC_VIDEO_MODE_FORMAT) > #define RANDOM_DPI_DISPLAY_RESOLUTION (1 << 4) > #define DISABLE_VIDEO_BTA (1 << 3) > #define IP_TG_CONFIG (1 << 2) > @@ -6874,9 +6877,9 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_EOT_DISABLE, \ > - _MIPIB_EOT_DISABLE) > +#define _MIPIC_EOT_DISABLE (dev_priv->mipi_mmio_base + 0xb85c) > +#define MIPI_EOT_DISABLE(port) _MIPI_PORT(port, _MIPIA_EOT_DISABLE, \ > + _MIPIC_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) > @@ -6887,32 +6890,32 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_LP_BYTECLK, \ > - _MIPIB_LP_BYTECLK) > +#define _MIPIC_LP_BYTECLK (dev_priv->mipi_mmio_base + 0xb860) > +#define MIPI_LP_BYTECLK(port) _MIPI_PORT(port, _MIPIA_LP_BYTECLK, \ > + _MIPIC_LP_BYTECLK) > #define LP_BYTECLK_SHIFT 0 > #define LP_BYTECLK_MASK (0xffff << 0) > > /* bits 31:0 */ > #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(tc) _TRANSCODER(tc, _MIPIA_LP_GEN_DATA, \ > - _MIPIB_LP_GEN_DATA) > +#define _MIPIC_LP_GEN_DATA (dev_priv->mipi_mmio_base + 0xb864) > +#define MIPI_LP_GEN_DATA(port) _MIPI_PORT(port, _MIPIA_LP_GEN_DATA, \ > + _MIPIC_LP_GEN_DATA) > > /* bits 31: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(tc) _TRANSCODER(tc, _MIPIA_HS_GEN_DATA, \ > - _MIPIB_HS_GEN_DATA) > +#define _MIPIC_HS_GEN_DATA (dev_priv->mipi_mmio_base + 0xb868) > +#define MIPI_HS_GEN_DATA(port) _MIPI_PORT(port, _MIPIA_HS_GEN_DATA, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_LP_GEN_CTRL, \ > - _MIPIB_LP_GEN_CTRL) > +#define _MIPIC_LP_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb86c) > +#define MIPI_LP_GEN_CTRL(port) _MIPI_PORT(port, _MIPIA_LP_GEN_CTRL, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HS_GEN_CTRL, \ > - _MIPIB_HS_GEN_CTRL) > +#define _MIPIC_HS_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb870) > +#define MIPI_HS_GEN_CTRL(port) _MIPI_PORT(port, _MIPIA_HS_GEN_CTRL, \ > + _MIPIC_HS_GEN_CTRL) > #define LONG_PACKET_WORD_COUNT_SHIFT 8 > #define LONG_PACKET_WORD_COUNT_MASK (0xffff << 8) > #define SHORT_PACKET_PARAM_SHIFT 8 > @@ -6924,9 +6927,9 @@ enum punit_power_well { > /* data type values, see include/video/mipi_display.h */ > > #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(tc) _TRANSCODER(tc, _MIPIA_GEN_FIFO_STAT, \ > - _MIPIB_GEN_FIFO_STAT) > +#define _MIPIC_GEN_FIFO_STAT (dev_priv->mipi_mmio_base + 0xb874) > +#define MIPI_GEN_FIFO_STAT(port) _MIPI_PORT(port, _MIPIA_GEN_FIFO_STAT, \ > + _MIPIC_GEN_FIFO_STAT) > #define DPI_FIFO_EMPTY (1 << 28) > #define DBI_FIFO_EMPTY (1 << 27) > #define LP_CTRL_FIFO_EMPTY (1 << 26) > @@ -6943,17 +6946,17 @@ enum punit_power_well { > #define HS_DATA_FIFO_FULL (1 << 0) > > #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(tc) _TRANSCODER(tc, \ > - _MIPIA_HS_LS_DBI_ENABLE, _MIPIB_HS_LS_DBI_ENABLE) > +#define _MIPIC_HS_LS_DBI_ENABLE (dev_priv->mipi_mmio_base + 0xb878) > +#define MIPI_HS_LP_DBI_ENABLE(port) _MIPI_PORT(port, \ > + _MIPIA_HS_LS_DBI_ENABLE, _MIPIC_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 (dev_priv->mipi_mmio_base + 0xb080) > -#define _MIPIB_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880) > -#define MIPI_DPHY_PARAM(tc) _TRANSCODER(tc, _MIPIA_DPHY_PARAM, \ > - _MIPIB_DPHY_PARAM) > +#define _MIPIC_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880) > +#define MIPI_DPHY_PARAM(port) _MIPI_PORT(port, _MIPIA_DPHY_PARAM, \ > + _MIPIC_DPHY_PARAM) > #define EXIT_ZERO_COUNT_SHIFT 24 > #define EXIT_ZERO_COUNT_MASK (0x3f << 24) > #define TRAIL_COUNT_SHIFT 16 > @@ -6965,36 +6968,36 @@ enum punit_power_well { > > /* bits 31: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(tc) _TRANSCODER(tc, _MIPIA_DBI_BW_CTRL, \ > - _MIPIB_DBI_BW_CTRL) > +#define _MIPIC_DBI_BW_CTRL (dev_priv->mipi_mmio_base + 0xb884) > +#define MIPI_DBI_BW_CTRL(port) _MIPI_PORT(port, _MIPIA_DBI_BW_CTRL, \ > + _MIPIC_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 \ > +#define _MIPIC_CLK_LANE_SWITCH_TIME_CNT (dev_priv->mipi_mmio_base \ > + 0xb888) > -#define MIPI_CLK_LANE_SWITCH_TIME_CNT(tc) _TRANSCODER(tc, \ > - _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIB_CLK_LANE_SWITCH_TIME_CNT) > +#define MIPI_CLK_LANE_SWITCH_TIME_CNT(port) _MIPI_PORT(port, \ > + _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_STOP_STATE_STALL, _MIPIB_STOP_STATE_STALL) > +#define _MIPIC_STOP_STATE_STALL (dev_priv->mipi_mmio_base + 0xb88c) > +#define MIPI_STOP_STATE_STALL(port) _MIPI_PORT(port, \ > + _MIPIA_STOP_STATE_STALL, _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_INTR_STAT_REG_1, _MIPIB_INTR_STAT_REG_1) > +#define _MIPIC_INTR_STAT_REG_1 (dev_priv->mipi_mmio_base + 0xb890) > +#define MIPI_INTR_STAT_REG_1(port) _MIPI_PORT(port, \ > + _MIPIA_INTR_STAT_REG_1, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INTR_EN_REG_1, \ > - _MIPIB_INTR_EN_REG_1) > +#define _MIPIC_INTR_EN_REG_1 (dev_priv->mipi_mmio_base + 0xb894) > +#define MIPI_INTR_EN_REG_1(port) _MIPI_PORT(port, _MIPIA_INTR_EN_REG_1, \ > + _MIPIC_INTR_EN_REG_1) > #define RX_CONTENTION_DETECTED (1 << 0) > > /* XXX: only pipe A ?!? */ > @@ -7013,9 +7016,9 @@ enum punit_power_well { > /* MIPI adapter registers */ > > #define _MIPIA_CTRL (dev_priv->mipi_mmio_base + 0xb104) > -#define _MIPIB_CTRL (dev_priv->mipi_mmio_base + 0xb904) > -#define MIPI_CTRL(tc) _TRANSCODER(tc, _MIPIA_CTRL, \ > - _MIPIB_CTRL) > +#define _MIPIC_CTRL (dev_priv->mipi_mmio_base + 0xb904) > +#define MIPI_CTRL(port) _MIPI_PORT(port, _MIPIA_CTRL, \ > + _MIPIC_CTRL) > #define ESCAPE_CLOCK_DIVIDER_SHIFT 5 /* A only */ > #define ESCAPE_CLOCK_DIVIDER_MASK (3 << 5) > #define ESCAPE_CLOCK_DIVIDER_1 (0 << 5) > @@ -7028,24 +7031,24 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_DATA_ADDRESS, \ > - _MIPIB_DATA_ADDRESS) > +#define _MIPIC_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb908) > +#define MIPI_DATA_ADDRESS(port) _MIPI_PORT(port, _MIPIA_DATA_ADDRESS, \ > + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_DATA_LENGTH, \ > - _MIPIB_DATA_LENGTH) > +#define _MIPIC_DATA_LENGTH (dev_priv->mipi_mmio_base + 0xb90c) > +#define MIPI_DATA_LENGTH(port) _MIPI_PORT(port, _MIPIA_DATA_LENGTH, \ > + _MIPIC_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(tc) _TRANSCODER(tc, \ > - _MIPIA_COMMAND_ADDRESS, _MIPIB_COMMAND_ADDRESS) > +#define _MIPIC_COMMAND_ADDRESS (dev_priv->mipi_mmio_base + 0xb910) > +#define MIPI_COMMAND_ADDRESS(port) _MIPI_PORT(port, \ > + _MIPIA_COMMAND_ADDRESS, _MIPIC_COMMAND_ADDRESS) > #define COMMAND_MEM_ADDRESS_SHIFT 5 > #define COMMAND_MEM_ADDRESS_MASK (0x7ffffff << 5) > #define AUTO_PWG_ENABLE (1 << 2) > @@ -7053,22 +7056,22 @@ enum punit_power_well { > #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(tc) _TRANSCODER(tc, _MIPIA_COMMAND_LENGTH, \ > - _MIPIB_COMMAND_LENGTH) > +#define _MIPIC_COMMAND_LENGTH (dev_priv->mipi_mmio_base + 0xb914) > +#define MIPI_COMMAND_LENGTH(port) _MIPI_PORT(port, _MIPIA_COMMAND_LENGTH, \ > + _MIPIC_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) > -#define MIPI_READ_DATA_RETURN(tc, n) \ > - (_TRANSCODER(tc, _MIPIA_READ_DATA_RETURN0, _MIPIB_READ_DATA_RETURN0) \ > +#define _MIPIC_READ_DATA_RETURN0 (dev_priv->mipi_mmio_base + 0xb918) > +#define MIPI_READ_DATA_RETURN(port, n) \ > + (_MIPI_PORT(port, _MIPIA_READ_DATA_RETURN0, _MIPIC_READ_DATA_RETURN0) \ > + 4 * (n)) /* n: 0...7 */ > > #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(tc) _TRANSCODER(tc, \ > - _MIPIA_READ_DATA_VALID, _MIPIB_READ_DATA_VALID) > +#define _MIPIC_READ_DATA_VALID (dev_priv->mipi_mmio_base + 0xb938) > +#define MIPI_READ_DATA_VALID(port) _MIPI_PORT(port, \ > + _MIPIA_READ_DATA_VALID, _MIPIC_READ_DATA_VALID) > #define READ_DATA_VALID(n) (1 << (n)) > > /* For UMS only (deprecated): */ > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 0b184079de14..35842a6687d8 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -106,7 +106,7 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder) > { > struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 val; > > DRM_DEBUG_KMS("\n"); > @@ -120,17 +120,17 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder) > /* bandgap reset is needed after everytime we do power gate */ > band_gap_reset(dev_priv); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), ULPS_STATE_ENTER); > + I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_ENTER); > usleep_range(2500, 3000); > > - val = I915_READ(MIPI_PORT_CTRL(pipe)); > - I915_WRITE(MIPI_PORT_CTRL(pipe), val | LP_OUTPUT_HOLD); > + val = I915_READ(MIPI_PORT_CTRL(port)); > + I915_WRITE(MIPI_PORT_CTRL(port), val | LP_OUTPUT_HOLD); > usleep_range(1000, 1500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), ULPS_STATE_EXIT); > + I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_EXIT); > usleep_range(2500, 3000); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY); > usleep_range(2500, 3000); > } > > @@ -140,13 +140,13 @@ static void intel_dsi_enable(struct intel_encoder *encoder) > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 temp; > > DRM_DEBUG_KMS("\n"); > > if (is_cmd_mode(intel_dsi)) > - I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(pipe), 8 * 4); > + I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4); > else { > msleep(20); /* XXX */ > dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN); > @@ -158,10 +158,10 @@ static void intel_dsi_enable(struct intel_encoder *encoder) > wait_for_dsi_fifo_empty(intel_dsi); > > /* assert ip_tg_enable signal */ > - temp = I915_READ(MIPI_PORT_CTRL(pipe)) & ~LANE_CONFIGURATION_MASK; > + temp = I915_READ(MIPI_PORT_CTRL(port)) & ~LANE_CONFIGURATION_MASK; > temp = temp | intel_dsi->port_bits; > - I915_WRITE(MIPI_PORT_CTRL(pipe), temp | DPI_ENABLE); > - POSTING_READ(MIPI_PORT_CTRL(pipe)); > + I915_WRITE(MIPI_PORT_CTRL(port), temp | DPI_ENABLE); > + POSTING_READ(MIPI_PORT_CTRL(port)); > } > } > > @@ -237,7 +237,7 @@ static void intel_dsi_disable(struct intel_encoder *encoder) > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 temp; > > DRM_DEBUG_KMS("\n"); > @@ -246,29 +246,29 @@ static void intel_dsi_disable(struct intel_encoder *encoder) > wait_for_dsi_fifo_empty(intel_dsi); > > /* de-assert ip_tg_enable signal */ > - temp = I915_READ(MIPI_PORT_CTRL(pipe)); > - I915_WRITE(MIPI_PORT_CTRL(pipe), temp & ~DPI_ENABLE); > - POSTING_READ(MIPI_PORT_CTRL(pipe)); > + temp = I915_READ(MIPI_PORT_CTRL(port)); > + I915_WRITE(MIPI_PORT_CTRL(port), temp & ~DPI_ENABLE); > + POSTING_READ(MIPI_PORT_CTRL(port)); > > msleep(2); > } > > /* Panel commands can be sent when clock is in LP11 */ > - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x0); > + I915_WRITE(MIPI_DEVICE_READY(port), 0x0); > > - temp = I915_READ(MIPI_CTRL(pipe)); > + temp = I915_READ(MIPI_CTRL(port)); > temp &= ~ESCAPE_CLOCK_DIVIDER_MASK; > - I915_WRITE(MIPI_CTRL(pipe), temp | > + I915_WRITE(MIPI_CTRL(port), temp | > intel_dsi->escape_clk_div << > ESCAPE_CLOCK_DIVIDER_SHIFT); > > - I915_WRITE(MIPI_EOT_DISABLE(pipe), CLOCKSTOP); > + I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP); > > - temp = I915_READ(MIPI_DSI_FUNC_PRG(pipe)); > + temp = I915_READ(MIPI_DSI_FUNC_PRG(port)); > temp &= ~VID_MODE_FORMAT_MASK; > - I915_WRITE(MIPI_DSI_FUNC_PRG(pipe), temp); > + I915_WRITE(MIPI_DSI_FUNC_PRG(port), temp); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x1); > + I915_WRITE(MIPI_DEVICE_READY(port), 0x1); > > /* if disable packets are sent before sending shutdown packet then in > * some next enable sequence send turn on packet error is observed */ > @@ -282,29 +282,29 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) > { > struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 val; > > DRM_DEBUG_KMS("\n"); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_ENTER); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_ENTER); > usleep_range(2000, 2500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_EXIT); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_EXIT); > usleep_range(2000, 2500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_ENTER); > + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_ENTER); > usleep_range(2000, 2500); > > - if (wait_for(((I915_READ(MIPI_PORT_CTRL(pipe)) & AFE_LATCHOUT) > + if (wait_for(((I915_READ(MIPI_PORT_CTRL(port)) & AFE_LATCHOUT) > == 0x00000), 30)) > DRM_ERROR("DSI LP not going Low\n"); > > - val = I915_READ(MIPI_PORT_CTRL(pipe)); > - I915_WRITE(MIPI_PORT_CTRL(pipe), val & ~LP_OUTPUT_HOLD); > + val = I915_READ(MIPI_PORT_CTRL(port)); > + I915_WRITE(MIPI_PORT_CTRL(port), val & ~LP_OUTPUT_HOLD); > usleep_range(1000, 1500); > > - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x00); > + I915_WRITE(MIPI_DEVICE_READY(port), 0x00); > usleep_range(2000, 2500); > > vlv_disable_dsi_pll(encoder); > @@ -338,8 +338,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, > { > struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > enum intel_display_power_domain power_domain; > - u32 port, func; > - enum pipe p; > + u32 port_ctl, func; > + enum port port; > > DRM_DEBUG_KMS("\n"); > > @@ -348,13 +348,13 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, > return false; > > /* XXX: this only works for one DSI output */ > - for (p = PIPE_A; p <= PIPE_B; p++) { > - port = I915_READ(MIPI_PORT_CTRL(p)); > - func = I915_READ(MIPI_DSI_FUNC_PRG(p)); > + for_each_dsi_port(port, (1 << PORT_A) | (1 << PORT_C)) { > + port_ctl = I915_READ(MIPI_PORT_CTRL(port)); > + func = I915_READ(MIPI_DSI_FUNC_PRG(port)); > > - if ((port & DPI_ENABLE) || (func & CMD_MODE_DATA_WIDTH_MASK)) { > - if (I915_READ(MIPI_DEVICE_READY(p)) & DEVICE_READY) { > - *pipe = p; > + if ((port_ctl & DPI_ENABLE) || (func & CMD_MODE_DATA_WIDTH_MASK)) { > + if (I915_READ(MIPI_DEVICE_READY(port)) & DEVICE_READY) { > + *pipe = port == PORT_A ? PIPE_A : PIPE_C; > return true; > } > } > @@ -437,7 +437,7 @@ static void set_dsi_timings(struct drm_encoder *encoder, > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > unsigned int bpp = intel_crtc->config.pipe_bpp; > unsigned int lane_count = intel_dsi->lane_count; > > @@ -460,18 +460,18 @@ static void set_dsi_timings(struct drm_encoder *encoder, > intel_dsi->burst_mode_ratio); > hbp = txbyteclkhs(hbp, bpp, lane_count, intel_dsi->burst_mode_ratio); > > - I915_WRITE(MIPI_HACTIVE_AREA_COUNT(pipe), hactive); > - I915_WRITE(MIPI_HFP_COUNT(pipe), hfp); > + I915_WRITE(MIPI_HACTIVE_AREA_COUNT(port), hactive); > + I915_WRITE(MIPI_HFP_COUNT(port), hfp); > > /* meaningful for video mode non-burst sync pulse mode only, can be zero > * for non-burst sync events and burst modes */ > - I915_WRITE(MIPI_HSYNC_PADDING_COUNT(pipe), hsync); > - I915_WRITE(MIPI_HBP_COUNT(pipe), hbp); > + I915_WRITE(MIPI_HSYNC_PADDING_COUNT(port), hsync); > + I915_WRITE(MIPI_HBP_COUNT(port), hbp); > > /* vertical values are in terms of lines */ > - I915_WRITE(MIPI_VFP_COUNT(pipe), vfp); > - I915_WRITE(MIPI_VSYNC_PADDING_COUNT(pipe), vsync); > - I915_WRITE(MIPI_VBP_COUNT(pipe), vbp); > + I915_WRITE(MIPI_VFP_COUNT(port), vfp); > + I915_WRITE(MIPI_VSYNC_PADDING_COUNT(port), vsync); > + I915_WRITE(MIPI_VBP_COUNT(port), vbp); > } > > static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > @@ -483,30 +483,30 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > struct drm_display_mode *adjusted_mode = > &intel_crtc->config.adjusted_mode; > - int pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > unsigned int bpp = intel_crtc->config.pipe_bpp; > u32 val, tmp; > > - DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe)); > + DRM_DEBUG_KMS("pipe %c\n", pipe_name(intel_crtc->pipe)); > > /* escape clock divider, 20MHz, shared for A and C. device ready must be > * off when doing this! txclkesc? */ > - tmp = I915_READ(MIPI_CTRL(0)); > + tmp = I915_READ(MIPI_CTRL(PORT_A)); > tmp &= ~ESCAPE_CLOCK_DIVIDER_MASK; > - I915_WRITE(MIPI_CTRL(0), tmp | ESCAPE_CLOCK_DIVIDER_1); > + I915_WRITE(MIPI_CTRL(PORT_A), tmp | ESCAPE_CLOCK_DIVIDER_1); > > /* read request priority is per pipe */ > - tmp = I915_READ(MIPI_CTRL(pipe)); > + tmp = I915_READ(MIPI_CTRL(port)); > tmp &= ~READ_REQUEST_PRIORITY_MASK; > - I915_WRITE(MIPI_CTRL(pipe), tmp | READ_REQUEST_PRIORITY_HIGH); > + I915_WRITE(MIPI_CTRL(port), tmp | READ_REQUEST_PRIORITY_HIGH); > > /* XXX: why here, why like this? handling in irq handler?! */ > - I915_WRITE(MIPI_INTR_STAT(pipe), 0xffffffff); > - I915_WRITE(MIPI_INTR_EN(pipe), 0xffffffff); > + I915_WRITE(MIPI_INTR_STAT(port), 0xffffffff); > + I915_WRITE(MIPI_INTR_EN(port), 0xffffffff); > > - I915_WRITE(MIPI_DPHY_PARAM(pipe), intel_dsi->dphy_reg); > + I915_WRITE(MIPI_DPHY_PARAM(port), intel_dsi->dphy_reg); > > - I915_WRITE(MIPI_DPI_RESOLUTION(pipe), > + I915_WRITE(MIPI_DPI_RESOLUTION(port), > adjusted_mode->vdisplay << VERTICAL_ADDRESS_SHIFT | > adjusted_mode->hdisplay << HORIZONTAL_ADDRESS_SHIFT); > > @@ -522,7 +522,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > /* XXX: cross-check bpp vs. pixel format? */ > val |= intel_dsi->pixel_format; > } > - I915_WRITE(MIPI_DSI_FUNC_PRG(pipe), val); > + I915_WRITE(MIPI_DSI_FUNC_PRG(port), val); > > /* timeouts for recovery. one frame IIUC. if counter expires, EOT and > * stop state. */ > @@ -543,25 +543,25 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > > if (is_vid_mode(intel_dsi) && > intel_dsi->video_mode_format == VIDEO_MODE_BURST) { > - I915_WRITE(MIPI_HS_TX_TIMEOUT(pipe), > + I915_WRITE(MIPI_HS_TX_TIMEOUT(port), > txbyteclkhs(adjusted_mode->htotal, bpp, > intel_dsi->lane_count, > intel_dsi->burst_mode_ratio) + 1); > } else { > - I915_WRITE(MIPI_HS_TX_TIMEOUT(pipe), > + I915_WRITE(MIPI_HS_TX_TIMEOUT(port), > txbyteclkhs(adjusted_mode->vtotal * > adjusted_mode->htotal, > bpp, intel_dsi->lane_count, > intel_dsi->burst_mode_ratio) + 1); > } > - I915_WRITE(MIPI_LP_RX_TIMEOUT(pipe), intel_dsi->lp_rx_timeout); > - I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(pipe), intel_dsi->turn_arnd_val); > - I915_WRITE(MIPI_DEVICE_RESET_TIMER(pipe), intel_dsi->rst_timer_val); > + I915_WRITE(MIPI_LP_RX_TIMEOUT(port), intel_dsi->lp_rx_timeout); > + I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(port), intel_dsi->turn_arnd_val); > + I915_WRITE(MIPI_DEVICE_RESET_TIMER(port), intel_dsi->rst_timer_val); > > /* dphy stuff */ > > /* in terms of low power clock */ > - I915_WRITE(MIPI_INIT_COUNT(pipe), txclkesc(intel_dsi->escape_clk_div, 100)); > + I915_WRITE(MIPI_INIT_COUNT(port), txclkesc(intel_dsi->escape_clk_div, 100)); > > val = 0; > if (intel_dsi->eotp_pkt == 0) > @@ -571,17 +571,17 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > val |= CLOCKSTOP; > > /* recovery disables */ > - I915_WRITE(MIPI_EOT_DISABLE(pipe), val); > + I915_WRITE(MIPI_EOT_DISABLE(port), val); > > /* in terms of low power clock */ > - I915_WRITE(MIPI_INIT_COUNT(pipe), intel_dsi->init_count); > + I915_WRITE(MIPI_INIT_COUNT(port), intel_dsi->init_count); > > /* in terms of txbyteclkhs. actual high to low switch + > * MIPI_STOP_STATE_STALL * MIPI_LP_BYTECLK. > * > * XXX: write MIPI_STOP_STATE_STALL? > */ > - I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe), > + I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(port), > intel_dsi->hs_to_lp_count); > > /* XXX: low power clock equivalence in terms of byte clock. the number > @@ -589,16 +589,16 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > * and txclkesc. txclkesc time / txbyteclk time * (105 + > * MIPI_STOP_STATE_STALL) / 105.??? > */ > - I915_WRITE(MIPI_LP_BYTECLK(pipe), intel_dsi->lp_byte_clk); > + I915_WRITE(MIPI_LP_BYTECLK(port), intel_dsi->lp_byte_clk); > > /* the bw essential for transmitting 16 long packets containing 252 > * bytes meant for dcs write memory command is programmed in this > * register in terms of byte clocks. based on dsi transfer rate and the > * number of lanes configured the time taken to transmit 16 long packets > * in a dsi stream varies. */ > - I915_WRITE(MIPI_DBI_BW_CTRL(pipe), intel_dsi->bw_timer); > + I915_WRITE(MIPI_DBI_BW_CTRL(port), intel_dsi->bw_timer); > > - I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(pipe), > + I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(port), > intel_dsi->clk_lp_to_hs_count << LP_HS_SSW_CNT_SHIFT | > intel_dsi->clk_hs_to_lp_count << HS_LP_PWR_SW_CNT_SHIFT); > > @@ -606,7 +606,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) > /* Some panels might have resolution which is not a multiple of > * 64 like 1366 x 768. Enable RANDOM resolution support for such > * panels by default */ > - I915_WRITE(MIPI_VIDEO_MODE_FORMAT(pipe), > + I915_WRITE(MIPI_VIDEO_MODE_FORMAT(port), > intel_dsi->video_frmt_cfg_bits | > intel_dsi->video_mode_format | > IP_TG_CONFIG | > @@ -748,6 +748,12 @@ void intel_dsi_init(struct drm_device *dev) > intel_connector->get_hw_state = intel_connector_get_hw_state; > intel_connector->unregister = intel_connector_unregister; > > + /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */ > + if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) > + intel_encoder->crtc_mask = (1 << PIPE_A); > + else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) > + intel_encoder->crtc_mask = (1 << PIPE_B); > + > for (i = 0; i < ARRAY_SIZE(intel_dsi_devices); i++) { > dsi = &intel_dsi_devices[i]; > intel_dsi->dev = *dsi; > @@ -762,8 +768,6 @@ void intel_dsi_init(struct drm_device *dev) > } > > intel_encoder->type = INTEL_OUTPUT_DSI; > - intel_encoder->crtc_mask = (1 << 0); /* XXX */ > - > intel_encoder->cloneable = 0; > drm_connector_init(dev, connector, &intel_dsi_connector_funcs, > DRM_MODE_CONNECTOR_DSI); > diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h > index 657eb5c1b9d8..97a6f621774f 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.h > +++ b/drivers/gpu/drm/i915/intel_dsi.h > @@ -127,6 +127,22 @@ struct intel_dsi { > u16 panel_pwr_cycle_delay; > }; > > +/* XXX: Transitional before dual port configuration */ > +static inline enum port intel_dsi_pipe_to_port(enum pipe pipe) > +{ > + if (pipe == PIPE_A) > + return PORT_A; > + else if (pipe == PIPE_B) > + return PORT_C; > + > + WARN(1, "DSI on pipe %c, assuming port C\n", pipe_name(pipe)); > + return PORT_C; > +} > + > +#define for_each_dsi_port(__port, __ports_mask) \ > + for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ > + if ((__ports_mask) & (1 << (__port))) > + > static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder) > { > return container_of(encoder, struct intel_dsi, base.base); > diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.c b/drivers/gpu/drm/i915/intel_dsi_cmd.c > index f4767fd2ebeb..004fa918ca03 100644 > --- a/drivers/gpu/drm/i915/intel_dsi_cmd.c > +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.c > @@ -54,15 +54,15 @@ static void print_stat(struct intel_dsi *intel_dsi) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 val; > > - val = I915_READ(MIPI_INTR_STAT(pipe)); > + val = I915_READ(MIPI_INTR_STAT(port)); > > #define STAT_BIT(val, bit) (val) & (bit) ? " " #bit : "" > - DRM_DEBUG_KMS("MIPI_INTR_STAT(%d) = %08x" > + DRM_DEBUG_KMS("MIPI_INTR_STAT(%c) = %08x" > "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" > - "\n", pipe, val, > + "\n", port_name(port), val, > STAT_BIT(val, TEARING_EFFECT), > STAT_BIT(val, SPL_PKT_SENT_INTERRUPT), > STAT_BIT(val, GEN_READ_DATA_AVAIL), > @@ -110,16 +110,16 @@ void dsi_hs_mode_enable(struct intel_dsi *intel_dsi, bool enable) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 temp; > u32 mask = DBI_FIFO_EMPTY; > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 50)) > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 50)) > DRM_ERROR("Timeout waiting for DBI FIFO empty\n"); > > - temp = I915_READ(MIPI_HS_LP_DBI_ENABLE(pipe)); > + temp = I915_READ(MIPI_HS_LP_DBI_ENABLE(port)); > temp &= DBI_HS_LP_MODE_MASK; > - I915_WRITE(MIPI_HS_LP_DBI_ENABLE(pipe), enable ? DBI_HS_MODE : DBI_LP_MODE); > + I915_WRITE(MIPI_HS_LP_DBI_ENABLE(port), enable ? DBI_HS_MODE : DBI_LP_MODE); > > intel_dsi->hs = enable; > } > @@ -131,7 +131,7 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 ctrl_reg; > u32 ctrl; > u32 mask; > @@ -140,14 +140,14 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, > channel, data_type, data); > > if (intel_dsi->hs) { > - ctrl_reg = MIPI_HS_GEN_CTRL(pipe); > + ctrl_reg = MIPI_HS_GEN_CTRL(port); > mask = HS_CTRL_FIFO_FULL; > } else { > - ctrl_reg = MIPI_LP_GEN_CTRL(pipe); > + ctrl_reg = MIPI_LP_GEN_CTRL(port); > mask = LP_CTRL_FIFO_FULL; > } > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == 0, 50)) { > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == 0, 50)) { > DRM_ERROR("Timeout waiting for HS/LP CTRL FIFO !full\n"); > print_stat(intel_dsi); > } > @@ -173,7 +173,7 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 data_reg; > int i, j, n; > u32 mask; > @@ -182,14 +182,14 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, > channel, data_type, len); > > if (intel_dsi->hs) { > - data_reg = MIPI_HS_GEN_DATA(pipe); > + data_reg = MIPI_HS_GEN_DATA(port); > mask = HS_DATA_FIFO_FULL; > } else { > - data_reg = MIPI_LP_GEN_DATA(pipe); > + data_reg = MIPI_LP_GEN_DATA(port); > mask = LP_DATA_FIFO_FULL; > } > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == 0, 50)) > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == 0, 50)) > DRM_ERROR("Timeout waiting for HS/LP DATA FIFO !full\n"); > > for (i = 0; i < len; i += n) { > @@ -292,14 +292,14 @@ static int dsi_read_data_return(struct intel_dsi *intel_dsi, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > int i, len = 0; > u32 data_reg, val; > > if (intel_dsi->hs) { > - data_reg = MIPI_HS_GEN_DATA(pipe); > + data_reg = MIPI_HS_GEN_DATA(port); > } else { > - data_reg = MIPI_LP_GEN_DATA(pipe); > + data_reg = MIPI_LP_GEN_DATA(port); > } > > while (len < buflen) { > @@ -318,7 +318,7 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > int ret; > > @@ -327,14 +327,14 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, > * longer than MIPI_MAX_RETURN_PKT_SIZE > */ > > - I915_WRITE(MIPI_INTR_STAT(pipe), GEN_READ_DATA_AVAIL); > + I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL); > > ret = dsi_vc_dcs_send_read_request(intel_dsi, channel, dcs_cmd); > if (ret) > return ret; > > mask = GEN_READ_DATA_AVAIL; > - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 50)) > + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 50)) > DRM_ERROR("Timeout waiting for read data.\n"); > > ret = dsi_read_data_return(intel_dsi, buf, buflen); > @@ -354,7 +354,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > int ret; > > @@ -363,7 +363,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, > * longer than MIPI_MAX_RETURN_PKT_SIZE > */ > > - I915_WRITE(MIPI_INTR_STAT(pipe), GEN_READ_DATA_AVAIL); > + I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL); > > ret = dsi_vc_generic_send_read_request(intel_dsi, channel, reqdata, > reqlen); > @@ -371,7 +371,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, > return ret; > > mask = GEN_READ_DATA_AVAIL; > - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 50)) > + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 50)) > DRM_ERROR("Timeout waiting for read data.\n"); > > ret = dsi_read_data_return(intel_dsi, buf, buflen); > @@ -395,7 +395,7 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > > /* XXX: pipe, hs */ > @@ -405,16 +405,16 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs) > cmd |= DPI_LP_MODE; > > /* clear bit */ > - I915_WRITE(MIPI_INTR_STAT(pipe), SPL_PKT_SENT_INTERRUPT); > + I915_WRITE(MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT); > > /* XXX: old code skips write if control unchanged */ > - if (cmd == I915_READ(MIPI_DPI_CONTROL(pipe))) > + if (cmd == I915_READ(MIPI_DPI_CONTROL(port))) > DRM_ERROR("Same special packet %02x twice in a row.\n", cmd); > > - I915_WRITE(MIPI_DPI_CONTROL(pipe), cmd); > + I915_WRITE(MIPI_DPI_CONTROL(port), cmd); > > mask = SPL_PKT_SENT_INTERRUPT; > - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 100)) > + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 100)) > DRM_ERROR("Video mode command 0x%08x send failed.\n", cmd); > > return 0; > @@ -426,12 +426,12 @@ void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi) > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - enum pipe pipe = intel_crtc->pipe; > + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); > u32 mask; > > mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY | > LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY; > > - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 100)) > + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100)) > DRM_ERROR("DPI FIFOs are not empty\n"); > } checkpatch.pl is throwing few warnings and one error which are mainly because of lines more than 80 characters. The patch is otherwise looking good. with regards, Gaurav
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index a143127eb451..250043f3f22e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -31,6 +31,8 @@ #define _PORT(port, a, b) ((a) + (port)*((b)-(a))) #define _PIPE3(pipe, a, b, c) ((pipe) == PIPE_A ? (a) : \ (pipe) == PIPE_B ? (b) : (c)) +#define _PORT3(port, a, b, c) ((port) == PORT_A ? (a) : \ + (port) == PORT_B ? (b) : (c)) #define _MASKED_BIT_ENABLE(a) (((a) << 16) | (a)) #define _MASKED_BIT_DISABLE(a) ((a) << 16) @@ -1492,7 +1494,7 @@ enum punit_power_well { #define I915_ISP_INTERRUPT (1<<22) #define I915_LPE_PIPE_B_INTERRUPT (1<<21) #define I915_LPE_PIPE_A_INTERRUPT (1<<20) -#define I915_MIPIB_INTERRUPT (1<<19) +#define I915_MIPIC_INTERRUPT (1<<19) #define I915_MIPIA_INTERRUPT (1<<18) #define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1<<18) #define I915_DISPLAY_PORT_INTERRUPT (1<<17) @@ -6612,29 +6614,30 @@ 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 DSI registers */ + +#define _MIPI_PORT(port, a, c) _PORT3(port, a, 0, c) /* ports A and C only */ #define _MIPIA_PORT_CTRL (VLV_DISPLAY_BASE + 0x61190) -#define _MIPIB_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700) -#define MIPI_PORT_CTRL(tc) _TRANSCODER(tc, _MIPIA_PORT_CTRL, \ - _MIPIB_PORT_CTRL) -#define DPI_ENABLE (1 << 31) /* A + B */ +#define _MIPIC_PORT_CTRL (VLV_DISPLAY_BASE + 0x61700) +#define MIPI_PORT_CTRL(port) _MIPI_PORT(port, _MIPIA_PORT_CTRL, _MIPIC_PORT_CTRL) +#define DPI_ENABLE (1 << 31) /* A + C */ #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) /* A + C */ #define FLOPPED_HSTX (1 << 23) #define DE_INVERT (1 << 19) /* XXX */ #define MIPIA_FLISDSI_DELAY_COUNT_SHIFT 18 #define MIPIA_FLISDSI_DELAY_COUNT_MASK (0xf << 18) #define AFE_LATCHOUT (1 << 17) #define LP_OUTPUT_HOLD (1 << 16) -#define MIPIB_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15 -#define MIPIB_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15) -#define MIPIB_MIPI4DPHY_DELAY_COUNT_SHIFT 11 -#define MIPIB_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11) +#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_SHIFT 15 +#define MIPIC_FLISDSI_DELAY_COUNT_HIGH_MASK (1 << 15) +#define MIPIC_MIPI4DPHY_DELAY_COUNT_SHIFT 11 +#define MIPIC_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 11) #define CSB_SHIFT 9 #define CSB_MASK (3 << 9) #define CSB_20MHZ (0 << 9) @@ -6643,10 +6646,10 @@ enum punit_power_well { #define BANDGAP_MASK (1 << 8) #define BANDGAP_PNW_CIRCUIT (0 << 8) #define BANDGAP_LNC_CIRCUIT (1 << 8) -#define MIPIB_FLISDSI_DELAY_COUNT_LOW_SHIFT 5 -#define MIPIB_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5) -#define TEARING_EFFECT_DELAY (1 << 4) /* A + B */ -#define TEARING_EFFECT_SHIFT 2 /* A + B */ +#define MIPIC_FLISDSI_DELAY_COUNT_LOW_SHIFT 5 +#define MIPIC_FLISDSI_DELAY_COUNT_LOW_MASK (7 << 5) +#define TEARING_EFFECT_DELAY (1 << 4) /* A + C */ +#define TEARING_EFFECT_SHIFT 2 /* A + C */ #define TEARING_EFFECT_MASK (3 << 2) #define TEARING_EFFECT_OFF (0 << 2) #define TEARING_EFFECT_DSI (1 << 2) @@ -6658,9 +6661,9 @@ enum punit_power_well { #define LANE_CONFIGURATION_DUAL_LINK_B (2 << 0) #define _MIPIA_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61194) -#define _MIPIB_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704) -#define MIPI_TEARING_CTRL(tc) _TRANSCODER(tc, \ - _MIPIA_TEARING_CTRL, _MIPIB_TEARING_CTRL) +#define _MIPIC_TEARING_CTRL (VLV_DISPLAY_BASE + 0x61704) +#define MIPI_TEARING_CTRL(port) _MIPI_PORT(port, \ + _MIPIA_TEARING_CTRL, _MIPIC_TEARING_CTRL) #define TEARING_EFFECT_DELAY_SHIFT 0 #define TEARING_EFFECT_DELAY_MASK (0xffff << 0) @@ -6670,9 +6673,9 @@ enum punit_power_well { /* 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(tc) _TRANSCODER(tc, _MIPIA_DEVICE_READY, \ - _MIPIB_DEVICE_READY) +#define _MIPIC_DEVICE_READY (dev_priv->mipi_mmio_base + 0xb800) +#define MIPI_DEVICE_READY(port) _MIPI_PORT(port, _MIPIA_DEVICE_READY, \ + _MIPIC_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) @@ -6681,13 +6684,13 @@ enum punit_power_well { #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(tc) _TRANSCODER(tc, _MIPIA_INTR_STAT, \ - _MIPIB_INTR_STAT) +#define _MIPIC_INTR_STAT (dev_priv->mipi_mmio_base + 0xb804) +#define MIPI_INTR_STAT(port) _MIPI_PORT(port, _MIPIA_INTR_STAT, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INTR_EN, \ - _MIPIB_INTR_EN) +#define _MIPIC_INTR_EN (dev_priv->mipi_mmio_base + 0xb808) +#define MIPI_INTR_EN(port) _MIPI_PORT(port, _MIPIA_INTR_EN, \ + _MIPIC_INTR_EN) #define TEARING_EFFECT (1 << 31) #define SPL_PKT_SENT_INTERRUPT (1 << 30) #define GEN_READ_DATA_AVAIL (1 << 29) @@ -6722,9 +6725,9 @@ enum punit_power_well { #define RXSOT_ERROR (1 << 0) #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(tc) _TRANSCODER(tc, _MIPIA_DSI_FUNC_PRG, \ - _MIPIB_DSI_FUNC_PRG) +#define _MIPIC_DSI_FUNC_PRG (dev_priv->mipi_mmio_base + 0xb80c) +#define MIPI_DSI_FUNC_PRG(port) _MIPI_PORT(port, _MIPIA_DSI_FUNC_PRG, \ + _MIPIC_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) @@ -6746,93 +6749,93 @@ enum punit_power_well { #define DATA_LANES_PRG_REG_MASK (7 << 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(tc) _TRANSCODER(tc, _MIPIA_HS_TX_TIMEOUT, \ - _MIPIB_HS_TX_TIMEOUT) +#define _MIPIC_HS_TX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb810) +#define MIPI_HS_TX_TIMEOUT(port) _MIPI_PORT(port, _MIPIA_HS_TX_TIMEOUT, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_LP_RX_TIMEOUT, \ - _MIPIB_LP_RX_TIMEOUT) +#define _MIPIC_LP_RX_TIMEOUT (dev_priv->mipi_mmio_base + 0xb814) +#define MIPI_LP_RX_TIMEOUT(port) _MIPI_PORT(port, _MIPIA_LP_RX_TIMEOUT, \ + _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_TURN_AROUND_TIMEOUT, _MIPIB_TURN_AROUND_TIMEOUT) +#define _MIPIC_TURN_AROUND_TIMEOUT (dev_priv->mipi_mmio_base + 0xb818) +#define MIPI_TURN_AROUND_TIMEOUT(port) _MIPI_PORT(port, \ + _MIPIA_TURN_AROUND_TIMEOUT, _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_DEVICE_RESET_TIMER, _MIPIB_DEVICE_RESET_TIMER) +#define _MIPIC_DEVICE_RESET_TIMER (dev_priv->mipi_mmio_base + 0xb81c) +#define MIPI_DEVICE_RESET_TIMER(port) _MIPI_PORT(port, \ + _MIPIA_DEVICE_RESET_TIMER, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_DPI_RESOLUTION, \ - _MIPIB_DPI_RESOLUTION) +#define _MIPIC_DPI_RESOLUTION (dev_priv->mipi_mmio_base + 0xb820) +#define MIPI_DPI_RESOLUTION(port) _MIPI_PORT(port, _MIPIA_DPI_RESOLUTION, \ + _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_DBI_FIFO_THROTTLE, _MIPIB_DBI_FIFO_THROTTLE) +#define _MIPIC_DBI_FIFO_THROTTLE (dev_priv->mipi_mmio_base + 0xb824) +#define MIPI_DBI_FIFO_THROTTLE(port) _MIPI_PORT(port, \ + _MIPIA_DBI_FIFO_THROTTLE, _MIPIC_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 (dev_priv->mipi_mmio_base + 0xb028) -#define _MIPIB_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828) -#define MIPI_HSYNC_PADDING_COUNT(tc) _TRANSCODER(tc, \ - _MIPIA_HSYNC_PADDING_COUNT, _MIPIB_HSYNC_PADDING_COUNT) +#define _MIPIC_HSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb828) +#define MIPI_HSYNC_PADDING_COUNT(port) _MIPI_PORT(port, \ + _MIPIA_HSYNC_PADDING_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HBP_COUNT, \ - _MIPIB_HBP_COUNT) +#define _MIPIC_HBP_COUNT (dev_priv->mipi_mmio_base + 0xb82c) +#define MIPI_HBP_COUNT(port) _MIPI_PORT(port, _MIPIA_HBP_COUNT, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HFP_COUNT, \ - _MIPIB_HFP_COUNT) +#define _MIPIC_HFP_COUNT (dev_priv->mipi_mmio_base + 0xb830) +#define MIPI_HFP_COUNT(port) _MIPI_PORT(port, _MIPIA_HFP_COUNT, \ + _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_HACTIVE_AREA_COUNT, _MIPIB_HACTIVE_AREA_COUNT) +#define _MIPIC_HACTIVE_AREA_COUNT (dev_priv->mipi_mmio_base + 0xb834) +#define MIPI_HACTIVE_AREA_COUNT(port) _MIPI_PORT(port, \ + _MIPIA_HACTIVE_AREA_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_VSYNC_PADDING_COUNT, _MIPIB_VSYNC_PADDING_COUNT) +#define _MIPIC_VSYNC_PADDING_COUNT (dev_priv->mipi_mmio_base + 0xb838) +#define MIPI_VSYNC_PADDING_COUNT(port) _MIPI_PORT(port, \ + _MIPIA_VSYNC_PADDING_COUNT, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_VBP_COUNT, \ - _MIPIB_VBP_COUNT) +#define _MIPIC_VBP_COUNT (dev_priv->mipi_mmio_base + 0xb83c) +#define MIPI_VBP_COUNT(port) _MIPI_PORT(port, _MIPIA_VBP_COUNT, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_VFP_COUNT, \ - _MIPIB_VFP_COUNT) +#define _MIPIC_VFP_COUNT (dev_priv->mipi_mmio_base + 0xb840) +#define MIPI_VFP_COUNT(port) _MIPI_PORT(port, _MIPIA_VFP_COUNT, \ + _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIB_HIGH_LOW_SWITCH_COUNT) +#define _MIPIC_HIGH_LOW_SWITCH_COUNT (dev_priv->mipi_mmio_base + 0xb844) +#define MIPI_HIGH_LOW_SWITCH_COUNT(port) _MIPI_PORT(port, \ + _MIPIA_HIGH_LOW_SWITCH_COUNT, _MIPIC_HIGH_LOW_SWITCH_COUNT) /* regs above are bits 15:0 */ #define _MIPIA_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb048) -#define _MIPIB_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848) -#define MIPI_DPI_CONTROL(tc) _TRANSCODER(tc, _MIPIA_DPI_CONTROL, \ - _MIPIB_DPI_CONTROL) +#define _MIPIC_DPI_CONTROL (dev_priv->mipi_mmio_base + 0xb848) +#define MIPI_DPI_CONTROL(port) _MIPI_PORT(port, _MIPIA_DPI_CONTROL, \ + _MIPIC_DPI_CONTROL) #define DPI_LP_MODE (1 << 6) #define BACKLIGHT_OFF (1 << 5) #define BACKLIGHT_ON (1 << 4) @@ -6842,30 +6845,30 @@ enum punit_power_well { #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(tc) _TRANSCODER(tc, _MIPIA_DPI_DATA, \ - _MIPIB_DPI_DATA) +#define _MIPIC_DPI_DATA (dev_priv->mipi_mmio_base + 0xb84c) +#define MIPI_DPI_DATA(port) _MIPI_PORT(port, _MIPIA_DPI_DATA, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INIT_COUNT, \ - _MIPIB_INIT_COUNT) +#define _MIPIC_INIT_COUNT (dev_priv->mipi_mmio_base + 0xb850) +#define MIPI_INIT_COUNT(port) _MIPI_PORT(port, _MIPIA_INIT_COUNT, \ + _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIB_MAX_RETURN_PKT_SIZE) +#define _MIPIC_MAX_RETURN_PKT_SIZE (dev_priv->mipi_mmio_base + 0xb854) +#define MIPI_MAX_RETURN_PKT_SIZE(port) _MIPI_PORT(port, \ + _MIPIA_MAX_RETURN_PKT_SIZE, _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_VIDEO_MODE_FORMAT, _MIPIB_VIDEO_MODE_FORMAT) +#define _MIPIC_VIDEO_MODE_FORMAT (dev_priv->mipi_mmio_base + 0xb858) +#define MIPI_VIDEO_MODE_FORMAT(port) _MIPI_PORT(port, \ + _MIPIA_VIDEO_MODE_FORMAT, _MIPIC_VIDEO_MODE_FORMAT) #define RANDOM_DPI_DISPLAY_RESOLUTION (1 << 4) #define DISABLE_VIDEO_BTA (1 << 3) #define IP_TG_CONFIG (1 << 2) @@ -6874,9 +6877,9 @@ enum punit_power_well { #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(tc) _TRANSCODER(tc, _MIPIA_EOT_DISABLE, \ - _MIPIB_EOT_DISABLE) +#define _MIPIC_EOT_DISABLE (dev_priv->mipi_mmio_base + 0xb85c) +#define MIPI_EOT_DISABLE(port) _MIPI_PORT(port, _MIPIA_EOT_DISABLE, \ + _MIPIC_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) @@ -6887,32 +6890,32 @@ enum punit_power_well { #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(tc) _TRANSCODER(tc, _MIPIA_LP_BYTECLK, \ - _MIPIB_LP_BYTECLK) +#define _MIPIC_LP_BYTECLK (dev_priv->mipi_mmio_base + 0xb860) +#define MIPI_LP_BYTECLK(port) _MIPI_PORT(port, _MIPIA_LP_BYTECLK, \ + _MIPIC_LP_BYTECLK) #define LP_BYTECLK_SHIFT 0 #define LP_BYTECLK_MASK (0xffff << 0) /* bits 31:0 */ #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(tc) _TRANSCODER(tc, _MIPIA_LP_GEN_DATA, \ - _MIPIB_LP_GEN_DATA) +#define _MIPIC_LP_GEN_DATA (dev_priv->mipi_mmio_base + 0xb864) +#define MIPI_LP_GEN_DATA(port) _MIPI_PORT(port, _MIPIA_LP_GEN_DATA, \ + _MIPIC_LP_GEN_DATA) /* bits 31: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(tc) _TRANSCODER(tc, _MIPIA_HS_GEN_DATA, \ - _MIPIB_HS_GEN_DATA) +#define _MIPIC_HS_GEN_DATA (dev_priv->mipi_mmio_base + 0xb868) +#define MIPI_HS_GEN_DATA(port) _MIPI_PORT(port, _MIPIA_HS_GEN_DATA, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_LP_GEN_CTRL, \ - _MIPIB_LP_GEN_CTRL) +#define _MIPIC_LP_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb86c) +#define MIPI_LP_GEN_CTRL(port) _MIPI_PORT(port, _MIPIA_LP_GEN_CTRL, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_HS_GEN_CTRL, \ - _MIPIB_HS_GEN_CTRL) +#define _MIPIC_HS_GEN_CTRL (dev_priv->mipi_mmio_base + 0xb870) +#define MIPI_HS_GEN_CTRL(port) _MIPI_PORT(port, _MIPIA_HS_GEN_CTRL, \ + _MIPIC_HS_GEN_CTRL) #define LONG_PACKET_WORD_COUNT_SHIFT 8 #define LONG_PACKET_WORD_COUNT_MASK (0xffff << 8) #define SHORT_PACKET_PARAM_SHIFT 8 @@ -6924,9 +6927,9 @@ enum punit_power_well { /* data type values, see include/video/mipi_display.h */ #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(tc) _TRANSCODER(tc, _MIPIA_GEN_FIFO_STAT, \ - _MIPIB_GEN_FIFO_STAT) +#define _MIPIC_GEN_FIFO_STAT (dev_priv->mipi_mmio_base + 0xb874) +#define MIPI_GEN_FIFO_STAT(port) _MIPI_PORT(port, _MIPIA_GEN_FIFO_STAT, \ + _MIPIC_GEN_FIFO_STAT) #define DPI_FIFO_EMPTY (1 << 28) #define DBI_FIFO_EMPTY (1 << 27) #define LP_CTRL_FIFO_EMPTY (1 << 26) @@ -6943,17 +6946,17 @@ enum punit_power_well { #define HS_DATA_FIFO_FULL (1 << 0) #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(tc) _TRANSCODER(tc, \ - _MIPIA_HS_LS_DBI_ENABLE, _MIPIB_HS_LS_DBI_ENABLE) +#define _MIPIC_HS_LS_DBI_ENABLE (dev_priv->mipi_mmio_base + 0xb878) +#define MIPI_HS_LP_DBI_ENABLE(port) _MIPI_PORT(port, \ + _MIPIA_HS_LS_DBI_ENABLE, _MIPIC_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 (dev_priv->mipi_mmio_base + 0xb080) -#define _MIPIB_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880) -#define MIPI_DPHY_PARAM(tc) _TRANSCODER(tc, _MIPIA_DPHY_PARAM, \ - _MIPIB_DPHY_PARAM) +#define _MIPIC_DPHY_PARAM (dev_priv->mipi_mmio_base + 0xb880) +#define MIPI_DPHY_PARAM(port) _MIPI_PORT(port, _MIPIA_DPHY_PARAM, \ + _MIPIC_DPHY_PARAM) #define EXIT_ZERO_COUNT_SHIFT 24 #define EXIT_ZERO_COUNT_MASK (0x3f << 24) #define TRAIL_COUNT_SHIFT 16 @@ -6965,36 +6968,36 @@ enum punit_power_well { /* bits 31: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(tc) _TRANSCODER(tc, _MIPIA_DBI_BW_CTRL, \ - _MIPIB_DBI_BW_CTRL) +#define _MIPIC_DBI_BW_CTRL (dev_priv->mipi_mmio_base + 0xb884) +#define MIPI_DBI_BW_CTRL(port) _MIPI_PORT(port, _MIPIA_DBI_BW_CTRL, \ + _MIPIC_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 \ +#define _MIPIC_CLK_LANE_SWITCH_TIME_CNT (dev_priv->mipi_mmio_base \ + 0xb888) -#define MIPI_CLK_LANE_SWITCH_TIME_CNT(tc) _TRANSCODER(tc, \ - _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIB_CLK_LANE_SWITCH_TIME_CNT) +#define MIPI_CLK_LANE_SWITCH_TIME_CNT(port) _MIPI_PORT(port, \ + _MIPIA_CLK_LANE_SWITCH_TIME_CNT, _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_STOP_STATE_STALL, _MIPIB_STOP_STATE_STALL) +#define _MIPIC_STOP_STATE_STALL (dev_priv->mipi_mmio_base + 0xb88c) +#define MIPI_STOP_STATE_STALL(port) _MIPI_PORT(port, \ + _MIPIA_STOP_STATE_STALL, _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_INTR_STAT_REG_1, _MIPIB_INTR_STAT_REG_1) +#define _MIPIC_INTR_STAT_REG_1 (dev_priv->mipi_mmio_base + 0xb890) +#define MIPI_INTR_STAT_REG_1(port) _MIPI_PORT(port, \ + _MIPIA_INTR_STAT_REG_1, _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_INTR_EN_REG_1, \ - _MIPIB_INTR_EN_REG_1) +#define _MIPIC_INTR_EN_REG_1 (dev_priv->mipi_mmio_base + 0xb894) +#define MIPI_INTR_EN_REG_1(port) _MIPI_PORT(port, _MIPIA_INTR_EN_REG_1, \ + _MIPIC_INTR_EN_REG_1) #define RX_CONTENTION_DETECTED (1 << 0) /* XXX: only pipe A ?!? */ @@ -7013,9 +7016,9 @@ enum punit_power_well { /* MIPI adapter registers */ #define _MIPIA_CTRL (dev_priv->mipi_mmio_base + 0xb104) -#define _MIPIB_CTRL (dev_priv->mipi_mmio_base + 0xb904) -#define MIPI_CTRL(tc) _TRANSCODER(tc, _MIPIA_CTRL, \ - _MIPIB_CTRL) +#define _MIPIC_CTRL (dev_priv->mipi_mmio_base + 0xb904) +#define MIPI_CTRL(port) _MIPI_PORT(port, _MIPIA_CTRL, \ + _MIPIC_CTRL) #define ESCAPE_CLOCK_DIVIDER_SHIFT 5 /* A only */ #define ESCAPE_CLOCK_DIVIDER_MASK (3 << 5) #define ESCAPE_CLOCK_DIVIDER_1 (0 << 5) @@ -7028,24 +7031,24 @@ enum punit_power_well { #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(tc) _TRANSCODER(tc, _MIPIA_DATA_ADDRESS, \ - _MIPIB_DATA_ADDRESS) +#define _MIPIC_DATA_ADDRESS (dev_priv->mipi_mmio_base + 0xb908) +#define MIPI_DATA_ADDRESS(port) _MIPI_PORT(port, _MIPIA_DATA_ADDRESS, \ + _MIPIC_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(tc) _TRANSCODER(tc, _MIPIA_DATA_LENGTH, \ - _MIPIB_DATA_LENGTH) +#define _MIPIC_DATA_LENGTH (dev_priv->mipi_mmio_base + 0xb90c) +#define MIPI_DATA_LENGTH(port) _MIPI_PORT(port, _MIPIA_DATA_LENGTH, \ + _MIPIC_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(tc) _TRANSCODER(tc, \ - _MIPIA_COMMAND_ADDRESS, _MIPIB_COMMAND_ADDRESS) +#define _MIPIC_COMMAND_ADDRESS (dev_priv->mipi_mmio_base + 0xb910) +#define MIPI_COMMAND_ADDRESS(port) _MIPI_PORT(port, \ + _MIPIA_COMMAND_ADDRESS, _MIPIC_COMMAND_ADDRESS) #define COMMAND_MEM_ADDRESS_SHIFT 5 #define COMMAND_MEM_ADDRESS_MASK (0x7ffffff << 5) #define AUTO_PWG_ENABLE (1 << 2) @@ -7053,22 +7056,22 @@ enum punit_power_well { #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(tc) _TRANSCODER(tc, _MIPIA_COMMAND_LENGTH, \ - _MIPIB_COMMAND_LENGTH) +#define _MIPIC_COMMAND_LENGTH (dev_priv->mipi_mmio_base + 0xb914) +#define MIPI_COMMAND_LENGTH(port) _MIPI_PORT(port, _MIPIA_COMMAND_LENGTH, \ + _MIPIC_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) -#define MIPI_READ_DATA_RETURN(tc, n) \ - (_TRANSCODER(tc, _MIPIA_READ_DATA_RETURN0, _MIPIB_READ_DATA_RETURN0) \ +#define _MIPIC_READ_DATA_RETURN0 (dev_priv->mipi_mmio_base + 0xb918) +#define MIPI_READ_DATA_RETURN(port, n) \ + (_MIPI_PORT(port, _MIPIA_READ_DATA_RETURN0, _MIPIC_READ_DATA_RETURN0) \ + 4 * (n)) /* n: 0...7 */ #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(tc) _TRANSCODER(tc, \ - _MIPIA_READ_DATA_VALID, _MIPIB_READ_DATA_VALID) +#define _MIPIC_READ_DATA_VALID (dev_priv->mipi_mmio_base + 0xb938) +#define MIPI_READ_DATA_VALID(port) _MIPI_PORT(port, \ + _MIPIA_READ_DATA_VALID, _MIPIC_READ_DATA_VALID) #define READ_DATA_VALID(n) (1 << (n)) /* For UMS only (deprecated): */ diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 0b184079de14..35842a6687d8 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -106,7 +106,7 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); - int pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 val; DRM_DEBUG_KMS("\n"); @@ -120,17 +120,17 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder) /* bandgap reset is needed after everytime we do power gate */ band_gap_reset(dev_priv); - I915_WRITE(MIPI_DEVICE_READY(pipe), ULPS_STATE_ENTER); + I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_ENTER); usleep_range(2500, 3000); - val = I915_READ(MIPI_PORT_CTRL(pipe)); - I915_WRITE(MIPI_PORT_CTRL(pipe), val | LP_OUTPUT_HOLD); + val = I915_READ(MIPI_PORT_CTRL(port)); + I915_WRITE(MIPI_PORT_CTRL(port), val | LP_OUTPUT_HOLD); usleep_range(1000, 1500); - I915_WRITE(MIPI_DEVICE_READY(pipe), ULPS_STATE_EXIT); + I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_EXIT); usleep_range(2500, 3000); - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY); + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY); usleep_range(2500, 3000); } @@ -140,13 +140,13 @@ static void intel_dsi_enable(struct intel_encoder *encoder) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); - int pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 temp; DRM_DEBUG_KMS("\n"); if (is_cmd_mode(intel_dsi)) - I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(pipe), 8 * 4); + I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4); else { msleep(20); /* XXX */ dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN); @@ -158,10 +158,10 @@ static void intel_dsi_enable(struct intel_encoder *encoder) wait_for_dsi_fifo_empty(intel_dsi); /* assert ip_tg_enable signal */ - temp = I915_READ(MIPI_PORT_CTRL(pipe)) & ~LANE_CONFIGURATION_MASK; + temp = I915_READ(MIPI_PORT_CTRL(port)) & ~LANE_CONFIGURATION_MASK; temp = temp | intel_dsi->port_bits; - I915_WRITE(MIPI_PORT_CTRL(pipe), temp | DPI_ENABLE); - POSTING_READ(MIPI_PORT_CTRL(pipe)); + I915_WRITE(MIPI_PORT_CTRL(port), temp | DPI_ENABLE); + POSTING_READ(MIPI_PORT_CTRL(port)); } } @@ -237,7 +237,7 @@ static void intel_dsi_disable(struct intel_encoder *encoder) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); - int pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 temp; DRM_DEBUG_KMS("\n"); @@ -246,29 +246,29 @@ static void intel_dsi_disable(struct intel_encoder *encoder) wait_for_dsi_fifo_empty(intel_dsi); /* de-assert ip_tg_enable signal */ - temp = I915_READ(MIPI_PORT_CTRL(pipe)); - I915_WRITE(MIPI_PORT_CTRL(pipe), temp & ~DPI_ENABLE); - POSTING_READ(MIPI_PORT_CTRL(pipe)); + temp = I915_READ(MIPI_PORT_CTRL(port)); + I915_WRITE(MIPI_PORT_CTRL(port), temp & ~DPI_ENABLE); + POSTING_READ(MIPI_PORT_CTRL(port)); msleep(2); } /* Panel commands can be sent when clock is in LP11 */ - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x0); + I915_WRITE(MIPI_DEVICE_READY(port), 0x0); - temp = I915_READ(MIPI_CTRL(pipe)); + temp = I915_READ(MIPI_CTRL(port)); temp &= ~ESCAPE_CLOCK_DIVIDER_MASK; - I915_WRITE(MIPI_CTRL(pipe), temp | + I915_WRITE(MIPI_CTRL(port), temp | intel_dsi->escape_clk_div << ESCAPE_CLOCK_DIVIDER_SHIFT); - I915_WRITE(MIPI_EOT_DISABLE(pipe), CLOCKSTOP); + I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP); - temp = I915_READ(MIPI_DSI_FUNC_PRG(pipe)); + temp = I915_READ(MIPI_DSI_FUNC_PRG(port)); temp &= ~VID_MODE_FORMAT_MASK; - I915_WRITE(MIPI_DSI_FUNC_PRG(pipe), temp); + I915_WRITE(MIPI_DSI_FUNC_PRG(port), temp); - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x1); + I915_WRITE(MIPI_DEVICE_READY(port), 0x1); /* if disable packets are sent before sending shutdown packet then in * some next enable sequence send turn on packet error is observed */ @@ -282,29 +282,29 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); - int pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 val; DRM_DEBUG_KMS("\n"); - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_ENTER); + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_ENTER); usleep_range(2000, 2500); - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_EXIT); + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_EXIT); usleep_range(2000, 2500); - I915_WRITE(MIPI_DEVICE_READY(pipe), DEVICE_READY | ULPS_STATE_ENTER); + I915_WRITE(MIPI_DEVICE_READY(port), DEVICE_READY | ULPS_STATE_ENTER); usleep_range(2000, 2500); - if (wait_for(((I915_READ(MIPI_PORT_CTRL(pipe)) & AFE_LATCHOUT) + if (wait_for(((I915_READ(MIPI_PORT_CTRL(port)) & AFE_LATCHOUT) == 0x00000), 30)) DRM_ERROR("DSI LP not going Low\n"); - val = I915_READ(MIPI_PORT_CTRL(pipe)); - I915_WRITE(MIPI_PORT_CTRL(pipe), val & ~LP_OUTPUT_HOLD); + val = I915_READ(MIPI_PORT_CTRL(port)); + I915_WRITE(MIPI_PORT_CTRL(port), val & ~LP_OUTPUT_HOLD); usleep_range(1000, 1500); - I915_WRITE(MIPI_DEVICE_READY(pipe), 0x00); + I915_WRITE(MIPI_DEVICE_READY(port), 0x00); usleep_range(2000, 2500); vlv_disable_dsi_pll(encoder); @@ -338,8 +338,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, { struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; enum intel_display_power_domain power_domain; - u32 port, func; - enum pipe p; + u32 port_ctl, func; + enum port port; DRM_DEBUG_KMS("\n"); @@ -348,13 +348,13 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, return false; /* XXX: this only works for one DSI output */ - for (p = PIPE_A; p <= PIPE_B; p++) { - port = I915_READ(MIPI_PORT_CTRL(p)); - func = I915_READ(MIPI_DSI_FUNC_PRG(p)); + for_each_dsi_port(port, (1 << PORT_A) | (1 << PORT_C)) { + port_ctl = I915_READ(MIPI_PORT_CTRL(port)); + func = I915_READ(MIPI_DSI_FUNC_PRG(port)); - if ((port & DPI_ENABLE) || (func & CMD_MODE_DATA_WIDTH_MASK)) { - if (I915_READ(MIPI_DEVICE_READY(p)) & DEVICE_READY) { - *pipe = p; + if ((port_ctl & DPI_ENABLE) || (func & CMD_MODE_DATA_WIDTH_MASK)) { + if (I915_READ(MIPI_DEVICE_READY(port)) & DEVICE_READY) { + *pipe = port == PORT_A ? PIPE_A : PIPE_C; return true; } } @@ -437,7 +437,7 @@ static void set_dsi_timings(struct drm_encoder *encoder, struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); - int pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); unsigned int bpp = intel_crtc->config.pipe_bpp; unsigned int lane_count = intel_dsi->lane_count; @@ -460,18 +460,18 @@ static void set_dsi_timings(struct drm_encoder *encoder, intel_dsi->burst_mode_ratio); hbp = txbyteclkhs(hbp, bpp, lane_count, intel_dsi->burst_mode_ratio); - I915_WRITE(MIPI_HACTIVE_AREA_COUNT(pipe), hactive); - I915_WRITE(MIPI_HFP_COUNT(pipe), hfp); + I915_WRITE(MIPI_HACTIVE_AREA_COUNT(port), hactive); + I915_WRITE(MIPI_HFP_COUNT(port), hfp); /* meaningful for video mode non-burst sync pulse mode only, can be zero * for non-burst sync events and burst modes */ - I915_WRITE(MIPI_HSYNC_PADDING_COUNT(pipe), hsync); - I915_WRITE(MIPI_HBP_COUNT(pipe), hbp); + I915_WRITE(MIPI_HSYNC_PADDING_COUNT(port), hsync); + I915_WRITE(MIPI_HBP_COUNT(port), hbp); /* vertical values are in terms of lines */ - I915_WRITE(MIPI_VFP_COUNT(pipe), vfp); - I915_WRITE(MIPI_VSYNC_PADDING_COUNT(pipe), vsync); - I915_WRITE(MIPI_VBP_COUNT(pipe), vbp); + I915_WRITE(MIPI_VFP_COUNT(port), vfp); + I915_WRITE(MIPI_VSYNC_PADDING_COUNT(port), vsync); + I915_WRITE(MIPI_VBP_COUNT(port), vbp); } static void intel_dsi_prepare(struct intel_encoder *intel_encoder) @@ -483,30 +483,30 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); struct drm_display_mode *adjusted_mode = &intel_crtc->config.adjusted_mode; - int pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); unsigned int bpp = intel_crtc->config.pipe_bpp; u32 val, tmp; - DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe)); + DRM_DEBUG_KMS("pipe %c\n", pipe_name(intel_crtc->pipe)); /* escape clock divider, 20MHz, shared for A and C. device ready must be * off when doing this! txclkesc? */ - tmp = I915_READ(MIPI_CTRL(0)); + tmp = I915_READ(MIPI_CTRL(PORT_A)); tmp &= ~ESCAPE_CLOCK_DIVIDER_MASK; - I915_WRITE(MIPI_CTRL(0), tmp | ESCAPE_CLOCK_DIVIDER_1); + I915_WRITE(MIPI_CTRL(PORT_A), tmp | ESCAPE_CLOCK_DIVIDER_1); /* read request priority is per pipe */ - tmp = I915_READ(MIPI_CTRL(pipe)); + tmp = I915_READ(MIPI_CTRL(port)); tmp &= ~READ_REQUEST_PRIORITY_MASK; - I915_WRITE(MIPI_CTRL(pipe), tmp | READ_REQUEST_PRIORITY_HIGH); + I915_WRITE(MIPI_CTRL(port), tmp | READ_REQUEST_PRIORITY_HIGH); /* XXX: why here, why like this? handling in irq handler?! */ - I915_WRITE(MIPI_INTR_STAT(pipe), 0xffffffff); - I915_WRITE(MIPI_INTR_EN(pipe), 0xffffffff); + I915_WRITE(MIPI_INTR_STAT(port), 0xffffffff); + I915_WRITE(MIPI_INTR_EN(port), 0xffffffff); - I915_WRITE(MIPI_DPHY_PARAM(pipe), intel_dsi->dphy_reg); + I915_WRITE(MIPI_DPHY_PARAM(port), intel_dsi->dphy_reg); - I915_WRITE(MIPI_DPI_RESOLUTION(pipe), + I915_WRITE(MIPI_DPI_RESOLUTION(port), adjusted_mode->vdisplay << VERTICAL_ADDRESS_SHIFT | adjusted_mode->hdisplay << HORIZONTAL_ADDRESS_SHIFT); @@ -522,7 +522,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) /* XXX: cross-check bpp vs. pixel format? */ val |= intel_dsi->pixel_format; } - I915_WRITE(MIPI_DSI_FUNC_PRG(pipe), val); + I915_WRITE(MIPI_DSI_FUNC_PRG(port), val); /* timeouts for recovery. one frame IIUC. if counter expires, EOT and * stop state. */ @@ -543,25 +543,25 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) if (is_vid_mode(intel_dsi) && intel_dsi->video_mode_format == VIDEO_MODE_BURST) { - I915_WRITE(MIPI_HS_TX_TIMEOUT(pipe), + I915_WRITE(MIPI_HS_TX_TIMEOUT(port), txbyteclkhs(adjusted_mode->htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1); } else { - I915_WRITE(MIPI_HS_TX_TIMEOUT(pipe), + I915_WRITE(MIPI_HS_TX_TIMEOUT(port), txbyteclkhs(adjusted_mode->vtotal * adjusted_mode->htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1); } - I915_WRITE(MIPI_LP_RX_TIMEOUT(pipe), intel_dsi->lp_rx_timeout); - I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(pipe), intel_dsi->turn_arnd_val); - I915_WRITE(MIPI_DEVICE_RESET_TIMER(pipe), intel_dsi->rst_timer_val); + I915_WRITE(MIPI_LP_RX_TIMEOUT(port), intel_dsi->lp_rx_timeout); + I915_WRITE(MIPI_TURN_AROUND_TIMEOUT(port), intel_dsi->turn_arnd_val); + I915_WRITE(MIPI_DEVICE_RESET_TIMER(port), intel_dsi->rst_timer_val); /* dphy stuff */ /* in terms of low power clock */ - I915_WRITE(MIPI_INIT_COUNT(pipe), txclkesc(intel_dsi->escape_clk_div, 100)); + I915_WRITE(MIPI_INIT_COUNT(port), txclkesc(intel_dsi->escape_clk_div, 100)); val = 0; if (intel_dsi->eotp_pkt == 0) @@ -571,17 +571,17 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) val |= CLOCKSTOP; /* recovery disables */ - I915_WRITE(MIPI_EOT_DISABLE(pipe), val); + I915_WRITE(MIPI_EOT_DISABLE(port), val); /* in terms of low power clock */ - I915_WRITE(MIPI_INIT_COUNT(pipe), intel_dsi->init_count); + I915_WRITE(MIPI_INIT_COUNT(port), intel_dsi->init_count); /* in terms of txbyteclkhs. actual high to low switch + * MIPI_STOP_STATE_STALL * MIPI_LP_BYTECLK. * * XXX: write MIPI_STOP_STATE_STALL? */ - I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe), + I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(port), intel_dsi->hs_to_lp_count); /* XXX: low power clock equivalence in terms of byte clock. the number @@ -589,16 +589,16 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) * and txclkesc. txclkesc time / txbyteclk time * (105 + * MIPI_STOP_STATE_STALL) / 105.??? */ - I915_WRITE(MIPI_LP_BYTECLK(pipe), intel_dsi->lp_byte_clk); + I915_WRITE(MIPI_LP_BYTECLK(port), intel_dsi->lp_byte_clk); /* the bw essential for transmitting 16 long packets containing 252 * bytes meant for dcs write memory command is programmed in this * register in terms of byte clocks. based on dsi transfer rate and the * number of lanes configured the time taken to transmit 16 long packets * in a dsi stream varies. */ - I915_WRITE(MIPI_DBI_BW_CTRL(pipe), intel_dsi->bw_timer); + I915_WRITE(MIPI_DBI_BW_CTRL(port), intel_dsi->bw_timer); - I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(pipe), + I915_WRITE(MIPI_CLK_LANE_SWITCH_TIME_CNT(port), intel_dsi->clk_lp_to_hs_count << LP_HS_SSW_CNT_SHIFT | intel_dsi->clk_hs_to_lp_count << HS_LP_PWR_SW_CNT_SHIFT); @@ -606,7 +606,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) /* Some panels might have resolution which is not a multiple of * 64 like 1366 x 768. Enable RANDOM resolution support for such * panels by default */ - I915_WRITE(MIPI_VIDEO_MODE_FORMAT(pipe), + I915_WRITE(MIPI_VIDEO_MODE_FORMAT(port), intel_dsi->video_frmt_cfg_bits | intel_dsi->video_mode_format | IP_TG_CONFIG | @@ -748,6 +748,12 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; intel_connector->unregister = intel_connector_unregister; + /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */ + if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) + intel_encoder->crtc_mask = (1 << PIPE_A); + else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) + intel_encoder->crtc_mask = (1 << PIPE_B); + for (i = 0; i < ARRAY_SIZE(intel_dsi_devices); i++) { dsi = &intel_dsi_devices[i]; intel_dsi->dev = *dsi; @@ -762,8 +768,6 @@ void intel_dsi_init(struct drm_device *dev) } intel_encoder->type = INTEL_OUTPUT_DSI; - intel_encoder->crtc_mask = (1 << 0); /* XXX */ - intel_encoder->cloneable = 0; drm_connector_init(dev, connector, &intel_dsi_connector_funcs, DRM_MODE_CONNECTOR_DSI); diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h index 657eb5c1b9d8..97a6f621774f 100644 --- a/drivers/gpu/drm/i915/intel_dsi.h +++ b/drivers/gpu/drm/i915/intel_dsi.h @@ -127,6 +127,22 @@ struct intel_dsi { u16 panel_pwr_cycle_delay; }; +/* XXX: Transitional before dual port configuration */ +static inline enum port intel_dsi_pipe_to_port(enum pipe pipe) +{ + if (pipe == PIPE_A) + return PORT_A; + else if (pipe == PIPE_B) + return PORT_C; + + WARN(1, "DSI on pipe %c, assuming port C\n", pipe_name(pipe)); + return PORT_C; +} + +#define for_each_dsi_port(__port, __ports_mask) \ + for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ + if ((__ports_mask) & (1 << (__port))) + static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder) { return container_of(encoder, struct intel_dsi, base.base); diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.c b/drivers/gpu/drm/i915/intel_dsi_cmd.c index f4767fd2ebeb..004fa918ca03 100644 --- a/drivers/gpu/drm/i915/intel_dsi_cmd.c +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.c @@ -54,15 +54,15 @@ static void print_stat(struct intel_dsi *intel_dsi) struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 val; - val = I915_READ(MIPI_INTR_STAT(pipe)); + val = I915_READ(MIPI_INTR_STAT(port)); #define STAT_BIT(val, bit) (val) & (bit) ? " " #bit : "" - DRM_DEBUG_KMS("MIPI_INTR_STAT(%d) = %08x" + DRM_DEBUG_KMS("MIPI_INTR_STAT(%c) = %08x" "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" - "\n", pipe, val, + "\n", port_name(port), val, STAT_BIT(val, TEARING_EFFECT), STAT_BIT(val, SPL_PKT_SENT_INTERRUPT), STAT_BIT(val, GEN_READ_DATA_AVAIL), @@ -110,16 +110,16 @@ void dsi_hs_mode_enable(struct intel_dsi *intel_dsi, bool enable) struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 temp; u32 mask = DBI_FIFO_EMPTY; - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 50)) + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 50)) DRM_ERROR("Timeout waiting for DBI FIFO empty\n"); - temp = I915_READ(MIPI_HS_LP_DBI_ENABLE(pipe)); + temp = I915_READ(MIPI_HS_LP_DBI_ENABLE(port)); temp &= DBI_HS_LP_MODE_MASK; - I915_WRITE(MIPI_HS_LP_DBI_ENABLE(pipe), enable ? DBI_HS_MODE : DBI_LP_MODE); + I915_WRITE(MIPI_HS_LP_DBI_ENABLE(port), enable ? DBI_HS_MODE : DBI_LP_MODE); intel_dsi->hs = enable; } @@ -131,7 +131,7 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 ctrl_reg; u32 ctrl; u32 mask; @@ -140,14 +140,14 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, channel, data_type, data); if (intel_dsi->hs) { - ctrl_reg = MIPI_HS_GEN_CTRL(pipe); + ctrl_reg = MIPI_HS_GEN_CTRL(port); mask = HS_CTRL_FIFO_FULL; } else { - ctrl_reg = MIPI_LP_GEN_CTRL(pipe); + ctrl_reg = MIPI_LP_GEN_CTRL(port); mask = LP_CTRL_FIFO_FULL; } - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == 0, 50)) { + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == 0, 50)) { DRM_ERROR("Timeout waiting for HS/LP CTRL FIFO !full\n"); print_stat(intel_dsi); } @@ -173,7 +173,7 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 data_reg; int i, j, n; u32 mask; @@ -182,14 +182,14 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, channel, data_type, len); if (intel_dsi->hs) { - data_reg = MIPI_HS_GEN_DATA(pipe); + data_reg = MIPI_HS_GEN_DATA(port); mask = HS_DATA_FIFO_FULL; } else { - data_reg = MIPI_LP_GEN_DATA(pipe); + data_reg = MIPI_LP_GEN_DATA(port); mask = LP_DATA_FIFO_FULL; } - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == 0, 50)) + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == 0, 50)) DRM_ERROR("Timeout waiting for HS/LP DATA FIFO !full\n"); for (i = 0; i < len; i += n) { @@ -292,14 +292,14 @@ static int dsi_read_data_return(struct intel_dsi *intel_dsi, struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); int i, len = 0; u32 data_reg, val; if (intel_dsi->hs) { - data_reg = MIPI_HS_GEN_DATA(pipe); + data_reg = MIPI_HS_GEN_DATA(port); } else { - data_reg = MIPI_LP_GEN_DATA(pipe); + data_reg = MIPI_LP_GEN_DATA(port); } while (len < buflen) { @@ -318,7 +318,7 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 mask; int ret; @@ -327,14 +327,14 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, * longer than MIPI_MAX_RETURN_PKT_SIZE */ - I915_WRITE(MIPI_INTR_STAT(pipe), GEN_READ_DATA_AVAIL); + I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL); ret = dsi_vc_dcs_send_read_request(intel_dsi, channel, dcs_cmd); if (ret) return ret; mask = GEN_READ_DATA_AVAIL; - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 50)) + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 50)) DRM_ERROR("Timeout waiting for read data.\n"); ret = dsi_read_data_return(intel_dsi, buf, buflen); @@ -354,7 +354,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 mask; int ret; @@ -363,7 +363,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, * longer than MIPI_MAX_RETURN_PKT_SIZE */ - I915_WRITE(MIPI_INTR_STAT(pipe), GEN_READ_DATA_AVAIL); + I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL); ret = dsi_vc_generic_send_read_request(intel_dsi, channel, reqdata, reqlen); @@ -371,7 +371,7 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, return ret; mask = GEN_READ_DATA_AVAIL; - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 50)) + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 50)) DRM_ERROR("Timeout waiting for read data.\n"); ret = dsi_read_data_return(intel_dsi, buf, buflen); @@ -395,7 +395,7 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs) struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 mask; /* XXX: pipe, hs */ @@ -405,16 +405,16 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs) cmd |= DPI_LP_MODE; /* clear bit */ - I915_WRITE(MIPI_INTR_STAT(pipe), SPL_PKT_SENT_INTERRUPT); + I915_WRITE(MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT); /* XXX: old code skips write if control unchanged */ - if (cmd == I915_READ(MIPI_DPI_CONTROL(pipe))) + if (cmd == I915_READ(MIPI_DPI_CONTROL(port))) DRM_ERROR("Same special packet %02x twice in a row.\n", cmd); - I915_WRITE(MIPI_DPI_CONTROL(pipe), cmd); + I915_WRITE(MIPI_DPI_CONTROL(port), cmd); mask = SPL_PKT_SENT_INTERRUPT; - if (wait_for((I915_READ(MIPI_INTR_STAT(pipe)) & mask) == mask, 100)) + if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 100)) DRM_ERROR("Video mode command 0x%08x send failed.\n", cmd); return 0; @@ -426,12 +426,12 @@ void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi) struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - enum pipe pipe = intel_crtc->pipe; + enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe); u32 mask; mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY | LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY; - if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 100)) + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100)) DRM_ERROR("DPI FIFOs are not empty\n"); }
MIPI DSI works on ports A and C, which map to pipes A and B, respectively. Things are going to get more complicated with the introduction of dual link DSI support, so clean up the register defines and code to match reality. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_reg.h | 303 ++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dsi.c | 148 ++++++++--------- drivers/gpu/drm/i915/intel_dsi.h | 16 ++ drivers/gpu/drm/i915/intel_dsi_cmd.c | 64 ++++---- 4 files changed, 277 insertions(+), 254 deletions(-)