From patchwork Fri Aug 24 22:16:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 1373411 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 36984DF6DA for ; Sat, 25 Aug 2012 13:47:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1793F9E943 for ; Sat, 25 Aug 2012 06:47:10 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id CA5799E968 for ; Fri, 24 Aug 2012 15:16:40 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id r3so1345546wey.36 for ; Fri, 24 Aug 2012 15:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=+XTjpIGvpDXUCmkkVxOQXsNz8fYYa3Ge4XqDhV3Y/98=; b=qJzXaWPvplLiQtp8MZRLVPPgrEQF8UTBtgZEjYdz5MvDBGJaKrhmbqdh1m/zsc/4Hq CgkvuPhCNNd64utkrX70BaIbCkDbbUVEX5Lerqtf6/OzQlndgW03zreQ71i05rtMCGxV +WTgPqA6Lg2mWdDSVfRcoavWU5lYXcELFxD68iz+8/6GaCpZITkbUG4qviwd3Bl3tg88 h14bTfHyAOAWLS6RVYDBw2FlmgknbHcDBFp3CKcpgZBgYkLMDUhxhC+P+cEHxmEte4Wg gkKdI5YZINH/84nSkEbfSJQpdeZk+/4hkuh10xk6Eb3ysznltQep1LGziQAUAbI+La46 vb+w== Received: by 10.180.84.1 with SMTP id u1mr8552974wiy.15.1345846600415; Fri, 24 Aug 2012 15:16:40 -0700 (PDT) Received: from fambox.fritz.box (p5B2EA080.dip.t-dialin.net. [91.46.160.128]) by mx.google.com with ESMTPS id fr4sm1108253wib.8.2012.08.24.15.16.39 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 15:16:39 -0700 (PDT) From: Sedat Dilek To: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Date: Sat, 25 Aug 2012 00:16:24 +0200 Message-Id: <1345846584-5910-3-git-send-email-sedat.dilek@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345846584-5910-1-git-send-email-sedat.dilek@gmail.com> References: <1345846584-5910-1-git-send-email-sedat.dilek@gmail.com> X-Mailman-Approved-At: Sat, 25 Aug 2012 06:43:37 -0700 Cc: Sedat Dilek X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org 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 Signed-off-by: Sedat Dilek --- 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;