Skip to contentSkip to conversation

drm/i915/display: fix randconfig build

PATCH In review Jiri Slaby (SUSE) 3 participants 7 messages Oct 4, 2022 – Oct 10, 2022

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

PATCH 1/2 drm/i915/display: fix randconfig build

When DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m, the build fails:
ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_register':
intel_backlight.c:(.text+0x5587): undefined reference to `backlight_device_get_by_name'

ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_unregister':
intel_backlight.c:(.text+0x576e): undefined reference to `backlight_device_unregister'

To fix this, use IS_REACHABLE(), not IS_ENABLED() in backlight. That is, with the above config, backlight support is disabled.

Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_backlight.c | 2 +-
 drivers/gpu/drm/i915/display/intel_backlight.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +1 -1
index beba39a38c87..c1ba68796b6d 100644
@@ -825,7 +825,7 @@ void intel_backlight_enable(const struct intel_crtc_state *crtc_state,
 	mutex_unlock(&dev_priv->display.backlight.lock);
 }
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
 static u32 intel_panel_get_backlight(struct intel_connector *connector)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
drivers/gpu/drm/i915/display/intel_backlight.h +1 -1
index 339643f63897..207fe1c613d8 100644
@@ -36,7 +36,7 @@ u32 intel_backlight_invert_pwm_level(struct intel_connector *connector, u32 leve
 u32 intel_backlight_level_to_pwm(struct intel_connector *connector, u32 level);
 u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val);
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
 int intel_backlight_device_register(struct intel_connector *connector);
 void intel_backlight_device_unregister(struct intel_connector *connector);
 #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
Signature · 1 line
2.37.3
#1 lore raw

PATCH 2/2 drm/i915: remove circ_buf.h includes

The last user of macros from that include was removed in 2018 by the commit below.

Fixes 6cc42152b02b ("drm/i915: Remove support for legacy debugfs crc interface")
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 -
 drivers/gpu/drm/i915/i915_irq.c               | 1 -
 2 files changed, 2 deletions(-)
drivers/gpu/drm/i915/display/intel_pipe_crc.c +0 -1
index 8ac263f471be..9070935b0443 100644
@@ -24,7 +24,6 @@
  *
  */
 
-#include <linux/circ_buf.h>
 #include <linux/ctype.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
drivers/gpu/drm/i915/i915_irq.c +0 -1
index 86a42d9e8041..09d728b34a47 100644
@@ -28,7 +28,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/circ_buf.h>
 #include <linux/slab.h>
 #include <linux/sysrq.h>
 
Signature · 1 line
2.37.3
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] drm/i915: remove circ_buf.h includes

Quoted 13 lines · Jiri Slaby (SUSE)

The last user of macros from that include was removed in 2018 by the commit below.

Fixes 6cc42152b02b ("drm/i915: Remove support for legacy debugfs crc interface")
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Quoted 28 lines
---
 drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 -
 drivers/gpu/drm/i915/i915_irq.c               | 1 -
 2 files changed, 2 deletions(-)
drivers/gpu/drm/i915/display/intel_pipe_crc.c +0 -1
index 8ac263f471be..9070935b0443 100644
@@ -24,7 +24,6 @@
  *
  */
 
-#include <linux/circ_buf.h>
 #include <linux/ctype.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
drivers/gpu/drm/i915/i915_irq.c +0 -1
index 86a42d9e8041..09d728b34a47 100644
@@ -28,7 +28,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/circ_buf.h>
 #include <linux/slab.h>
 #include <linux/sysrq.h>
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
maintainer
#3 lore raw
In reply to Jiri Slaby (SUSE)
Quoted 9 lines · Jiri Slaby (SUSE)

When DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m, the build fails:
ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_register':
intel_backlight.c:(.text+0x5587): undefined reference to `backlight_device_get_by_name'

ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_unregister':
intel_backlight.c:(.text+0x576e): undefined reference to `backlight_device_unregister'

To fix this, use IS_REACHABLE(), not IS_ENABLED() in backlight. That is, with the above config, backlight support is disabled.

So I don't want this. I'll take a patch that fixes the dependencies to block DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m. Nobody wants that combo, and IMO using IS_REACHABLE() is a workaround to hide a broken config under the carpet.

The right thing to do is

config DRM_I915

	depends on BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=n.

We're selecting BACKLIGHT_CLASS_DEVICE because almost everyone else is too, and a combo of selecting and depending leads to circular dependencies. But depending is the right fix.

Documentation/kbuild/kconfig-language.rst:

Note:
select should be used with care. select will force a symbol to a value without visiting the dependencies. By abusing select you are able to select a symbol FOO even if FOO depends on BAR that is not set.
In general use select only for non-visible symbols (no prompts anywhere) and for symbols with no dependencies. That will limit the usefulness but on the other hand avoid the illegal configurations all over.

BR,
Jani.

Quoted 42 lines
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_backlight.c | 2 +-
 drivers/gpu/drm/i915/display/intel_backlight.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +1 -1
index beba39a38c87..c1ba68796b6d 100644
@@ -825,7 +825,7 @@ void intel_backlight_enable(const struct intel_crtc_state *crtc_state,
 	mutex_unlock(&dev_priv->display.backlight.lock);
 }
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
 static u32 intel_panel_get_backlight(struct intel_connector *connector)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
drivers/gpu/drm/i915/display/intel_backlight.h +1 -1
index 339643f63897..207fe1c613d8 100644
@@ -36,7 +36,7 @@ u32 intel_backlight_invert_pwm_level(struct intel_connector *connector, u32 leve
 u32 intel_backlight_level_to_pwm(struct intel_connector *connector, u32 level);
 u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val);
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
 int intel_backlight_device_register(struct intel_connector *connector);
 void intel_backlight_device_unregister(struct intel_connector *connector);
 #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
author
#4 lore raw
Quoted 16 lines · Jani Nikula
Quoted 9 lines · Jiri Slaby (SUSE)

When DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m, the build fails:
ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_register':
intel_backlight.c:(.text+0x5587): undefined reference to `backlight_device_get_by_name'

ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_unregister':
intel_backlight.c:(.text+0x576e): undefined reference to `backlight_device_unregister'

To fix this, use IS_REACHABLE(), not IS_ENABLED() in backlight. That is, with the above config, backlight support is disabled.

So I don't want this. I'll take a patch that fixes the dependencies to block DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m. Nobody wants that combo, and IMO using IS_REACHABLE() is a workaround to hide a broken config under the carpet.

Quoted 8 lines

The right thing to do is

config DRM_I915

	depends on BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=n.

We're selecting BACKLIGHT_CLASS_DEVICE because almost everyone else is too, and a combo of selecting and depending leads to circular dependencies. But depending is the right fix.

I'm not sure what should I do now. If I do:

drivers/gpu/drm/i915/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_I915
        depends on DRM
        depends on X86 && PCI
        depends on !PREEMPT_RT
+       depends on (BACKLIGHT_CLASS_DEVICE && ACPI) || (BACKLIGHT_CLASS_DEVICE=n && ACPI=n)
        select INTEL_GTT if X86
        select INTERVAL_TREE
        # we need shmfs for the swappable backing store, and in particular
@@ -21,7 +22,6 @@ config DRM_I915
        select IRQ_WORK
        # i915 depends on ACPI_VIDEO when ACPI is enabled
        # but for select to work, need to select ACPI_VIDEO's 

dependencies, ick
- select BACKLIGHT_CLASS_DEVICE if ACPI
select INPUT if ACPI
select X86_PLATFORM_DEVICES if ACPI
select ACPI_WMI if ACPI

I get:
drivers/gpu/drm/i915/Kconfig:2:error: recursive dependency detected! drivers/gpu/drm/i915/Kconfig:2: symbol DRM_I915 depends on BACKLIGHT_CLASS_DEVICE
drivers/video/backlight/Kconfig:143: symbol BACKLIGHT_CLASS_DEVICE is selected by DRM_FSL_DCU
drivers/gpu/drm/fsl-dcu/Kconfig:2: symbol DRM_FSL_DCU depends on COMMON_CLK
drivers/clk/Kconfig:21: symbol COMMON_CLK is selected by X86_INTEL_QUARK
arch/x86/Kconfig:633: symbol X86_INTEL_QUARK depends on X86_PLATFORM_DEVICES
drivers/platform/x86/Kconfig:6: symbol X86_PLATFORM_DEVICES is selected by DRM_I915

Those dependencies are really cumbersome :/.

Quoted 59 lines

Documentation/kbuild/kconfig-language.rst:

Note:
select should be used with care. select will force a symbol to a value without visiting the dependencies. By abusing select you are able to select a symbol FOO even if FOO depends on BAR that is not set.
In general use select only for non-visible symbols (no prompts anywhere) and for symbols with no dependencies. That will limit the usefulness but on the other hand avoid the illegal configurations all over.

BR,
Jani.

Quoted 42 lines
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
  drivers/gpu/drm/i915/display/intel_backlight.c | 2 +-
  drivers/gpu/drm/i915/display/intel_backlight.h | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +1 -1
