From patchwork Tue Oct 29 09:30:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13854562 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 6F523D2AB01 for ; Tue, 29 Oct 2024 09:30:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8BC610E5F3; Tue, 29 Oct 2024 09:30:46 +0000 (UTC) Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [195.130.132.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id E32EF10E5F3 for ; Tue, 29 Oct 2024 09:30:45 +0000 (UTC) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4Xd4kC2pYyz4x4jt for ; Tue, 29 Oct 2024 10:30:43 +0100 (CET) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:f139:988f:a76d:7a3f]) by xavier.telenet-ops.be with cmsmtp id W9Wd2D0085E9xN5019Wdvx; Tue, 29 Oct 2024 10:30:43 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1t5iYN-005noj-La; Tue, 29 Oct 2024 10:30:36 +0100 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1t5iYe-002W9M-Qx; Tue, 29 Oct 2024 10:30:36 +0100 From: Geert Uytterhoeven To: Dave Airlie , Lucas De Marchi , Matt Roper , Gustavo Sousa , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Simona Vetter , David Airlie Cc: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH drm-next] drm/xe/xe2: Remove duplicate XE2LPM_* register definitions Date: Tue, 29 Oct 2024 10:30:33 +0100 Message-Id: <20241029093033.600098-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Merging commits e1f813947ccf2326 ("drm/xe/xe2: Extend performance tuning to media GT") and 876253165f3eaaac ("drm/xe/xe2: Add performance tuning for L3 cache flushing") with their upstream counterparts 6ef5a04221aaeb85 and 3bf90935aafc750c accidentally left multiple identical copies of the XE2LPM_L3SQCREG2, XE2LPM_L3SQCREG3, and XE2LPM_SCRATCH3_LBCF register definitions. Fixes: 26bb2dc102783fef ("Merge tag 'drm-xe-next-2024-10-10' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next") Signed-off-by: Geert Uytterhoeven Acked-by: Lucas De Marchi --- drivers/gpu/drm/xe/regs/xe_gt_regs.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h index d428d04164d9d3df..42dc55cb23f4a334 100644 --- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h @@ -410,12 +410,6 @@ #define XE2LPM_SCRATCH3_LBCF XE_REG_MCR(0xb654) -#define XE2LPM_L3SQCREG2 XE_REG_MCR(0xb604) - -#define XE2LPM_L3SQCREG3 XE_REG_MCR(0xb608) - -#define XE2LPM_SCRATCH3_LBCF XE_REG_MCR(0xb654) - #define XE2LPM_L3SQCREG5 XE_REG_MCR(0xb658) #define XE2_TDF_CTRL XE_REG(0xb418)