diff options
| author | Tvrtko Ursulin | 2016-11-16 09:55:41 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-11-17 14:56:39 +0100 |
| commit | dd11bc109dec0eadc031a6cdd2c153928f0a94da (patch) | |
| tree | 8d7ed9923989cbd1e5082db76dba4f805f3e9704 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Assorted INTEL_INFO(dev) cleanups (diff) | |
| download | kernel-qcow2-linux-dd11bc109dec0eadc031a6cdd2c153928f0a94da.tar.gz kernel-qcow2-linux-dd11bc109dec0eadc031a6cdd2c153928f0a94da.tar.xz kernel-qcow2-linux-dd11bc109dec0eadc031a6cdd2c153928f0a94da.zip | |
drm/i915: dev_priv cleanup in intel_dp.c
And as usual a little bit of cascaded function prototype changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
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 f723078cc5d9..da1e29ec9eb6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15551,7 +15551,7 @@ static void intel_setup_outputs(struct drm_device *dev) } else if (HAS_PCH_SPLIT(dev_priv)) { int found; - dpd_is_edp = intel_dp_is_edp(dev, PORT_D); + dpd_is_edp = intel_dp_is_edp(dev_priv, PORT_D); if (has_edp_a(dev_priv)) intel_dp_init(dev, DP_A, PORT_A); @@ -15594,14 +15594,14 @@ static void intel_setup_outputs(struct drm_device *dev) * trust the port type the VBT declares as we've seen at least * HDMI ports that the VBT claim are DP or eDP. */ - has_edp = intel_dp_is_edp(dev, PORT_B); + has_edp = intel_dp_is_edp(dev_priv, PORT_B); has_port = intel_bios_is_port_present(dev_priv, PORT_B); if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port) has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B); if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp) intel_hdmi_init(dev, VLV_HDMIB, PORT_B); - has_edp = intel_dp_is_edp(dev, PORT_C); + has_edp = intel_dp_is_edp(dev_priv, PORT_C); has_port = intel_bios_is_port_present(dev_priv, PORT_C); if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port) has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C); |