From patchwork Tue Sep 15 20:57:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 47766 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8FKwWsS001239 for ; Tue, 15 Sep 2009 20:58:32 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD49C9F653; Tue, 15 Sep 2009 13:58:32 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 73F6C9F66D for ; Tue, 15 Sep 2009 13:58:27 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 934CF20C4B5; Wed, 16 Sep 2009 06:52:33 +0200 (CEST) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--H*Ad:D*sourceforge.net, 0.000-+--H*Ad:D*lists.sourceforge.net, 0.000-+--HCc:D*net X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.967-+--H*Ad:U*daniel.vetter, 0.965-+--H*m:ffwll, 0.948-+--H*Ad:D*ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 6C4C820C477; Wed, 16 Sep 2009 06:52:06 +0200 (CEST) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1Mnf66-0002Ar-EE; Tue, 15 Sep 2009 22:57:58 +0200 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 15 Sep 2009 22:57:35 +0200 Message-Id: X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <7e4800d3a495686bb3d4cea4dd9364f53c100bba.1253047594.git.daniel.vetter@ffwll.ch> References: <0cdb434c339fd4257f9e19c0b9db4389c99c8e84.1253047594.git.daniel.vetter@ffwll.ch> <23ce9c607c40e8441e7c5650124782f150030e52.1253047594.git.daniel.vetter@ffwll.ch> <7e4800d3a495686bb3d4cea4dd9364f53c100bba.1253047594.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter , dri-devel@lists.sourceforge.net Subject: [Intel-gfx] [PATCH 5/8] [drm/i915] fully switch off overlay when not in use X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Now that the cache flushing of the memory based overlay regs works, we can safely switch off the overlay. Beforehand it was only disabled (like in userspace). Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_overlay.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 3f6f3a3..4e88abb 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -323,7 +323,6 @@ static int intel_overlay_off(struct intel_overlay *overlay) } /* turn overlay off */ - /* this is not done in userspace! BEGIN_LP_RING(6); OUT_RING(MI_FLUSH); OUT_RING(MI_NOOP); @@ -338,7 +337,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) DRM_ERROR("intel overlay: ring sync failed, hw likely wedged\n"); overlay->hw_wedged = 1; return ret; - }*/ + } overlay->active = 0;