All of lore.kernel.org
 help / color / mirror / Atom feed
From: ville.syrjala@linux.intel.com
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v3 2/4] drm/i915: Only set CURSOR_PIPE_CSC_ENABLE when cursor is enabled
Date: Fri, 12 Sep 2014 20:53:33 +0300	[thread overview]
Message-ID: <1410544415-3059-2-git-send-email-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <1410544415-3059-1-git-send-email-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

It seems cleaner if we keep CURCNTR at 0 when the cursor is disabled,
so don't set the CURSOR_PIPE_CSC_ENABLE bit unless the cursor is
enabled.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8a5cb6b..82c0ad1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8317,9 +8317,10 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
 				return;
 		}
 		cntl |= pipe << 28; /* Connect to correct pipe */
+
+		if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+			cntl |= CURSOR_PIPE_CSC_ENABLE;
 	}
-	if (IS_HASWELL(dev) || IS_BROADWELL(dev))
-		cntl |= CURSOR_PIPE_CSC_ENABLE;
 
 	if (intel_crtc->cursor_cntl != cntl) {
 		I915_WRITE(CURCNTR(pipe), cntl);
-- 
1.8.5.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2014-09-12 17:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12 13:48 [PATCH] drm/i915: Support variable cursor height on ivb+ ville.syrjala
2014-09-12 14:00 ` [PATCH v2] " ville.syrjala
2014-09-12 17:53   ` [PATCH v3 1/4] drm/i915: Move the cursor_base setup to i{845, 9xx}_update_cursor() ville.syrjala
2014-09-12 17:53     ` ville.syrjala [this message]
2014-09-13 16:17       ` [PATCH v3 2/4] drm/i915: Only set CURSOR_PIPE_CSC_ENABLE when cursor is enabled Chris Wilson
2014-09-15  9:12         ` Daniel Vetter
2014-09-12 17:53     ` [PATCH v3 3/4] drm/i915: Skip CURBASE write when nothing changed ville.syrjala
2014-09-13 16:20       ` Chris Wilson
2014-09-15 13:36         ` Ville Syrjälä
2014-09-15 13:46           ` Chris Wilson
2014-09-12 17:53     ` [PATCH v3 4/4] drm/i915: Support variable cursor height on ivb+ ville.syrjala
2014-09-13 16:23       ` Chris Wilson
2014-09-15 13:31         ` Ville Syrjälä
2014-09-13 16:15     ` [PATCH v3 1/4] drm/i915: Move the cursor_base setup to i{845, 9xx}_update_cursor() Chris Wilson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1410544415-3059-2-git-send-email-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.