From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1555DC6377A for ; Wed, 21 Jul 2021 22:34:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D70026023D for ; Wed, 21 Jul 2021 22:34:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D70026023D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 727846E8F1; Wed, 21 Jul 2021 22:34:16 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D79B6E899; Wed, 21 Jul 2021 22:34:15 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="211528592" X-IronPort-AV: E=Sophos;i="5.84,258,1620716400"; d="scan'208";a="211528592" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 15:34:15 -0700 X-IronPort-AV: E=Sophos;i="5.84,258,1620716400"; d="scan'208";a="564877475" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.134]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 15:34:14 -0700 Date: Wed, 21 Jul 2021 15:34:13 -0700 From: Matt Roper To: Lucas De Marchi Subject: Re: [PATCH 1/4] drm/i915/gt: fix platform prefix Message-ID: <20210721223413.GL4174536@mdroper-desk1.amr.corp.intel.com> References: <20210720232014.3302645-1-lucas.demarchi@intel.com> <20210720232014.3302645-2-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210720232014.3302645-2-lucas.demarchi@intel.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, Tvrtko Ursulin , Tomas Winkler , dri-devel@lists.freedesktop.org, John Harrison Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jul 20, 2021 at 04:20:11PM -0700, Lucas De Marchi wrote: > gen8_clear_engine_error_register() is actually not used by > GRAPHICS_VER >= 8, since for those we are using another register that is > not engine-dependent. Fix the platform prefix, to make clear we are not > using any GEN6_RING_FAULT_REG_* one GRAPHICS_VER >= 8. > > Signed-off-by: Lucas De Marchi Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c > index e714e21c0a4d..a8efdd44e9cf 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -205,7 +205,7 @@ static void clear_register(struct intel_uncore *uncore, i915_reg_t reg) > intel_uncore_rmw(uncore, reg, 0, 0); > } > > -static void gen8_clear_engine_error_register(struct intel_engine_cs *engine) > +static void gen6_clear_engine_error_register(struct intel_engine_cs *engine) > { > GEN6_RING_FAULT_REG_RMW(engine, RING_FAULT_VALID, 0); > GEN6_RING_FAULT_REG_POSTING_READ(engine); > @@ -251,7 +251,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt, > enum intel_engine_id id; > > for_each_engine_masked(engine, gt, engine_mask, id) > - gen8_clear_engine_error_register(engine); > + gen6_clear_engine_error_register(engine); > } > } > > -- > 2.31.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795