From 8de1822b84ed5af89391e8075f7c10041187c36f Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Mon, 17 Dec 2012 15:39:16 +0100 Subject: [PATCH] drm/i915: Correct check in intel_check_plane_mapping() Fixes commit fa55583 drm/i915: fixup the plane->pipe fixup code which moved the plane mapping check to a separate helper function. The new and the old check does not match which might cause errors. Signed-off-by: Peter Ujfalusi --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b426d44..f9fab41 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8113,7 +8113,7 @@ intel_check_plane_mapping(struct intel_crtc *crtc) reg = DSPCNTR(!crtc->plane); val = I915_READ(reg); - if ((val & DISPLAY_PLANE_ENABLE) && + if ((val & DISPLAY_PLANE_ENABLE) == 0 && (!!(val & DISPPLANE_SEL_PIPE_MASK) == crtc->pipe)) return false; -- 1.8.0.2