Inserting a Kconfig symbol that does not have a dependency (DRM_I915_GVT)
into a list of other symbols that do have a dependency (on DRM_I915)
breaks the driver menu presentation in 'make *config'.
Relocate the DRM_I915_GVT symbol so that it does not cause this
problem.
Fixes: 8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Zhi Wang <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: Zhenyu Wang <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/gpu/drm/i915/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -- a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -118,9 +118,6 @@ config DRM_I915_USERPTR
If in doubt, say "Y".
-config DRM_I915_GVT
- bool
-
config DRM_I915_GVT_KVMGT
tristate "Enable KVM host support Intel GVT-g graphics virtualization"
depends on DRM_I915
@@ -172,3 +169,6 @@ menu "drm/i915 Unstable Evolution"
depends on DRM_I915
source "drivers/gpu/drm/i915/Kconfig.unstable"
endmenu
+
+config DRM_I915_GVT
+ bool
On Tue, Feb 14, 2023 at 08:45:33PM -0800, Randy Dunlap wrote:
> Inserting a Kconfig symbol that does not have a dependency (DRM_I915_GVT)
> into a list of other symbols that do have a dependency (on DRM_I915)
> breaks the driver menu presentation in 'make *config'.
>
> Relocate the DRM_I915_GVT symbol so that it does not cause this
> problem.
Looks good:
Reviewed-by: Christoph Hellwig <[email protected]>
On 2023.02.14 20:45:33 -0800, Randy Dunlap wrote:
> Inserting a Kconfig symbol that does not have a dependency (DRM_I915_GVT)
> into a list of other symbols that do have a dependency (on DRM_I915)
> breaks the driver menu presentation in 'make *config'.
>
I'm not sure what's the actual failure in presentation, I'm not quite familiar
with Kconfig, could you help to elaborate?
thanks!
> Relocate the DRM_I915_GVT symbol so that it does not cause this
> problem.
>
> Fixes: 8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Christoph Hellwig <[email protected]>
> Cc: Zhi Wang <[email protected]>
> Cc: Jani Nikula <[email protected]>
> Cc: Joonas Lahtinen <[email protected]>
> Cc: Rodrigo Vivi <[email protected]>
> Cc: Tvrtko Ursulin <[email protected]>
> Cc: Zhenyu Wang <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/gpu/drm/i915/Kconfig | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff -- a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -118,9 +118,6 @@ config DRM_I915_USERPTR
>
> If in doubt, say "Y".
>
> -config DRM_I915_GVT
> - bool
> -
> config DRM_I915_GVT_KVMGT
> tristate "Enable KVM host support Intel GVT-g graphics virtualization"
> depends on DRM_I915
> @@ -172,3 +169,6 @@ menu "drm/i915 Unstable Evolution"
> depends on DRM_I915
> source "drivers/gpu/drm/i915/Kconfig.unstable"
> endmenu
> +
> +config DRM_I915_GVT
> + bool
On 2023.02.16 22:32:33 -0800, Randy Dunlap wrote:
> Hi,
>
> On 2/16/23 17:52, Zhenyu Wang wrote:
> > On 2023.02.14 20:45:33 -0800, Randy Dunlap wrote:
> >> Inserting a Kconfig symbol that does not have a dependency (DRM_I915_GVT)
> >> into a list of other symbols that do have a dependency (on DRM_I915)
> >> breaks the driver menu presentation in 'make *config'.
> >>
> >
> > I'm not sure what's the actual failure in presentation, I'm not quite familiar
> > with Kconfig, could you help to elaborate?
> >
> > thanks!
>
> For menuconfig and nconfig, it's a subtle difference. The following menu
> items are indented more after the patch (i.e., they are not indented enough
> before the patch):
>
> │ <M> Enable KVM host support Intel GVT-g graphics virtualization │
> │ [*] Enable Intel PXP support │
> │ drm/i915 Debugging ---> │
> │ drm/i915 Profile Guided Optimisation --->
>
> Same menu items for gconfig: they should all be subordinate (so indented)
> to the main
> <M> Intel 8xx/9xx/G3x/G4x/HD Graphics
> menu.
>
> For xconfig, it's worse. "drm/i915 Debugging" and "drm/i915 Profile Guided Optimisation"
> are shown on the left side window, while are of the other i915 options are shown in the
> right side window (before the patch).
> After the patch, all subordinate options are listed in the right side window under the
> main "Intel 8xx/9xx/G3x/G4x/HD Graphics" menu item.
>
> See attached photos for comparisons.
>
I wasn't awared of the wrong indentation. Thanks a lot, Randy!
Acked-by: Zhenyu Wang <[email protected]>
Hi,
On 2/16/23 17:52, Zhenyu Wang wrote:
> On 2023.02.14 20:45:33 -0800, Randy Dunlap wrote:
>> Inserting a Kconfig symbol that does not have a dependency (DRM_I915_GVT)
>> into a list of other symbols that do have a dependency (on DRM_I915)
>> breaks the driver menu presentation in 'make *config'.
>>
>
> I'm not sure what's the actual failure in presentation, I'm not quite familiar
> with Kconfig, could you help to elaborate?
>
> thanks!
For menuconfig and nconfig, it's a subtle difference. The following menu
items are indented more after the patch (i.e., they are not indented enough
before the patch):
│ <M> Enable KVM host support Intel GVT-g graphics virtualization │
│ [*] Enable Intel PXP support │
│ drm/i915 Debugging ---> │
│ drm/i915 Profile Guided Optimisation --->
Same menu items for gconfig: they should all be subordinate (so indented)
to the main
<M> Intel 8xx/9xx/G3x/G4x/HD Graphics
menu.
For xconfig, it's worse. "drm/i915 Debugging" and "drm/i915 Profile Guided Optimisation"
are shown on the left side window, while are of the other i915 options are shown in the
right side window (before the patch).
After the patch, all subordinate options are listed in the right side window under the
main "Intel 8xx/9xx/G3x/G4x/HD Graphics" menu item.
See attached photos for comparisons.
HTH.
>> Relocate the DRM_I915_GVT symbol so that it does not cause this
>> problem.
>>
>> Fixes: 8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")
>> Signed-off-by: Randy Dunlap <[email protected]>
>> Cc: Christoph Hellwig <[email protected]>
>> Cc: Zhi Wang <[email protected]>
>> Cc: Jani Nikula <[email protected]>
>> Cc: Joonas Lahtinen <[email protected]>
>> Cc: Rodrigo Vivi <[email protected]>
>> Cc: Tvrtko Ursulin <[email protected]>
>> Cc: Zhenyu Wang <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Cc: [email protected]
>> ---
>> drivers/gpu/drm/i915/Kconfig | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff -- a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
>> --- a/drivers/gpu/drm/i915/Kconfig
>> +++ b/drivers/gpu/drm/i915/Kconfig
>> @@ -118,9 +118,6 @@ config DRM_I915_USERPTR
>>
>> If in doubt, say "Y".
>>
>> -config DRM_I915_GVT
>> - bool
>> -
>> config DRM_I915_GVT_KVMGT
>> tristate "Enable KVM host support Intel GVT-g graphics virtualization"
>> depends on DRM_I915
>> @@ -172,3 +169,6 @@ menu "drm/i915 Unstable Evolution"
>> depends on DRM_I915
>> source "drivers/gpu/drm/i915/Kconfig.unstable"
>> endmenu
>> +
>> +config DRM_I915_GVT
>> + bool
--
~Randy