On Tue, 01 Sep 2015, Uma Shankar <uma.shankar@xxxxxxxxx> wrote: > From: Shashank Sharma <shashank.sharma@xxxxxxxxx> > > Pick appropriate port control register (BXT or VLV), based on device. > Get the current hw state wrt Mipi port. > > v2: Rebased on latest drm nightly branch. > > v3: Removed the GET_DSI_PORT_CTRL Macro for consistency with earlier > implementations as per Jani's suggestion. > > Signed-off-by: Shashank Sharma <shashank.sharma@xxxxxxxxx> > Signed-off-by: Uma Shankar <uma.shankar@xxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dsi.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 110a895..001569b 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -648,7 +648,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, > struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); > struct drm_device *dev = encoder->base.dev; > enum intel_display_power_domain power_domain; > - u32 dpi_enabled, func; > + u32 dpi_enabled, func, ctrl_reg; > enum port port; > > DRM_DEBUG_KMS("\n"); > @@ -660,8 +660,9 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, > /* XXX: this only works for one DSI output */ > for_each_dsi_port(port, intel_dsi->ports) { > func = I915_READ(MIPI_DSI_FUNC_PRG(port)); > - dpi_enabled = I915_READ(MIPI_PORT_CTRL(port)) & > - DPI_ENABLE; > + ctrl_reg = IS_BROXTON(dev) ? BXT_MIPI_PORT_CTRL(port) : > + MIPI_PORT_CTRL(port); > + dpi_enabled = I915_READ(ctrl_reg) & DPI_ENABLE; > > /* Due to some hardware limitations on BYT, MIPI Port C DPI > * Enable bit does not get set. To check whether DSI Port C > -- > 1.7.9.5 > -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx