[PATCH] drm/i915: move a Kconfig symbol to unbreak the menu presentation

[Randy Dunlap]

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 <rdunlap at infradead.org>
>> Cc: Christoph Hellwig <hch at lst.de>
>> Cc: Zhi Wang <zhi.a.wang at intel.com>
>> Cc: Jani Nikula <jani.nikula at linux.intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
>> Cc: Zhenyu Wang <zhenyuw at linux.intel.com>
>> Cc: intel-gfx at lists.freedesktop.org
>> Cc: intel-gvt-dev at lists.freedesktop.org
>> Cc: dri-devel at lists.freedesktop.org
>> ---
>>  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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xconfig-aft-patch.png
Type: image/png
Size: 176376 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230216/d5e53944/attachment-0006.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xconfig-b4-patch.png
Type: image/png
Size: 170454 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230216/d5e53944/attachment-0007.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gconfig-aft-patch.png
Type: image/png
Size: 94579 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230216/d5e53944/attachment-0008.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gconfig-b4-patch.png
Type: image/png
Size: 89000 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230216/d5e53944/attachment-0009.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nconfig-aft-patch.png
Type: image/png
Size: 93714 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230216/d5e53944/attachment-0010.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nconfig-b4-patch.png
Type: image/png
Size: 93718 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230216/d5e53944/attachment-0011.png>