Skip to content

Commit

Permalink
drm/i915: fix checks inside ironlake_crtc_{enable, disable}
Browse files Browse the repository at this point in the history
The last commit forked a Haswell version, so now we remove Haswell
code from these functions.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Oct 26, 2012
1 parent 4f771f1 commit 20474e9
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3228,9 +3228,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
if (encoder->pre_enable)
encoder->pre_enable(encoder);

if (IS_HASWELL(dev))
intel_ddi_enable_pipe_clock(intel_crtc);

/* Enable panel fitting for LVDS */
if (dev_priv->pch_pf_size &&
(intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) || HAS_eDP)) {
Expand All @@ -3249,11 +3246,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
*/
intel_crtc_load_lut(crtc);

if (IS_HASWELL(dev)) {
intel_ddi_set_pipe_settings(crtc);
intel_ddi_enable_pipe_func(crtc);
}

intel_enable_pipe(dev_priv, pipe, is_pch_port);
intel_enable_plane(dev_priv, plane, pipe);

Expand Down Expand Up @@ -3404,16 +3396,10 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)

intel_disable_pipe(dev_priv, pipe);

if (IS_HASWELL(dev))
intel_ddi_disable_pipe_func(dev_priv, pipe);

/* Disable PF */
I915_WRITE(PF_CTL(pipe), 0);
I915_WRITE(PF_WIN_SZ(pipe), 0);

if (IS_HASWELL(dev))
intel_ddi_disable_pipe_clock(intel_crtc);

for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->post_disable)
encoder->post_disable(encoder);
Expand Down

0 comments on commit 20474e9

Please sign in to comment.