From: Sedat Dilek <sedat.dilek@gmail.com>
To: David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Subject: [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a
Date: Sat, 25 Aug 2012 00:16:24 +0200 [thread overview]
Message-ID: <1345846584-5910-3-git-send-email-sedat.dilek@gmail.com> (raw)
In-Reply-To: <1345846584-5910-1-git-send-email-sedat.dilek@gmail.com>
This is a fixup patch for the merge of drm-next into linux-next caused
by commit b6c7488df68a ("drm/i915/contexts: fix list corruption").
Reported-By: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
drivers/gpu/drm/i915/i915_gem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4f6841d..e8a5cb2 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev)
/* Flush everything onto the inactive list. */
for_each_ring(ring, dev_priv, i) {
- ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
+ ret = i915_ring_idle(ring);
if (ret)
return ret;
- ret = i915_ring_idle(ring);
+ ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
if (ret)
return ret;
--
1.7.9.5
next prev parent reply other threads:[~2012-08-24 22:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-24 22:16 [PATCH drm-next 1/3] drm/udl: usb: Fix recursive Kconfig dependency Sedat Dilek
2012-08-24 22:16 ` [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field Sedat Dilek
2012-08-26 18:39 ` Daniel Vetter
2012-08-26 19:18 ` Sedat Dilek
2012-08-24 22:16 ` Sedat Dilek [this message]
2012-08-26 18:42 ` [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Daniel Vetter
2012-08-26 19:13 ` Sedat Dilek
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=1345846584-5910-3-git-send-email-sedat.dilek@gmail.com \
--to=sedat.dilek@gmail.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).