[PATCH 1/3] drm/radeon: Make CIK support in Radeon conditional (v2)

[Emil Velikov]

On 7 April 2017 at 21:15, Felix Kuehling <Felix.Kuehling at amd.com> wrote:
> Advertise CIK PCI IDs only when they are not supported by amdgpu.
> Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in
> the kernel config keeps both drivers in sync.
>
> This is the simplest possible change. A more complete solution
> may want to conditionally disable more CIK-specific code in the
> Radeon driver.
>
> v2: Add CONFIG_DRM_RADEON_FORCE_CIK option
>
> Signed-off-by: Felix Kuehling <Felix.Kuehling at amd.com>
> ---
>  drivers/gpu/drm/radeon/Kconfig      |  12 ++++
>  drivers/gpu/drm/radeon/radeon_drv.c |   3 +
>  include/drm/drm_pciids.h            | 114 ++++++++++++++++++------------------
>  3 files changed, 73 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
> index 9909f5c..86bbac8 100644
> --- a/drivers/gpu/drm/radeon/Kconfig
> +++ b/drivers/gpu/drm/radeon/Kconfig
> @@ -1,3 +1,15 @@
> +config DRM_RADEON_FORCE_CIK
> +       bool "Enable radeon support for CIK parts even when amdgpu supports it"
> +       depends on DRM_RADEON && DRM_AMDGPU_CIK

Something looks a bit wrong here, and the rest of the series.

As-is, RADEON CIK is disabled when AMDGPU/AMDGPU CIK is _not_ set.
In other words - people who build only RADEON will end up with "broken" system.

Shouldn't the DRM_RADEON_FORCE_CIK DRM_AMDGPU_CIK options be mutually
explosive ?
Such that only one driver can claim/use the hardware. Otherwise you
will get both drivers fighting for control.

Thanks
Emil