From patchwork Wed Aug 17 13:55:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9286009 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 B576560574 for ; Wed, 17 Aug 2016 13:56:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A264B29C3D for ; Wed, 17 Aug 2016 13:56:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9786229C40; Wed, 17 Aug 2016 13:56:17 +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 796CB29C3F for ; Wed, 17 Aug 2016 13:56:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 936066E887; Wed, 17 Aug 2016 13:56:15 +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 7316F6E838 for ; Wed, 17 Aug 2016 13:56:09 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id i138so24327288wmf.3 for ; Wed, 17 Aug 2016 06:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ZmcKJrXeoP5Ye995lHevirvXFWqEEDaxVAlsHmREgf8=; b=BpWeu0D3tKUIYL/zpNMyj9ocUtOLmvh29rP/nlRAw0ez46GpOG4q+0TnwPM3li+oU6 sOteBVZviyexBAvsdqeHKZyZwLK5lwgYuaqZj38oIXkRtRdcEWsD5o5VKSIMpjcZSyet 7EYfQEjpZYC9qDFZMX7WFbXbUxbU3+efZe6oxctdbPB5qW8IzAaZi3LDwJb2FOcHDwlu mRs8N3ZMYwbKkBgXAuuv9LrVczXhXSSNRopHkrNZ+Nj3L8/QLfc9OZLbsdjWYiQDTIPg mwKKBHolATiSVXdI3p30w2NQA8Rco5vPQAar/R14hS3GR2gaQT8g1d8jJ4C0J0YgM63B kurw== 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:subject:date:message-id :in-reply-to:references; bh=ZmcKJrXeoP5Ye995lHevirvXFWqEEDaxVAlsHmREgf8=; b=OKKI+NDtJb6aYEbl3vU0dBvRnpRGLTBJOGmMD1pujl/NJVKySfNjohcWmg5I6O7As6 81dQG+W6bG1UEzmaLBdXTm2eEPwhRIVG0uDgdZamA8P4Wiyz9KvkP3nmMzH1rOcmy1dj i8VfGqFmwxLi/mCRRuta3HmSIxmgqngEmqpUimG3B8w+kfGGAcFbYk/ClgvaoCPFCiGW QKNYO7/943Hp44xfuomusoiCpxq0VJcx6aFMbhYxfIcDxG1fUf6rxLCmnd3FDX+8xsZU xwkvW4Odwfy9pOX1j+L4OUPS0APJms4ui+L09bIv4uGmTKRiDDSlCEPmINYkT3d1MtyW vR5Q== X-Gm-Message-State: AEkoouuBlVdDWcF3zjEq+y9RgiaxJY4ey27Z+8JkcBIkMtcqGvzqHui2vva1RbjX30EQ1g== X-Received: by 10.194.118.70 with SMTP id kk6mr41288206wjb.180.1471442167911; Wed, 17 Aug 2016 06:56:07 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id yz6sm31773800wjb.35.2016.08.17.06.56.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Aug 2016 06:56:06 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 17 Aug 2016 14:55:36 +0100 Message-Id: <1471442153-29575-6-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471442153-29575-1-git-send-email-chris@chris-wilson.co.uk> References: <1471442153-29575-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 06/23] 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 325105cc5add..4607a6485e3f 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); } /**