| Message ID | 20181011100457.8776-4-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:50PM +0200, Maarten Lankhorst wrote: > We already have a perfectly nice pipe_config, use that instead. > > 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 | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 3d3eefa6ec65..bb16a9acf117 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -7033,8 +7033,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, > > /* Set HBR and RBR LPF coefficients */ > if (pipe_config->port_clock == 162000 || > - intel_crtc_has_type(crtc->config, INTEL_OUTPUT_ANALOG) || > - intel_crtc_has_type(crtc->config, INTEL_OUTPUT_HDMI)) > + intel_crtc_has_type(pipe_config, INTEL_OUTPUT_ANALOG) || > + intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI)) > vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe), > 0x009f0003); > else > @@ -7061,7 +7061,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, > > coreclk = vlv_dpio_read(dev_priv, pipe, VLV_PLL_DW7(pipe)); > coreclk = (coreclk & 0x0000ff00) | 0x01c00000; > - if (intel_crtc_has_dp_encoder(crtc->config)) > + if (intel_crtc_has_dp_encoder(pipe_config)) > coreclk |= 0x01000000; > vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk); > > -- > 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 3d3eefa6ec65..bb16a9acf117 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7033,8 +7033,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, /* Set HBR and RBR LPF coefficients */ if (pipe_config->port_clock == 162000 || - intel_crtc_has_type(crtc->config, INTEL_OUTPUT_ANALOG) || - intel_crtc_has_type(crtc->config, INTEL_OUTPUT_HDMI)) + intel_crtc_has_type(pipe_config, INTEL_OUTPUT_ANALOG) || + intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI)) vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe), 0x009f0003); else @@ -7061,7 +7061,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, coreclk = vlv_dpio_read(dev_priv, pipe, VLV_PLL_DW7(pipe)); coreclk = (coreclk & 0x0000ff00) | 0x01c00000; - if (intel_crtc_has_dp_encoder(crtc->config)) + if (intel_crtc_has_dp_encoder(pipe_config)) coreclk |= 0x01000000; vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk);
We already have a perfectly nice pipe_config, use that instead. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)