Skip to content

Commit

Permalink
drm/i915: Check of !HAS_PCH_SPLIT() in PCH transcoder funcs
Browse files Browse the repository at this point in the history
Check for !HAS_PCH_SPLIT() instead of 'gen < 5' in the PCH transcoder
enable functions.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ville Syrjälä authored and Daniel Vetter committed Sep 3, 2014
1 parent a3ed6aa commit 55522f3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,
uint32_t reg, val, pipeconf_val;

/* PCH only available on ILK+ */
BUG_ON(INTEL_INFO(dev)->gen < 5);
BUG_ON(!HAS_PCH_SPLIT(dev));

/* Make sure PCH DPLL is enabled */
assert_shared_dpll_enabled(dev_priv,
Expand Down Expand Up @@ -1911,7 +1911,7 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
u32 val, pipeconf_val;

/* PCH only available on ILK+ */
BUG_ON(INTEL_INFO(dev_priv->dev)->gen < 5);
BUG_ON(!HAS_PCH_SPLIT(dev_priv->dev));

/* FDI must be feeding us bits for PCH ports */
assert_fdi_tx_enabled(dev_priv, (enum pipe) cpu_transcoder);
Expand Down

0 comments on commit 55522f3

Please sign in to comment.