aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-10-11 06:04:50 -0400
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-10-16 09:27:04 -0400
commit92d54b078fe20a742b0b3cb889263e7c5884cf2e (patch)
treef4c37e07dab101f8724b80865c128c0f059ebb2e /drivers/gpu/drm/i915/intel_display.c
parent4c35475485c1297393a35b161057b57753449a15 (diff)
drm/i915: Remove crtc->config references in vlv_prepare_pll
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> Link: https://patchwork.freedesktop.org/patch/msgid/20181011100457.8776-4-maarten.lankhorst@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 991a8ac0a174..a99b37ecfe3e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6927,8 +6927,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
6927 6927
6928 /* Set HBR and RBR LPF coefficients */ 6928 /* Set HBR and RBR LPF coefficients */
6929 if (pipe_config->port_clock == 162000 || 6929 if (pipe_config->port_clock == 162000 ||
6930 intel_crtc_has_type(crtc->config, INTEL_OUTPUT_ANALOG) || 6930 intel_crtc_has_type(pipe_config, INTEL_OUTPUT_ANALOG) ||
6931 intel_crtc_has_type(crtc->config, INTEL_OUTPUT_HDMI)) 6931 intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI))
6932 vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe), 6932 vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
6933 0x009f0003); 6933 0x009f0003);
6934 else 6934 else
@@ -6955,7 +6955,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
6955 6955
6956 coreclk = vlv_dpio_read(dev_priv, pipe, VLV_PLL_DW7(pipe)); 6956 coreclk = vlv_dpio_read(dev_priv, pipe, VLV_PLL_DW7(pipe));
6957 coreclk = (coreclk & 0x0000ff00) | 0x01c00000; 6957 coreclk = (coreclk & 0x0000ff00) | 0x01c00000;
6958 if (intel_crtc_has_dp_encoder(crtc->config)) 6958 if (intel_crtc_has_dp_encoder(pipe_config))
6959 coreclk |= 0x01000000; 6959 coreclk |= 0x01000000;
6960 vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk); 6960 vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk);
6961 6961