From patchwork Sat Aug 10 03:32:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?St=C3=A9phane_Marchesin?= X-Patchwork-Id: 2842270 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 289C7BF546 for ; Sat, 10 Aug 2013 03:33:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E0B6201CD for ; Sat, 10 Aug 2013 03:33:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 45283201C8 for ; Sat, 10 Aug 2013 03:33:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F874E7314 for ; Fri, 9 Aug 2013 20:33:11 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pb0-f52.google.com (mail-pb0-f52.google.com [209.85.160.52]) by gabe.freedesktop.org (Postfix) with ESMTP id D29FCE5BFA for ; Fri, 9 Aug 2013 20:33:00 -0700 (PDT) Received: by mail-pb0-f52.google.com with SMTP id wz12so5105726pbc.25 for ; Fri, 09 Aug 2013 20:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=2W5EH1/90fPqj52lfu5EUkGeyYWRWGBhMuKWPTUvS1k=; b=SoQJ0Xw7uPWSpKd4an6wW+KACNl39woLZTHeJCob8ZQkvgS86nfaDJ3A/ZKxzop4+b atOyKG7qCXzFoN95f8zfim9y2mKoKIq2EMoZH05LVn2Vzfk1lRzAA755dBeO7K7mI2rX CflZP9pPELLm2aVbd5yvtC3ZPhB0KAUEH1AjQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=2W5EH1/90fPqj52lfu5EUkGeyYWRWGBhMuKWPTUvS1k=; b=h8KCa1ctMJaw1UDKCq/9SW/tnQC9VqrXi8E7M1oTqw60lp85kQH3TRMi8wDmeYnX8b 86NKDXNJGZXZ2bKB6qxf2tCQZKkrXN9aiZSHDc2AyI8ZMuM64LBK5UtKpoddLP/lWGxE eKXt/cE3IGiiIY337nAWbd0sX+4kuj0BtOw4lKGL9xz7Kh6MK7C63/xN5UdUi5gfw+Rg H2B8RYityEFiN5gi7yZxs5d9eVvh4Nds04I2iCqBC68IqGDU3IEscb2VnHIxKFMzaX8X qwXSt4/soWX0dM0Hji7XXSkaaSpoVSIdLd+dbCugUsRzy8TC47yOBgiZUSdrtfxNW+UF LQEw== X-Gm-Message-State: ALoCoQnDoNhIu51sN+Ya/tdp8UYIHiC8W9b4Oqomq1lXlKPSabMAiLC5HhGnaimDfgvSNQ/veQBP X-Received: by 10.68.226.7 with SMTP id ro7mr14476540pbc.72.1376105580607; Fri, 09 Aug 2013 20:33:00 -0700 (PDT) Received: from localhost ([2620:0:1000:1b01:82c1:6eff:fef8:b068]) by mx.google.com with ESMTPSA id qf7sm25688167pac.14.2013.08.09.20.32.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 Aug 2013 20:32:59 -0700 (PDT) From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= To: intel-gfx@lists.freedesktop.org Date: Fri, 9 Aug 2013 20:32:54 -0700 Message-Id: <1376105574-14630-1-git-send-email-marcheu@chromium.org> X-Mailer: git-send-email 1.8.3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Don't load context at driver init time on SNB 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: , 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 X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time) This bit breaks hardware video decode for me after resume. Signed-off-by: Stéphane Marchesin --- drivers/gpu/drm/i915/intel_pm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index f895d15..ffa4ab2 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev) ILK_DPARBUNIT_CLOCK_GATE_ENABLE | ILK_DPFDUNIT_CLOCK_GATE_ENABLE); - /* WaMbcDriverBootEnable:snb */ - I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) | - GEN6_MBCTL_ENABLE_BOOT_FETCH); - g4x_disable_trickle_feed(dev); /* The default value should be 0x200 according to docs, but the two