UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Pass crtc_state to ivybridge_update_fdi_bc_bifurcation 

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>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011100457.8776-10-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst 2018-10-11 12:04:56 +02:00
parent c5b36facfa
commit b0b62d845e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/i915/intel_display.c
View File

@ -4584,9 +4584,8 @@ static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *c
I915_READ(VSYNCSHIFT(cpu_transcoder))); 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; uint32_t temp;
temp = I915_READ(SOUTH_CHICKEN1); temp = I915_READ(SOUTH_CHICKEN1);
@ -4605,22 +4604,23 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_device *dev, bool enable)
POSTING_READ(SOUTH_CHICKEN1); 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: case PIPE_A:
break; break;
case PIPE_B: case PIPE_B:
if (intel_crtc->config->fdi_lanes > 2) if (crtc_state->fdi_lanes > 2)
cpt_set_fdi_bc_bifurcation(dev, false); cpt_set_fdi_bc_bifurcation(dev_priv, false);
else else
cpt_set_fdi_bc_bifurcation(dev, true); cpt_set_fdi_bc_bifurcation(dev_priv, true);
break; break;
case PIPE_C: case PIPE_C:
cpt_set_fdi_bc_bifurcation(dev, true); cpt_set_fdi_bc_bifurcation(dev_priv, true);
break; break;
default: default:
@ -4677,7 +4677,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
assert_pch_transcoder_disabled(dev_priv, pipe); assert_pch_transcoder_disabled(dev_priv, pipe);
if (IS_IVYBRIDGE(dev_priv)) 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 /* Write the TU size bits before fdi link training, so that error
* detection works. */ * detection works. */