Skip to contentSkip to conversation

Fix two issues pointed by LKP

PATCH In review Mauro Carvalho Chehab 4 participants 7 messages Oct 20, 2023 – Oct 24, 2023

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover Fix two issues pointed by LKP

From: Mauro Carvalho Chehab <[email protected]>

LKP reported two issues on Xe driver:

1. the Kconfig dependencies are wrong for non-X86 archs;
2. xe_display_misc has a non-static function without a prototype, which isn't used anywhere.

Address both issues to close https://lore.kernel.org/oe-kbuild-all/[email protected]/

Mauro Carvalho Chehab (2):
misc: mei: fix Kconfig dependencies
drm: xe: xe_display_misc: fix build with W=1

 drivers/gpu/drm/xe/display/xe_display_misc.c | 2 +-
 drivers/misc/mei/gsc_proxy/Kconfig           | 1 +
 drivers/misc/mei/hdcp/Kconfig                | 1 +
 drivers/misc/mei/pxp/Kconfig                 | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.41.0
#1 lore raw

PATCH 1/2 misc: mei: fix Kconfig dependencies

From: Mauro Carvalho Chehab <[email protected]>

The dependency chain for INTEL_MEI is not properly addressed, as reported by LKP:

WARNING: unmet direct dependencies detected for INTEL_MEI_ME Depends on [n]: X86 && PCI [=y]
Selected by [y]:
- INTEL_MEI_HDCP [=y] && (DRM_I915 [=n] || DRM_XE [=y])

Basically, all symbols selecting INTEL_MEI shall also depends on both X86 and PCI.

Add such dependency, as otherwise the dependencies won't be properly followed.

---
 drivers/misc/mei/gsc_proxy/Kconfig | 1 +
 drivers/misc/mei/hdcp/Kconfig      | 1 +
 drivers/misc/mei/pxp/Kconfig       | 1 +
 3 files changed, 3 insertions(+)
drivers/misc/mei/gsc_proxy/Kconfig +1 -0
index 5f68d9f3d691..6053ebbf536d 100644
@@ -4,6 +4,7 @@
 config INTEL_MEI_GSC_PROXY
 	tristate "Intel GSC Proxy services of ME Interface"
 	select INTEL_MEI_ME
+	depends on X86 && PCI
 	depends on DRM_I915
 	help
          MEI Support for GSC Proxy Services on Intel platforms.
drivers/misc/mei/hdcp/Kconfig +1 -0
index 2ac9148988d4..a5e8d3e9fc92 100644
@@ -4,6 +4,7 @@
 config INTEL_MEI_HDCP
 	tristate "Intel HDCP2.2 services of ME Interface"
 	select INTEL_MEI_ME
+	depends on X86 && PCI
 	depends on DRM_I915 || DRM_XE
 	help
 	  MEI Support for HDCP2.2 Services on Intel platforms.
drivers/misc/mei/pxp/Kconfig +1 -0
index 4029b96afc04..3acc05fea744 100644
@@ -4,6 +4,7 @@
 #
 config INTEL_MEI_PXP
 	tristate "Intel PXP services of ME Interface"
+	depends on X86 && PCI
 	select INTEL_MEI_ME
 	depends on DRM_I915
 	help
Signature · 1 line
2.41.0
Reviewed-by on v1 1/2
#2 lore raw

Re: [Intel-xe] [PATCH 1/2] misc: mei: fix Kconfig dependencies

Quoted 13 lines · Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

The dependency chain for INTEL_MEI is not properly addressed, as reported by LKP:

WARNING: unmet direct dependencies detected for INTEL_MEI_ME Depends on [n]: X86 && PCI [=y]
Selected by [y]:
- INTEL_MEI_HDCP [=y] && (DRM_I915 [=n] || DRM_XE [=y])

Basically, all symbols selecting INTEL_MEI shall also depends on both X86 and PCI.

Quoted 6 lines

Add such dependency, as otherwise the dependencies won't be properly followed.

Quoted 45 lines
---
 drivers/misc/mei/gsc_proxy/Kconfig | 1 +
 drivers/misc/mei/hdcp/Kconfig      | 1 +
 drivers/misc/mei/pxp/Kconfig       | 1 +
 3 files changed, 3 insertions(+)
drivers/misc/mei/gsc_proxy/Kconfig +1 -0
index 5f68d9f3d691..6053ebbf536d 100644
@@ -4,6 +4,7 @@
 config INTEL_MEI_GSC_PROXY
 	tristate "Intel GSC Proxy services of ME Interface"
 	select INTEL_MEI_ME
+	depends on X86 && PCI
 	depends on DRM_I915
 	help
          MEI Support for GSC Proxy Services on Intel platforms.
drivers/misc/mei/hdcp/Kconfig +1 -0
index 2ac9148988d4..a5e8d3e9fc92 100644
@@ -4,6 +4,7 @@
 config INTEL_MEI_HDCP
 	tristate "Intel HDCP2.2 services of ME Interface"
 	select INTEL_MEI_ME
+	depends on X86 && PCI
 	depends on DRM_I915 || DRM_XE
 	help
 	  MEI Support for HDCP2.2 Services on Intel platforms.
drivers/misc/mei/pxp/Kconfig +1 -0
index 4029b96afc04..3acc05fea744 100644
@@ -4,6 +4,7 @@
 #
 config INTEL_MEI_PXP
 	tristate "Intel PXP services of ME Interface"
+	depends on X86 && PCI
 	select INTEL_MEI_ME
 	depends on DRM_I915
 	help
Signature · 1 line
2.41.0
maintainer
#3 lore raw

Re: [Intel-xe] [PATCH 1/2] misc: mei: fix Kconfig dependencies

In reply to Mauro Carvalho Chehab
Quoted 10 lines · Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

The dependency chain for INTEL_MEI is not properly addressed, as reported by LKP:

WARNING: unmet direct dependencies detected for INTEL_MEI_ME Depends on [n]: X86 && PCI [=y]
Selected by [y]:
- INTEL_MEI_HDCP [=y] && (DRM_I915 [=n] || DRM_XE [=y])

Quoted 5 lines

Basically, all symbols selecting INTEL_MEI shall also depends on both X86 and PCI.

Add such dependency, as otherwise the dependencies won't be properly followed.

This must *not* be applied to drm-xe-next directly. Get it merged upstream first, and backport with cherry-pick -x annotation if needed.

BR,
Jani

Quoted 46 lines
---
 drivers/misc/mei/gsc_proxy/Kconfig | 1 +
 drivers/misc/mei/hdcp/Kconfig      | 1 +
 drivers/misc/mei/pxp/Kconfig       | 1 +
 3 files changed, 3 insertions(+)
drivers/misc/mei/gsc_proxy/Kconfig +1 -0
index 5f68d9f3d691..6053ebbf536d 100644
@@ -4,6 +4,7 @@
 config INTEL_MEI_GSC_PROXY
 	tristate "Intel GSC Proxy services of ME Interface"
 	select INTEL_MEI_ME
+	depends on X86 && PCI
 	depends on DRM_I915
 	help
          MEI Support for GSC Proxy Services on Intel platforms.
drivers/misc/mei/hdcp/Kconfig +1 -0
index 2ac9148988d4..a5e8d3e9fc92 100644
@@ -4,6 +4,7 @@
 config INTEL_MEI_HDCP
 	tristate "Intel HDCP2.2 services of ME Interface"
 	select INTEL_MEI_ME
+	depends on X86 && PCI
 	depends on DRM_I915 || DRM_XE
 	help
 	  MEI Support for HDCP2.2 Services on Intel platforms.
drivers/misc/mei/pxp/Kconfig +1 -0
index 4029b96afc04..3acc05fea744 100644
@@ -4,6 +4,7 @@
 #
 config INTEL_MEI_PXP
 	tristate "Intel PXP services of ME Interface"
+	depends on X86 && PCI
 	select INTEL_MEI_ME
 	depends on DRM_I915
 	help
Signature · 1 line
Jani Nikula, Intel
#4 lore raw

PATCH 2/2 drm: xe: xe_display_misc: fix build with W=1

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

As reported by LKP, when the Xe driver is built with W=1, a warning will be produced:

>> drivers/gpu/drm/xe/display/xe_display_misc.c:10:14: warning: no previous prototype for 'intel_gmch_vga_set_decode' [-Wmissing-prototypes]
10 | unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
| ^~~~~~~~~~~~~~~~~~~~~~~~~

Currently, such function is just a stub, not used anywhere. Yet, it is declared there without a prototype. As this is just a reminder for something that will be implemented in the future, change it to static and add __maybe_unused to disable compiler warnings on it.

---
 drivers/gpu/drm/xe/display/xe_display_misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/display/xe_display_misc.c +1 -1
index 81ff97e704ea..53a53e500a09 100644
@@ -7,7 +7,7 @@
 
 struct pci_dev;
 
-unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
+__maybe_unused static unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
 {
 	/* ToDo: Implement the actual handling of vga decode */
 	return 0;
Signature · 1 line
2.41.0
maintainer
#5 lore raw

Re: [Intel-xe] [PATCH 2/2] drm: xe: xe_display_misc: fix build with W=1

Quoted 9 lines · Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

As reported by LKP, when the Xe driver is built with W=1, a warning will be produced:

>> drivers/gpu/drm/xe/display/xe_display_misc.c:10:14: warning: no previous prototype for 'intel_gmch_vga_set_decode' [-Wmissing-prototypes]
10 | unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
| ^~~~~~~~~~~~~~~~~~~~~~~~~

Quoted 5 lines

Currently, such function is just a stub, not used anywhere. Yet, it is declared there without a prototype. As this is just a reminder for something that will be implemented in the future, change it to static and add __maybe_unused to disable compiler warnings on it.

Please just include the header with the prototype.

BR,
Jani.

Quoted 21 lines
---
 drivers/gpu/drm/xe/display/xe_display_misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/display/xe_display_misc.c +1 -1
index 81ff97e704ea..53a53e500a09 100644
@@ -7,7 +7,7 @@
 
 struct pci_dev;
 
-unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
+__maybe_unused static unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
 {
 	/* ToDo: Implement the actual handling of vga decode */
 	return 0;
Signature · 1 line
Jani Nikula, Intel
#6 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for Fix two issues pointed by LKP

In reply to Mauro Carvalho Chehab
== Series Details ==

== Series Details ==

Series: Fix two issues pointed by LKP
URL : https://patchwork.freedesktop.org/series/125383/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 4354e27ef drm/xe: Simplify xe_res_get_buddy() === git am output follows ===
Applying: misc: mei: fix Kconfig dependencies
Applying: drm: xe: xe_display_misc: fix build with W=1