index beba39a38c87..c1ba68796b6d 100644
@@ -825,7 +825,7 @@ void intel_backlight_enable(const struct intel_crtc_state *crtc_state,
  	mutex_unlock(&dev_priv->display.backlight.lock);
  }
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
  static u32 intel_panel_get_backlight(struct intel_connector *connector)
  {
  	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
drivers/gpu/drm/i915/display/intel_backlight.h +1 -1
index 339643f63897..207fe1c613d8 100644
@@ -36,7 +36,7 @@ u32 intel_backlight_invert_pwm_level(struct intel_connector *connector, u32 leve
  u32 intel_backlight_level_to_pwm(struct intel_connector *connector, u32 level);
  u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val);
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
  int intel_backlight_device_register(struct intel_connector *connector);
  void intel_backlight_device_unregister(struct intel_connector *connector);
  #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
Signature · 2 lines
js
suse labs
maintainer
#5 lore raw
Quoted 63 lines · Jiri Slaby
Quoted 16 lines · Jani Nikula
Quoted 9 lines · Jiri Slaby (SUSE)

When DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m, the build fails:
ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_register':
intel_backlight.c:(.text+0x5587): undefined reference to `backlight_device_get_by_name'

ld: drivers/gpu/drm/i915/display/intel_backlight.o: in function `intel_backlight_device_unregister':
intel_backlight.c:(.text+0x576e): undefined reference to `backlight_device_unregister'

To fix this, use IS_REACHABLE(), not IS_ENABLED() in backlight. That is, with the above config, backlight support is disabled.

So I don't want this. I'll take a patch that fixes the dependencies to block DRM_I915=y and BACKLIGHT_CLASS_DEVICE=m. Nobody wants that combo, and IMO using IS_REACHABLE() is a workaround to hide a broken config under the carpet.

Quoted 8 lines

The right thing to do is

config DRM_I915

	depends on BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=n.

We're selecting BACKLIGHT_CLASS_DEVICE because almost everyone else is too, and a combo of selecting and depending leads to circular dependencies. But depending is the right fix.

I'm not sure what should I do now. If I do:

drivers/gpu/drm/i915/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_I915
         depends on DRM
         depends on X86 && PCI
         depends on !PREEMPT_RT
+       depends on (BACKLIGHT_CLASS_DEVICE && ACPI) || 
 (BACKLIGHT_CLASS_DEVICE=n && ACPI=n)
         select INTEL_GTT if X86
         select INTERVAL_TREE
         # we need shmfs for the swappable backing store, and in particular
drivers/gpu/drm/i915/Kconfig +0 -0
@@ -21,7 +22,6 @@ config DRM_I915
         select IRQ_WORK
         # i915 depends on ACPI_VIDEO when ACPI is enabled
         # but for select to work, need to select ACPI_VIDEO's 

dependencies, ick
- select BACKLIGHT_CLASS_DEVICE if ACPI
select INPUT if ACPI
select X86_PLATFORM_DEVICES if ACPI
select ACPI_WMI if ACPI

I get:
drivers/gpu/drm/i915/Kconfig:2:error: recursive dependency detected! drivers/gpu/drm/i915/Kconfig:2: symbol DRM_I915 depends on BACKLIGHT_CLASS_DEVICE
drivers/video/backlight/Kconfig:143: symbol BACKLIGHT_CLASS_DEVICE is
selected by DRM_FSL_DCU
drivers/gpu/drm/fsl-dcu/Kconfig:2: symbol DRM_FSL_DCU depends on
COMMON_CLK
drivers/clk/Kconfig:21: symbol COMMON_CLK is selected by X86_INTEL_QUARK
arch/x86/Kconfig:633: symbol X86_INTEL_QUARK depends on
X86_PLATFORM_DEVICES
drivers/platform/x86/Kconfig:6: symbol X86_PLATFORM_DEVICES is selected by DRM_I915

Quoted 1 line

Those dependencies are really cumbersome :/.

Yes. They could be fixed, though [1]. IS_REACHABLE() is just band-aid.

BR,
Jani.

[1] https://lore.kernel.org/r/[email protected]

Quoted 60 lines
Quoted 60 lines

Documentation/kbuild/kconfig-language.rst:

Note:
select should be used with care. select will force a symbol to a value without visiting the dependencies. By abusing select you are able to select a symbol FOO even if FOO depends on BAR that is not set.
In general use select only for non-visible symbols (no prompts anywhere) and for symbols with no dependencies. That will limit the usefulness but on the other hand avoid the illegal configurations all over.

BR,
Jani.

Quoted 42 lines
Cc Jani Nikula <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
  drivers/gpu/drm/i915/display/intel_backlight.c | 2 +-
  drivers/gpu/drm/i915/display/intel_backlight.h | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +1 -1
index beba39a38c87..c1ba68796b6d 100644
@@ -825,7 +825,7 @@ void intel_backlight_enable(const struct intel_crtc_state *crtc_state,
  	mutex_unlock(&dev_priv->display.backlight.lock);
  }
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
  static u32 intel_panel_get_backlight(struct intel_connector *connector)
  {
  	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
drivers/gpu/drm/i915/display/intel_backlight.h +1 -1
index 339643f63897..207fe1c613d8 100644
@@ -36,7 +36,7 @@ u32 intel_backlight_invert_pwm_level(struct intel_connector *connector, u32 leve
  u32 intel_backlight_level_to_pwm(struct intel_connector *connector, u32 level);
  u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val);
 
-#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)
  int intel_backlight_device_register(struct intel_connector *connector);
  void intel_backlight_device_unregister(struct intel_connector *connector);
  #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#6 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915/display: fix randconfig build (rev2)

In reply to Jiri Slaby (SUSE)
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/display: fix randconfig build (rev2)
URL : https://patchwork.freedesktop.org/series/109542/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/109542/revisions/2/mbox/ not applied
Applying: drm/i915/display: fix randconfig build
error: corrupt patch at line 8
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/display: fix randconfig build
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".