Skip to content

Commit

Permalink
drm/i915: rename intel_{en, dis}able_transcoder
Browse files Browse the repository at this point in the history
To ironlake_{en,dis}able_pch_transcoder since these functions will be
different on Haswell/LPT and since the "transcoder" they {en,dis}able
is on the PCH.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: again a small conflict because the fdi disable sequenc looks
a bit different here.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Nov 11, 2012
1 parent daed2db commit b8a4f40
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1670,8 +1670,8 @@ static void intel_disable_pch_pll(struct intel_crtc *intel_crtc)
pll->on = false;
}

static void intel_enable_transcoder(struct drm_i915_private *dev_priv,
enum pipe pipe)
static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,
enum pipe pipe)
{
int reg;
u32 val, pipeconf_val;
Expand Down Expand Up @@ -1721,8 +1721,8 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv,
DRM_ERROR("failed to enable transcoder %d\n", pipe);
}

static void intel_disable_transcoder(struct drm_i915_private *dev_priv,
enum pipe pipe)
static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
enum pipe pipe)
{
int reg;
u32 val;
Expand Down Expand Up @@ -3161,7 +3161,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
I915_WRITE(reg, temp);
}

intel_enable_transcoder(dev_priv, pipe);
ironlake_enable_pch_transcoder(dev_priv, pipe);
}

static void lpt_pch_enable(struct drm_crtc *crtc)
Expand Down Expand Up @@ -3194,7 +3194,7 @@ static void lpt_pch_enable(struct drm_crtc *crtc)
I915_WRITE(_TRANS_VSYNC_A, I915_READ(VSYNC(cpu_transcoder)));
I915_WRITE(_TRANS_VSYNCSHIFT_A, I915_READ(VSYNCSHIFT(cpu_transcoder)));

intel_enable_transcoder(dev_priv, intel_crtc->pipe);
ironlake_enable_pch_transcoder(dev_priv, intel_crtc->pipe);
}

static void intel_put_pch_pll(struct intel_crtc *intel_crtc)
Expand Down Expand Up @@ -3503,7 +3503,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)

ironlake_fdi_disable(crtc);

intel_disable_transcoder(dev_priv, pipe);
ironlake_disable_pch_transcoder(dev_priv, pipe);

if (HAS_PCH_CPT(dev)) {
/* disable TRANS_DP_CTL */
Expand Down Expand Up @@ -3589,7 +3589,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)

if (is_pch_port) {
ironlake_fdi_disable(crtc);
intel_disable_transcoder(dev_priv, pipe);
ironlake_disable_pch_transcoder(dev_priv, pipe);
intel_disable_pch_pll(intel_crtc);
ironlake_fdi_pll_disable(intel_crtc);
}
Expand Down

0 comments on commit b8a4f40

Please sign in to comment.