From patchwork Wed Nov 28 22:30:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 1819391 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id BE08040AE5 for ; Wed, 28 Nov 2012 22:31:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BCC5E6472 for ; Wed, 28 Nov 2012 14:31:12 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy8-pub.bluehost.com (oproxy8-pub.bluehost.com [69.89.22.20]) by gabe.freedesktop.org (Postfix) with SMTP id 14351E5EBF for ; Wed, 28 Nov 2012 14:30:35 -0800 (PST) Received: (qmail 30852 invoked by uid 0); 28 Nov 2012 22:30:34 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy8.bluehost.com with SMTP; 28 Nov 2012 22:30:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=N4z32ZFlKp59eRXPpAzU7pdp60v7C8/k5UsJQxYP9GU=; b=QZDpufrB/nUqD1fDBoCgJhBP9OcSaDxVGMM53xeCgqAOPhrtYCeP6x6jYbOHoNN1HH/w2V/Q/kwekPkiydiB8XJ2cpi1/vFam1YUGir4h/Hte4ZrTmJyz7aWS5PEyN/P; Received: from [67.161.37.189] (port=43035 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.76) (envelope-from ) id 1Tdq9K-000657-3i; Wed, 28 Nov 2012 15:30:34 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Wed, 28 Nov 2012 14:30:31 -0800 Message-Id: <1354141831-2545-2-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354141831-2545-1-git-send-email-jbarnes@virtuousgeek.org> References: <1354141831-2545-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Cc: james.t.kukunas@intel.com, arjan@linux.intel.com Subject: [Intel-gfx] [PATCH] drm/i915: reset GPU after clearing CSunit clock gating on gen6 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Needed to make sure we can enter/exit RC6 properly. v2: move to modeset_init since reset in init_clock_gating is too early Cc: James Kukunas Cc: Arjan van de Ven Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_dma.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 80ed751..9330c56 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1321,6 +1321,13 @@ static int i915_load_modeset_init(struct drm_device *dev) /* We're off and running w/KMS */ dev_priv->mm.suspended = 0; + /* + * SNB needs to reset after disabling CSunit clock gating or RC6 may + * break. + */ + if (IS_GEN6(dev)) + i915_reset(dev); + return 0; cleanup_irq: