From patchwork Tue Aug 16 10:42:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9283255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 745E2607FD for ; Tue, 16 Aug 2016 10:43:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64BE7285CC for ; Tue, 16 Aug 2016 10:43:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 598AA285D3; Tue, 16 Aug 2016 10:43:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F0766285CC for ; Tue, 16 Aug 2016 10:43:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6673A6E661; Tue, 16 Aug 2016 10:43:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8E7F76E661 for ; Tue, 16 Aug 2016 10:43:08 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id i138so15623173wmf.3 for ; Tue, 16 Aug 2016 03:43:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=FZXMPUpGFkheHoBgsxJSjiTFnmDtuVz8IGkpInplpd4=; b=pfmKwtP1DgTrRDjN2yBECCPuf8qugBDL1wMNBtLUeOFHxl1IWIR5nEAkPded4g4z3U 0jZrLBTRCYNYlTy2k9aO7R+cBJEz3qJCfuGYjV9VeMss3rbgL9D1CPLg7PwgoBNcl2NX /fGJpB7QXDVhxRZvI7q6jMR/YEaA9sLzi6slz9BKyryA+e7s1G1BpyZ1ntdyRItita/z LZq+VuLSdwNLRdA6U0trpoK9gM/CqdGJwTA6TZ0MxdKTReVdc1jWOFKyKlA12CgeX5YE 0ggm3anJkqjCVCreYbdl5ZwhntKN1C/NDpdpwTwnXagFSAQUbZfYzPXXPBisZloXfthJ O6BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=FZXMPUpGFkheHoBgsxJSjiTFnmDtuVz8IGkpInplpd4=; b=hWgDoT/Ly6obnKllkIae7e01+ioURgsDSDca1LkfsLyb57B/glPSxAWUu9rHlaWECs /ZOofAu8PGA4jZEOdzabu8AZAiQAMTzm50gzlhIVIFYAiFsFkOBYwzKX+kgiBS2092CT nchQV8iRz9kfzppmH1G/Ce0sNIxs/Ej/XNhXm4KM21Uj90DnnNvGsw7SZ1sNQlfTag+0 KKFwhmkFdwwDOPhf2ma054clUAARXQT+RFucLiCr1TJxHI0a9CgHkx2JheNbEaquOchi RlhyQeyb2Q3hF6xVJfhWOiTlhrCZKcukyVyOuzrd5T+Sy0hd4tJPC6iJP31B8yFfOB2D ANjA== X-Gm-Message-State: AEkoouvyiXL988fP6VKjM4HprZyvP/Mg+zfyYlc8nS4oF2R0gRsb5YbxxNX4LKp8r9EXcA== X-Received: by 10.28.214.130 with SMTP id n124mr19526020wmg.37.1471344187240; Tue, 16 Aug 2016 03:43:07 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id d62sm21175546wmd.7.2016.08.16.03.43.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2016 03:43:06 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 16 Aug 2016 11:42:32 +0100 Message-Id: <1471344168-28136-7-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471344168-28136-1-git-send-email-chris@chris-wilson.co.uk> References: <1471344168-28136-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 06/22] drm/i915: Tidy up flush cpu/gtt write domains X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Since we know the write domain, we can drop the local variable and make the code look a tiny bit simpler. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d91ecf64ed96..2b7d9444f621 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3173,7 +3173,6 @@ static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); - uint32_t old_write_domain; if (obj->base.write_domain != I915_GEM_DOMAIN_GTT) return; @@ -3197,36 +3196,30 @@ i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj) if (INTEL_GEN(dev_priv) >= 6 && !HAS_LLC(dev_priv)) POSTING_READ(RING_ACTHD(dev_priv->engine[RCS].mmio_base)); - old_write_domain = obj->base.write_domain; - obj->base.write_domain = 0; - intel_fb_obj_flush(obj, false, ORIGIN_GTT); + obj->base.write_domain = 0; trace_i915_gem_object_change_domain(obj, obj->base.read_domains, - old_write_domain); + I915_GEM_DOMAIN_GTT); } /** Flushes the CPU write domain for the object if it's dirty. */ static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj) { - uint32_t old_write_domain; - if (obj->base.write_domain != I915_GEM_DOMAIN_CPU) return; if (i915_gem_clflush_object(obj, obj->pin_display)) i915_gem_chipset_flush(to_i915(obj->base.dev)); - old_write_domain = obj->base.write_domain; - obj->base.write_domain = 0; - intel_fb_obj_flush(obj, false, ORIGIN_CPU); + obj->base.write_domain = 0; trace_i915_gem_object_change_domain(obj, obj->base.read_domains, - old_write_domain); + I915_GEM_DOMAIN_CPU); } /**