diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-06-22 21:57:05 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-07-07 13:10:12 +0300 |
| commit | 2210ce7f537412160e93a5cf9796581858287fb1 (patch) | |
| tree | 77e5d02b1916ccbac7b5567f30d31b895871070e /drivers/gpu/drm/i915/intel_display.c | |
| parent | 37a5650b5bd645d74f082f2cffd22e4db7f4b238 (diff) | |
| download | lwn-2210ce7f537412160e93a5cf9796581858287fb1.tar.gz lwn-2210ce7f537412160e93a5cf9796581858287fb1.zip | |
drm/i915: Replace some open coded intel_crtc_has_dp_encoder()s
A bunch of places still look for DP encoders manually. Just call
intel_crtc_has_dp_encoder(). Note that many of these places don't
look for EDP or DP_MST, but it's still fine to replace them because
* for audio we don't enable audio on eDP anyway
* the code that lack DP MST check is only for plaforms that
don't support MST anyway
v2: Rebase
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466621833-5054-8-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 15cb1e20a490..9da4befa6fcb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7393,8 +7393,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_type(crtc->config, INTEL_OUTPUT_DISPLAYPORT) || - intel_crtc_has_type(crtc->config, INTEL_OUTPUT_EDP)) + if (intel_crtc_has_dp_encoder(crtc->config)) coreclk |= 0x01000000; vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk); |