From patchwork Wed Mar 22 21:03:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9640083 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 9909F601E9 for ; Wed, 22 Mar 2017 21:03:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DF6128488 for ; Wed, 22 Mar 2017 21:03:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ECFE28490; Wed, 22 Mar 2017 21:03:57 +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 40D0228488 for ; Wed, 22 Mar 2017 21:03:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BF6BB6E985; Wed, 22 Mar 2017 21:03:55 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 618546E985 for ; Wed, 22 Mar 2017 21:03:54 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u132so12925684wmg.1 for ; Wed, 22 Mar 2017 14:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=eLZsqbv6HCxRYOu0o30Ak8UEI8rLjq6RA9BwMVcG8u4=; b=CqDnzzhgsI8C/q9SGRmWtoaO90AnRtRNvSoQLcKtnP4RCT4VKaKLEe/neyUl/zQCOP ilLen/vXIaLD0FoyjCoYGGLxHq3ymH4XuT2D9U2j19/3RAOMSjzOzpflKSL+2OdzAxaO 3eS3gbIIK6xk2MnER1AyS2MP8uYuv4awD7tsMAS60Xsl+FxN+Bg8CxgK5VxuaW8bA4nn jngW//+9nc/ePWHZIvD51Z6HC3LGEHWfC8hb/42vR/2rISAftpZOap2mkRVtl8c8la+x zXy5SWONcxdHWe2aR9cCWq75cGy54mLGpJXlyLrpFaV+rTsj4g2RaeYpZG3o9wM0hzr/ G9zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=eLZsqbv6HCxRYOu0o30Ak8UEI8rLjq6RA9BwMVcG8u4=; b=netM59+AcH4GgBC+l92xm2S7ASROYrT6yUgQRkfCmAbWYi0iJrnjryE38Oq5BoSabf hDP31xxv3hBX3LqnPBad3t9WnoRyPiQSV18WWcC1CMF3om7Yh20gT2gEAOunIKIvm8ac 1vD3dpfX7MB1AmWL6oUe4sMViSlOFuUZMyyR/385NVLUHEb4d2vqkbio3AN7WLp+NOJA LwgqvCn+huWCw/JwNCAtrQvuZ6zvfOBskDPOIkhrC6XWW/hm7OEjx4GDci/05BTRO/tM XyHFcIQ0XGjWZ3SUs4Qj1PV96KDMx/vPgV5tvlTxw0BXrVHw8NGbk6ftyyz7Beh+q+Js FDGg== X-Gm-Message-State: AFeK/H3xZde+zwaexMMFQsAStg4s2pbjdRxmLTblu1UN+3f9Tom6w1m4noI4sq6uIUlHXA== X-Received: by 10.28.95.85 with SMTP id t82mr10362835wmb.107.1490216632798; Wed, 22 Mar 2017 14:03:52 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id w12sm3193752wra.21.2017.03.22.14.03.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 14:03:52 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Mar 2017 21:03:50 +0000 Message-Id: <20170322210350.6208-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH] drm/i915: Remove superfluous hw_flags from mi_set_context() 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 Why have both hw_flags and flags, when just one will do? Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_context.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 486051ed681d..8fc8b3d15a0f 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -576,25 +576,25 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) } static inline int -mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) +mi_set_context(struct drm_i915_gem_request *req, u32 flags) { struct drm_i915_private *dev_priv = req->i915; struct intel_engine_cs *engine = req->engine; enum intel_engine_id id; - u32 *cs, flags = hw_flags | MI_MM_SPACE_GTT; const int num_rings = /* Use an extended w/a on ivb+ if signalling from other rings */ i915.semaphores ? INTEL_INFO(dev_priv)->num_rings - 1 : 0; int len; + u32 *cs; - /* These flags are for resource streamer on HSW+ */ + flags |= MI_MM_SPACE_GTT; if (IS_HASWELL(dev_priv) || INTEL_GEN(dev_priv) >= 8) - flags |= (HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN); - else if (INTEL_GEN(dev_priv) < 8) - flags |= (MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN); - + /* These flags are for resource streamer on HSW+ */ + flags |= HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN; + else + flags |= MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN; len = 4; if (INTEL_GEN(dev_priv) >= 7)