| Message ID | 20181011100457.8776-10-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Remove low hanging crtc->config fruit, part 2. | expand |
On Thu, Oct 11, 2018 at 12:04:56PM +0200, Maarten Lankhorst wrote: > We have to look at crtc_state, so pass that instead. > Also cleanup the use of dev vs dev_priv, we really want to pass along > dev_priv. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index ad1694c4d947..ad2c207d18bb 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4633,9 +4633,8 @@ static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *c > I915_READ(VSYNCSHIFT(cpu_transcoder))); > } > > -static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable) > +static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool enable) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > uint32_t temp; > > temp = I915_READ(SOUTH_CHICKEN1); > @@ -4654,22 +4653,23 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable) > POSTING_READ(SOUTH_CHICKEN1); > } > > -static void ivybridge_update_fdi_bc_bifurcation(struct intel_crtc *intel_crtc) > +static void ivybridge_update_fdi_bc_bifurcation(const struct intel_crtc_state *crtc_state) > { > - struct drm_device *dev = intel_crtc->base.dev; > + struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > - switch (intel_crtc->pipe) { > + switch (crtc->pipe) { > case PIPE_A: > break; > case PIPE_B: > - if (intel_crtc->config->fdi_lanes > 2) > - cpt_set_fdi_bc_bifurcation(dev, false); > + if (crtc_state->fdi_lanes > 2) > + cpt_set_fdi_bc_bifurcation(dev_priv, false); > else > - cpt_set_fdi_bc_bifurcation(dev, true); > + cpt_set_fdi_bc_bifurcation(dev_priv, true); > > break; > case PIPE_C: > - cpt_set_fdi_bc_bifurcation(dev, true); > + cpt_set_fdi_bc_bifurcation(dev_priv, true); > > break; > default: > @@ -4726,7 +4726,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state, > assert_pch_transcoder_disabled(dev_priv, pipe); > > if (IS_IVYBRIDGE(dev_priv)) > - ivybridge_update_fdi_bc_bifurcation(crtc); > + ivybridge_update_fdi_bc_bifurcation(crtc_state); > > /* Write the TU size bits before fdi link training, so that error > * detection works. */ > -- > 2.19.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ad1694c4d947..ad2c207d18bb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4633,9 +4633,8 @@ static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *c I915_READ(VSYNCSHIFT(cpu_transcoder))); } -static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable) +static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool enable) { - struct drm_i915_private *dev_priv = to_i915(dev); uint32_t temp; temp = I915_READ(SOUTH_CHICKEN1); @@ -4654,22 +4653,23 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable) POSTING_READ(SOUTH_CHICKEN1); } -static void ivybridge_update_fdi_bc_bifurcation(struct intel_crtc *intel_crtc) +static void ivybridge_update_fdi_bc_bifurcation(const struct intel_crtc_state *crtc_state) { - struct drm_device *dev = intel_crtc->base.dev; + struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); - switch (intel_crtc->pipe) { + switch (crtc->pipe) { case PIPE_A: break; case PIPE_B: - if (intel_crtc->config->fdi_lanes > 2) - cpt_set_fdi_bc_bifurcation(dev, false); + if (crtc_state->fdi_lanes > 2) + cpt_set_fdi_bc_bifurcation(dev_priv, false); else - cpt_set_fdi_bc_bifurcation(dev, true); + cpt_set_fdi_bc_bifurcation(dev_priv, true); break; case PIPE_C: - cpt_set_fdi_bc_bifurcation(dev, true); + cpt_set_fdi_bc_bifurcation(dev_priv, true); break; default: @@ -4726,7 +4726,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state, assert_pch_transcoder_disabled(dev_priv, pipe); if (IS_IVYBRIDGE(dev_priv)) - ivybridge_update_fdi_bc_bifurcation(crtc); + ivybridge_update_fdi_bc_bifurcation(crtc_state); /* Write the TU size bits before fdi link training, so that error * detection works. */
We have to look at crtc_state, so pass that instead. Also cleanup the use of dev vs dev_priv, we really want to pass along dev_priv. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)