There is a if branch in i9xx_update_cursor that may get taken
otherwise, resulting in cursor not being made invisible accidentally.

Cc: [email protected]
Signed-off-by: Maarten Lankhorst <[email protected]>
---
 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 c7ed478ddd49..70e4589e6387 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10040,7 +10040,7 @@ static void intel_crtc_update_cursor(struct drm_crtc 
*crtc,
        I915_WRITE(CURPOS(pipe), pos);
 
        /* ILK+ do this automagically */
-       if (HAS_GMCH_DISPLAY(dev) &&
+       if (HAS_GMCH_DISPLAY(dev) && base &&
            crtc->cursor->state->rotation == BIT(DRM_ROTATE_180)) {
                base += (cursor_state->crtc_h *
                         cursor_state->crtc_w - 1) * 4;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to