From patchwork Wed Oct 19 22:24:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 13012406 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 470A3C433FE for ; Wed, 19 Oct 2022 22:25:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78B6A10E40C; Wed, 19 Oct 2022 22:25:36 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id D60E310E264; Wed, 19 Oct 2022 22:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666218329; x=1697754329; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=afufhKibvZecEmiMC7XSxm69VGptDJMBoHB5eO7F5pc=; b=oFtA29T/iTeguXTaCnwxxha5mtJXFwSXN/wWOCE99Jwwpjcl580h03nr mqX3NcCjq6NyVTgsKXc3FvQQ9spsPWxw35Ud3jzsl2Ydev56u9UUqX9Uq gSI9o0mj08z6uJaoXMx9jCCgbNlaq8aUc8BHBZaadMawSbj2iE1Q5HsOB RnTqmBaHeNDxhP80gBPwdUVmvRDj4dyrXPUj0chBOZ5zdiUggijbk3uSE u+Yezos7slBmVq0vKL3SL1rnKWvUVyt/jzWbFuEByjtwtvWzyuNOjE0Zy BWacZ5pplda+kY1fiaf0cL88ttTeEzqfj1LeElvOm+/Mcp6BCsKTHTKij g==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="333107569" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="333107569" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 15:24:44 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="754789873" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="754789873" Received: from mdroper-desk1.fm.intel.com ([10.1.27.134]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 15:24:43 -0700 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Wed, 19 Oct 2022 15:24:37 -0700 Message-Id: <20221019222437.3035182-1-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/xelpg: Fix write to MTL_MCR_SELECTOR X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" A misplaced closing parenthesis caused the groupid/instanceid values to be considered part of the ternary operator's condition instead of being OR'd into the resulting value. Fixes: f32898c94a10 ("drm/i915/xelpg: Add multicast steering") Reported-by: kernel test robot Signed-off-by: Matt Roper Reviewed-by: Arun R Murthy --- drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c index 0d2811724b00..46cf2f3d1e8e 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c @@ -249,7 +249,7 @@ static u32 rw_with_mcr_steering_fw(struct intel_uncore *uncore, intel_uncore_write_fw(uncore, MTL_MCR_SELECTOR, REG_FIELD_PREP(MTL_MCR_GROUPID, group) | REG_FIELD_PREP(MTL_MCR_INSTANCEID, instance) | - (rw_flag == FW_REG_READ) ? GEN11_MCR_MULTICAST : 0); + (rw_flag == FW_REG_READ ? GEN11_MCR_MULTICAST : 0)); } else if (GRAPHICS_VER(uncore->i915) >= 11) { mcr_mask = GEN11_MCR_SLICE_MASK | GEN11_MCR_SUBSLICE_MASK; mcr_ss = GEN11_MCR_SLICE(group) | GEN11_MCR_SUBSLICE(instance);