On 11/04/17 10:38 AM, Michel Dänzer wrote: > On 11/04/17 08:21 AM, Felix Kuehling wrote: >> Provide convenient compile time and boot time options for selecting >> CIK ASIC support in either or both drivers. >> >> v2: git add missing files > > [...] > >> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig >> index 483059a..f85f81c 100644 >> --- a/drivers/gpu/drm/Kconfig >> +++ b/drivers/gpu/drm/Kconfig >> @@ -148,6 +148,57 @@ config DRM_AMDGPU >> >> source "drivers/gpu/drm/amd/amdgpu/Kconfig" >> >> +choice DRM_CIK_SUPPORT >> + prompt "Support for AMD CIK ASICs" >> + default DRM_CIK_RADEON >> + depends on DRM_AMDGPU || DRM_RADEON >> + help >> + Choose the driver used to support AMD CIK ASICs. >> + >> +config DRM_CIK_RADEON >> + bool "Radeon" >> + depends on DRM_RADEON >> + select DRM_RADEON_CIK >> + select DRM_RADEON_CIK_ENABLED >> + help >> + The Radeon driver was traditionally used to support CIK ASICs. >> + >> +config DRM_CIK_AMDGPU >> + bool "AMD GPU" >> + depends on DRM_AMDGPU >> + select DRM_AMDGPU_CIK >> + select DRM_AMDGPU_CIK_ENABLED >> + help >> + The AMD GPU driver has more active development for features and >> + performance. If you choose this driver, you also need the amdgpu >> + DDX driver for X.org. >> + >> +config DRM_CIK_BOTH_DEFAULT_RADEON >> + bool "Both, use Radeon by default" >> + depends on DRM_AMDGPU && DRM_RADEON >> + select DRM_RADEON_CIK >> + select DRM_RADEON_CIK_ENABLED >> + select DRM_AMDGPU_CIK >> + help >> + This option is useful for driver developers who want to test >> + both drivers while running the same kernel. The active driver >> + can be selected using the module parameters radeon.enable_cik >> + and amdgpu.enable_cik. >> + >> +config DRM_CIK_BOTH_DEFAULT_AMDGPU >> + bool "Both, use AMD GPU by default" >> + depends on DRM_AMDGPU && DRM_RADEON >> + select DRM_RADEON_CIK >> + select DRM_AMDGPU_CIK >> + select DRM_AMDGPU_CIK_ENABLED >> + help >> + This option is useful for driver developers who want to test >> + both drivers while running the same kernel. The active driver >> + can be selected using the module parameters radeon.enable_cik >> + and amdgpu.enable_cik. >> + >> +endchoice > > I wonder if we really need all these Kconfig options. I was thinking we > could simply always compile CIK support in amdgpu, and make > DRM_AMDGPU_CIK choose between using amdgpu or radeon by default for CIK. BTW, if we decide we do need the new options, let's call them something like DRM_AMD_CIK_* to make it clearer where they belong to. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer
