From patchwork Mon Sep 2 17:14:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13787547 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 CB415CA0ED3 for ; Mon, 2 Sep 2024 17:14:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED22A10E372; Mon, 2 Sep 2024 17:14:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="CKRJLM6H"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F0D810E370; Mon, 2 Sep 2024 17:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725297288; x=1756833288; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h/eBfWGusjjgTjUn3KWfOe3bERc/PXX61z6Gtbm8yTA=; b=CKRJLM6HG9lTZyFps8OukcFSS3ZtLXyd4ynj3mR4wWXL+A3RHImjeaq6 j/n8ZMKmYDY0qMPcciYgRNLDF9X7/7l0/PtxieagBdOx8NTuLJJKPXgAE 5kHtMLpuP9IgzCwQXhQ2lbSL2aT9LQXVtAJ1rQWYdJz7c1PwgENd0qEYd JrSdvDXjS2/6iigGMb3cJO4T6hsojRwOOfhvzKKeCfAKvFFoXzPYK3JgY 41CWpG5wEl7NLhOEtoVzNY37PsVEkoqlnSCk/4GnAEqJwvjALMwhO7iK0 eBSQ8Oj50dyIJY7EUlIOVnvUuflfWpp8KsltFaqqpK/EEm+3L1NigpIpr Q==; X-CSE-ConnectionGUID: QZYuqzvMSLa1TqxQTZKvqg== X-CSE-MsgGUID: y5DmIlOnQUCd0cxmGfZiNg== X-IronPort-AV: E=McAfee;i="6700,10204,11183"; a="23690157" X-IronPort-AV: E=Sophos;i="6.10,196,1719903600"; d="scan'208";a="23690157" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2024 10:14:48 -0700 X-CSE-ConnectionGUID: 4ZVYpLtxRvCGCYXcS5GfWA== X-CSE-MsgGUID: 7jHyOOZYQZeTXhSJJFqCbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,196,1719903600"; d="scan'208";a="95382323" Received: from ltuz-desk.ger.corp.intel.com (HELO localhost) ([10.245.246.4]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2024 10:14:46 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, rodrigo.vivi@intel.com, lucas.demarchi@intel.com Subject: [PATCH 4/8] drm/xe/pciids: separate RPL-U and RPL-P PCI IDs Date: Mon, 2 Sep 2024 20:14:03 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Avoid including PCI IDs for one platform to the PCI IDs of another. It's more clear to deal with them completely separately at the PCI ID macro level. Signed-off-by: Jani Nikula --- drivers/gpu/drm/xe/xe_pci.c | 1 + include/drm/intel/xe_pciids.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index c05ca61787be..b1cf21d77def 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -387,6 +387,7 @@ static const struct pci_device_id pciidlist[] = { XE_ADLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc), XE_ADLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc), XE_ADLN_IDS(INTEL_VGA_DEVICE, &adl_n_desc), + XE_RPLU_IDS(INTEL_VGA_DEVICE, &adl_p_desc), XE_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc), XE_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc), XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc), diff --git a/include/drm/intel/xe_pciids.h b/include/drm/intel/xe_pciids.h index 41617c5ac6ab..334ab02ed6ca 100644 --- a/include/drm/intel/xe_pciids.h +++ b/include/drm/intel/xe_pciids.h @@ -122,7 +122,6 @@ /* RPL-P */ #define XE_RPLP_IDS(MACRO__, ...) \ - XE_RPLU_IDS(MACRO__, ## __VA_ARGS__), \ MACRO__(0xA720, ## __VA_ARGS__), \ MACRO__(0xA7A0, ## __VA_ARGS__), \ MACRO__(0xA7A8, ## __VA_ARGS__), \