Re: [PATCH] drm: Move radeon and amdgpu Kconfig options into their directories

[Andrew Davis <afd@ti.com>]

On 8/22/22 7:06 PM, Randy Dunlap wrote:
> Hi--
> 
> On 8/22/22 17:01, Andrew Davis wrote:
>> Most Kconfig options to enable a driver are in the Kconfig file
>> inside the relevant directory, move these two to the same.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   drivers/gpu/drm/Kconfig            | 42 ------------------------------
>>   drivers/gpu/drm/amd/amdgpu/Kconfig | 22 ++++++++++++++++
>>   drivers/gpu/drm/radeon/Kconfig     | 22 ++++++++++++++++
>>   3 files changed, 44 insertions(+), 42 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>> index 6c2256e8474b..24fa9ccd92a4 100644
>> --- a/drivers/gpu/drm/Kconfig
>> +++ b/drivers/gpu/drm/Kconfig
>> @@ -234,50 +234,8 @@ source "drivers/gpu/drm/i2c/Kconfig"
>>   
>>   source "drivers/gpu/drm/arm/Kconfig"
>>   
>> -config DRM_RADEON
>> -	tristate "ATI Radeon"
>> -	depends on DRM && PCI && MMU
>> -	depends on AGP || !AGP
>> -	select FW_LOADER
>> -	select DRM_DISPLAY_DP_HELPER
>> -	select DRM_DISPLAY_HELPER
>> -        select DRM_KMS_HELPER
>> -        select DRM_TTM
>> -	select DRM_TTM_HELPER
>> -	select POWER_SUPPLY
>> -	select HWMON
>> -	select BACKLIGHT_CLASS_DEVICE
>> -	select INTERVAL_TREE
>> -	help
>> -	  Choose this option if you have an ATI Radeon graphics card.  There
>> -	  are both PCI and AGP versions.  You don't need to choose this to
>> -	  run the Radeon in plain VGA mode.
>> -
>> -	  If M is selected, the module will be called radeon.
>> -
>>   source "drivers/gpu/drm/radeon/Kconfig"
>>   
>> -config DRM_AMDGPU
>> -	tristate "AMD GPU"
>> -	depends on DRM && PCI && MMU
>> -	select FW_LOADER
>> -	select DRM_DISPLAY_DP_HELPER
>> -	select DRM_DISPLAY_HDMI_HELPER
>> -	select DRM_DISPLAY_HELPER
>> -	select DRM_KMS_HELPER
>> -	select DRM_SCHED
>> -	select DRM_TTM
>> -	select DRM_TTM_HELPER
>> -	select POWER_SUPPLY
>> -	select HWMON
>> -	select BACKLIGHT_CLASS_DEVICE
>> -	select INTERVAL_TREE
>> -	select DRM_BUDDY
>> -	help
>> -	  Choose this option if you have a recent AMD Radeon graphics card.
>> -
>> -	  If M is selected, the module will be called amdgpu.
>> -
>>   source "drivers/gpu/drm/amd/amdgpu/Kconfig"
>>   
>>   source "drivers/gpu/drm/nouveau/Kconfig"
>> diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
>> index 7777d55275de..36b1206124cf 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/Kconfig
>> +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
>> @@ -1,4 +1,26 @@
>>   # SPDX-License-Identifier: MIT
>> +
>> +config DRM_AMDGPU
>> +	tristate "AMD GPU"
>> +	depends on DRM && PCI && MMU
>> +	select FW_LOADER
>> +	select DRM_DISPLAY_DP_HELPER
>> +	select DRM_DISPLAY_HDMI_HELPER
>> +	select DRM_DISPLAY_HELPER
>> +	select DRM_KMS_HELPER
>> +	select DRM_SCHED
>> +	select DRM_TTM
>> +	select DRM_TTM_HELPER
>> +	select POWER_SUPPLY
>> +	select HWMON
>> +	select BACKLIGHT_CLASS_DEVICE
>> +	select INTERVAL_TREE
>> +	select DRM_BUDDY
>> +	help
>> +	  Choose this option if you have a recent AMD Radeon graphics card.
>> +
>> +	  If M is selected, the module will be called amdgpu.
>> +
>>   config DRM_AMDGPU_SI
>>   	bool "Enable amdgpu support for SI parts"
>>   	depends on DRM_AMDGPU
>> diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
>> index 52819e7f1fca..3248d12c562d 100644
>> --- a/drivers/gpu/drm/radeon/Kconfig
>> +++ b/drivers/gpu/drm/radeon/Kconfig
>> @@ -1,4 +1,26 @@
>>   # SPDX-License-Identifier: MIT
>> +
>> +config DRM_RADEON
>> +	tristate "ATI Radeon"
>> +	depends on DRM && PCI && MMU
>> +	depends on AGP || !AGP
>> +	select FW_LOADER
>> +	select DRM_DISPLAY_DP_HELPER
>> +	select DRM_DISPLAY_HELPER
>> +        select DRM_KMS_HELPER
>> +        select DRM_TTM
> 
> Would you change those 2 lines above to use one tab + 2 spaces
> for indentation, please?
> 


Sure, I just copy/paste exactly as they are in the top level Kconfig,
white-space issues and all, to make it easy to see that nothing was changed.

I can fix the indent issue in a followup patch if that work better.
Whichever works better.

Andrew


>> +	select DRM_TTM_HELPER
>> +	select POWER_SUPPLY
>> +	select HWMON
>> +	select BACKLIGHT_CLASS_DEVICE
>> +	select INTERVAL_TREE
>> +	help
>> +	  Choose this option if you have an ATI Radeon graphics card.  There
>> +	  are both PCI and AGP versions.  You don't need to choose this to
>> +	  run the Radeon in plain VGA mode.
>> +
>> +	  If M is selected, the module will be called radeon.
>> +
>>   config DRM_RADEON_USERPTR
>>   	bool "Always enable userptr support"
>>   	depends on DRM_RADEON
>