Skip to content

Commit d1f188b

Browse files
Timur Kristófalexdeucher
authored andcommitted
drm/amdgpu: Use amdgpu by default for CIK APUs too
CIK APUs are: Kaveri, Kabini and Mullins from 2013~2015, which all have a second generation GCN based integrated GPU. The amdgpu driver has been working well on CIK APUs for years. Features which were previously missing have been added recently, specifically DC support for analog connectors and DP bridge encoders. Now amdgpu is at feature parity with the old radeon driver on CIK APUs. Enabling the amdgpu driver by default for CIK APUs has the following benefits: - More stable OpenGL support through RadeonSI - Vulkan support through RADV - Improved performance - Better display features through DC Users who want to keep using the old driver can do so using: amdgpu.cik_support=0 radeon.cik_support=1 Signed-off-by: Timur Kristóf <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent a097dd7 commit d1f188b

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -641,9 +641,7 @@ module_param_named(si_support, amdgpu_si_support, int, 0444);
641641
* CIK (Sea Islands) are second generation GCN GPUs, supported by both
642642
* drivers: radeon (old) and amdgpu (new). This parameter controls whether
643643
* amdgpu should support CIK.
644-
* By default:
645-
* - CIK dedicated GPUs are supported by amdgpu.
646-
* - CIK APUs are supported by radeon (except when radeon is not built).
644+
* By default, CIK dedicated GPUs and APUs are supported by amdgpu.
647645
* Only relevant when CONFIG_DRM_AMDGPU_CIK is enabled to build CIK support in amdgpu.
648646
* See also radeon.cik_support which should be disabled when amdgpu.cik_support is
649647
* enabled, and vice versa.
@@ -2323,15 +2321,14 @@ static bool amdgpu_support_enabled(struct device *dev,
23232321

23242322
case CHIP_BONAIRE:
23252323
case CHIP_HAWAII:
2326-
support_by_default = true;
2327-
fallthrough;
23282324
case CHIP_KAVERI:
23292325
case CHIP_KABINI:
23302326
case CHIP_MULLINS:
23312327
gen = "CIK";
23322328
param = "cik_support";
23332329
module_param = amdgpu_cik_support;
23342330
amdgpu_support_built = IS_ENABLED(CONFIG_DRM_AMDGPU_CIK);
2331+
support_by_default = true;
23352332
break;
23362333

23372334
default:

drivers/gpu/drm/radeon/radeon_drv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,14 +278,13 @@ static bool radeon_support_enabled(struct device *dev,
278278

279279
case CHIP_BONAIRE:
280280
case CHIP_HAWAII:
281-
support_by_default = false;
282-
fallthrough;
283281
case CHIP_KAVERI:
284282
case CHIP_KABINI:
285283
case CHIP_MULLINS:
286284
gen = "CIK";
287285
module_param = radeon_cik_support;
288286
amdgpu_support_built &= IS_ENABLED(CONFIG_DRM_AMDGPU_CIK);
287+
support_by_default = false;
289288
break;
290289

291290
default:

0 commit comments

Comments
 (0)