All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>,
	intel-gfx <intel-gfx@lists.freedesktop.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	dri-devel <dri-devel@lists.freedesktop.org>,
	kernel list <linux-kernel@vger.kernel.org>,
	Jiri Kosina <jikos@jikos.cz>
Subject: [PATCH] fix i915 regression: only top 20% of screen works in X
Date: Thu, 24 Apr 2014 22:13:49 +0200	[thread overview]
Message-ID: <20140424201349.GA31233@amd.pavel.ucw.cz> (raw)
In-Reply-To: <CAKMK7uFAgHJ-kYJEcDCvNm3B4ELKC8CFK8iP+-SL7bdT5-VQHA@mail.gmail.com>


Fix regression where only 20% of screen works in X. This is manual
revert of a51435a3137ad8ae75c288c39bd2d8b2696bae8f.

Signed-off-by: Pavel Machek <pavel@ucw.cz>


diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 6bc68bd..cf63c67 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -447,6 +447,11 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 
 	gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
 
+	if (I915_NEED_GFX_HWS(dev))
+		intel_ring_setup_status_page(ring);
+	else
+		ring_setup_phys_status_page(ring);
+
 	/* Stop the ring if it's running. */
 	I915_WRITE_CTL(ring, 0);
 	I915_WRITE_HEAD(ring, 0);
@@ -454,11 +459,6 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 	if (wait_for_atomic((I915_READ_MODE(ring) & MODE_IDLE) != 0, 1000))
 		DRM_ERROR("%s :timed out trying to stop ring\n", ring->name);
 
-	if (I915_NEED_GFX_HWS(dev))
-		intel_ring_setup_status_page(ring);
-	else
-		ring_setup_phys_status_page(ring);
-
 	head = I915_READ_HEAD(ring) & HEAD_ADDR;
 
 	/* G45 ring initialization fails to reset head to zero */


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

WARNING: multiple messages have this Message-ID (diff)
From: Pavel Machek <pavel@ucw.cz>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	kernel list <linux-kernel@vger.kernel.org>,
	dri-devel <dri-devel@lists.freedesktop.org>,
	Jiri Kosina <jikos@jikos.cz>
Subject: [PATCH] fix i915 regression: only top 20% of screen works in X
Date: Thu, 24 Apr 2014 22:13:49 +0200	[thread overview]
Message-ID: <20140424201349.GA31233@amd.pavel.ucw.cz> (raw)
In-Reply-To: <CAKMK7uFAgHJ-kYJEcDCvNm3B4ELKC8CFK8iP+-SL7bdT5-VQHA@mail.gmail.com>


Fix regression where only 20% of screen works in X. This is manual
revert of a51435a3137ad8ae75c288c39bd2d8b2696bae8f.

Signed-off-by: Pavel Machek <pavel@ucw.cz>


diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 6bc68bd..cf63c67 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -447,6 +447,11 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 
 	gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
 
+	if (I915_NEED_GFX_HWS(dev))
+		intel_ring_setup_status_page(ring);
+	else
+		ring_setup_phys_status_page(ring);
+
 	/* Stop the ring if it's running. */
 	I915_WRITE_CTL(ring, 0);
 	I915_WRITE_HEAD(ring, 0);
@@ -454,11 +459,6 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 	if (wait_for_atomic((I915_READ_MODE(ring) & MODE_IDLE) != 0, 1000))
 		DRM_ERROR("%s :timed out trying to stop ring\n", ring->name);
 
-	if (I915_NEED_GFX_HWS(dev))
-		intel_ring_setup_status_page(ring);
-	else
-		ring_setup_phys_status_page(ring);
-
 	head = I915_READ_HEAD(ring) & HEAD_ADDR;
 
 	/* G45 ring initialization fails to reset head to zero */


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

  parent reply	other threads:[~2014-04-24 20:13 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-23 20:22 3.15-rc2: i915 regression: only top 20% of screen works in X Pavel Machek
2014-04-23 21:09 ` Daniel Vetter
2014-04-23 21:09   ` Daniel Vetter
2014-04-23 22:03   ` Pavel Machek
2014-04-23 22:03     ` Pavel Machek
2014-04-23 22:09   ` Pavel Machek
2014-04-23 22:09     ` Pavel Machek
2014-04-24  5:50     ` Chris Wilson
2014-04-24  5:50       ` Chris Wilson
2014-04-24  6:03       ` Daniel Vetter
2014-04-24 13:36         ` Pavel Machek
2014-04-24 13:36           ` Pavel Machek
2014-04-24 13:56           ` Jiri Kosina
2014-04-24 13:56             ` Jiri Kosina
2014-04-24 13:43         ` Pavel Machek
2014-04-24 13:43           ` Pavel Machek
2014-04-24 15:03           ` Chris Wilson
2014-04-24 15:03             ` Chris Wilson
2014-04-24 19:28         ` [partial bisect] " Pavel Machek
2014-04-24 19:28           ` Pavel Machek
2014-04-24 19:40         ` [bisect result] " Pavel Machek
2014-04-24 19:40           ` Pavel Machek
2014-04-24 20:15           ` Chris Wilson
2014-04-24 20:15             ` Chris Wilson
2014-04-24 22:00             ` Pavel Machek
2014-04-24 22:06             ` Pavel Machek
2014-04-24 22:15               ` Jiri Kosina
2014-04-24 22:15                 ` Jiri Kosina
2014-04-25 11:33               ` Jani Nikula
2014-04-24 20:13         ` Pavel Machek [this message]
2014-04-24 20:13           ` [PATCH] fix " Pavel Machek
2014-04-24 10:42       ` 3.15-rc2: " Pavel Machek
2014-04-24 11:39         ` Jiri Kosina

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=20140424201349.GA31233@amd.pavel.ucw.cz \
    --to=pavel@ucw.cz \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jikos@jikos.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    /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.