diff mbox series

drm/i915/adlp: Restoring ADL-P/RPL-U IDs.

Message ID 20230224163444.818286-1-rodrigo.vivi@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/adlp: Restoring ADL-P/RPL-U IDs. | expand

Commit Message

Rodrigo Vivi Feb. 24, 2023, 4:34 p.m. UTC
Some PCI IDs got accidentally removed when subplatform was added.

Fixes: 61b795a9c352 ("drm/i915: Add RPL-U sub platform")
Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Matt Roper Feb. 25, 2023, 12:11 a.m. UTC | #1
On Fri, Feb 24, 2023 at 11:34:44AM -0500, Rodrigo Vivi wrote:
> Some PCI IDs got accidentally removed when subplatform was added.

I don't think they got removed?  INTEL_RPLP_IDS still includes the
entire INTEL_RPLU_IDS list:

	/* RPL-P */
	#define INTEL_RPLP_IDS(info) \
		INTEL_RPLU_IDS(info), \
		INTEL_VGA_DEVICE(0xA720, info), \
		INTEL_VGA_DEVICE(0xA7A0, info), \
		INTEL_VGA_DEVICE(0xA7A8, info)

so the change below is just adding them to the list a second time.


Matt

> 
> Fixes: 61b795a9c352 ("drm/i915: Add RPL-U sub platform")
> Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index a8d942b16223..d2dc81848e3b 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -1235,6 +1235,7 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_DG1_IDS(&dg1_info),
>  	INTEL_RPLS_IDS(&adl_s_info),
>  	INTEL_RPLP_IDS(&adl_p_info),
> +	INTEL_RPLU_IDS(&adl_p_info),
>  	INTEL_DG2_IDS(&dg2_info),
>  	INTEL_ATS_M_IDS(&ats_m_info),
>  	INTEL_MTL_IDS(&mtl_info),
> -- 
> 2.39.1
>
Chaitanya Kumar Borah Feb. 25, 2023, 8:14 a.m. UTC | #2
Hello Rodrigo,

> -----Original Message-----
> From: Vivi, Rodrigo <rodrigo.vivi@intel.com>
> Sent: Friday, February 24, 2023 10:05 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Borah, Chaitanya Kumar
> <chaitanya.kumar.borah@intel.com>; Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH] drm/i915/adlp: Restoring ADL-P/RPL-U IDs.
> 
> Some PCI IDs got accidentally removed when subplatform was added.
> 
> Fixes: 61b795a9c352 ("drm/i915: Add RPL-U sub platform")
> Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c
> b/drivers/gpu/drm/i915/i915_pci.c index a8d942b16223..d2dc81848e3b
> 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -1235,6 +1235,7 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_DG1_IDS(&dg1_info),
>  	INTEL_RPLS_IDS(&adl_s_info),
>  	INTEL_RPLP_IDS(&adl_p_info),
> +	INTEL_RPLU_IDS(&adl_p_info),

In "drm/i915: Add RPL-U sub platform", the RPLU IDs were added to INTEL_RPLP_IDS. This should make sure that RPL-U IDs were included under RPL-P platform. Is this change really required?

+/* RPL-U */
+#define INTEL_RPLU_IDS(info) \
+	INTEL_VGA_DEVICE(0xA721, info), \
+	INTEL_VGA_DEVICE(0xA7A1, info), \
+	INTEL_VGA_DEVICE(0xA7A9, info)
+
 /* RPL-P */
 #define INTEL_RPLP_IDS(info) \
+	INTEL_RPLU_IDS(info), \
 	INTEL_VGA_DEVICE(0xA720, info), \
-	INTEL_VGA_DEVICE(0xA721, info), \
 	INTEL_VGA_DEVICE(0xA7A0, info), \
-	INTEL_VGA_DEVICE(0xA7A1, info), \
-	INTEL_VGA_DEVICE(0xA7A8, info), \
-	INTEL_VGA_DEVICE(0xA7A9, info)
+	INTEL_VGA_DEVICE(0xA7A8, info)

Regards

Chaitanya

>  	INTEL_DG2_IDS(&dg2_info),
>  	INTEL_ATS_M_IDS(&ats_m_info),
>  	INTEL_MTL_IDS(&mtl_info),
> --
> 2.39.1
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index a8d942b16223..d2dc81848e3b 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1235,6 +1235,7 @@  static const struct pci_device_id pciidlist[] = {
 	INTEL_DG1_IDS(&dg1_info),
 	INTEL_RPLS_IDS(&adl_s_info),
 	INTEL_RPLP_IDS(&adl_p_info),
+	INTEL_RPLU_IDS(&adl_p_info),
 	INTEL_DG2_IDS(&dg2_info),
 	INTEL_ATS_M_IDS(&ats_m_info),
 	INTEL_MTL_IDS(&mtl_info),