Skip to content

Commit cbc0eb2

Browse files
committed
kernel-6.12: disable in-tree AMD GPU driver
Disable CONFIG_DRM_AMDGPU and remove related kernel modules from packaging to allow DKMS AMD driver to take precedence. Signed-off-by: Gaurav Sharma <mgsharm@amazon.com>
1 parent 7c0a2cb commit cbc0eb2

File tree

4 files changed

+5
-60
lines changed

4 files changed

+5
-60
lines changed

packages/kernel-6.12/config-bottlerocket

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,6 @@ CONFIG_INFINIBAND_USER_MAD=m
255255

256256
# Enable CephFS SELinux labels
257257
CONFIG_CEPH_FS_SECURITY_LABEL=y
258+
259+
# Disable in-tree AMD driver
260+
# CONFIG_DRM_AMDGPU is not set

packages/kernel-6.12/config-full-bottlerocket-aarch64

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3929,15 +3929,10 @@ CONFIG_DRM_DISPLAY_HELPER=m
39293929
# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
39303930
# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
39313931
CONFIG_DRM_DISPLAY_DP_HELPER=y
3932-
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
3933-
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
39343932
CONFIG_DRM_TTM=m
3935-
CONFIG_DRM_EXEC=m
3936-
CONFIG_DRM_BUDDY=m
39373933
CONFIG_DRM_TTM_HELPER=m
39383934
CONFIG_DRM_GEM_SHMEM_HELPER=m
39393935
CONFIG_DRM_SUBALLOC_HELPER=m
3940-
CONFIG_DRM_SCHED=m
39413936

39423937
#
39433938
# I2C encoder or helper chips
@@ -3957,28 +3952,7 @@ CONFIG_DRM_SCHED=m
39573952
# end of ARM devices
39583953

39593954
# CONFIG_DRM_RADEON is not set
3960-
CONFIG_DRM_AMDGPU=m
3961-
# CONFIG_DRM_AMDGPU_SI is not set
3962-
# CONFIG_DRM_AMDGPU_CIK is not set
3963-
# CONFIG_DRM_AMDGPU_USERPTR is not set
3964-
# CONFIG_DRM_AMD_ISP is not set
3965-
# CONFIG_DRM_AMDGPU_WERROR is not set
3966-
3967-
#
3968-
# ACP (Audio CoProcessor) Configuration
3969-
#
3970-
# CONFIG_DRM_AMD_ACP is not set
3971-
# end of ACP (Audio CoProcessor) Configuration
3972-
3973-
#
3974-
# Display Engine Configuration
3975-
#
3976-
CONFIG_DRM_AMD_DC=y
3977-
CONFIG_DRM_AMD_DC_FP=y
3978-
# CONFIG_DRM_AMD_SECURE_DISPLAY is not set
3979-
# end of Display Engine Configuration
3980-
3981-
# CONFIG_HSA_AMD is not set
3955+
# CONFIG_DRM_AMDGPU is not set
39823956
# CONFIG_DRM_NOUVEAU is not set
39833957
# CONFIG_DRM_XE is not set
39843958
# CONFIG_DRM_VGEM is not set

packages/kernel-6.12/config-full-bottlerocket-x86_64

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3606,15 +3606,10 @@ CONFIG_DRM_DISPLAY_HELPER=m
36063606
# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
36073607
# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
36083608
CONFIG_DRM_DISPLAY_DP_HELPER=y
3609-
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
3610-
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
36113609
CONFIG_DRM_TTM=m
3612-
CONFIG_DRM_EXEC=m
3613-
CONFIG_DRM_BUDDY=m
36143610
CONFIG_DRM_TTM_HELPER=m
36153611
CONFIG_DRM_GEM_SHMEM_HELPER=m
36163612
CONFIG_DRM_SUBALLOC_HELPER=m
3617-
CONFIG_DRM_SCHED=m
36183613

36193614
#
36203615
# I2C encoder or helper chips
@@ -3631,28 +3626,7 @@ CONFIG_DRM_SCHED=m
36313626
# end of ARM devices
36323627

36333628
# CONFIG_DRM_RADEON is not set
3634-
CONFIG_DRM_AMDGPU=m
3635-
# CONFIG_DRM_AMDGPU_SI is not set
3636-
# CONFIG_DRM_AMDGPU_CIK is not set
3637-
# CONFIG_DRM_AMDGPU_USERPTR is not set
3638-
# CONFIG_DRM_AMD_ISP is not set
3639-
# CONFIG_DRM_AMDGPU_WERROR is not set
3640-
3641-
#
3642-
# ACP (Audio CoProcessor) Configuration
3643-
#
3644-
# CONFIG_DRM_AMD_ACP is not set
3645-
# end of ACP (Audio CoProcessor) Configuration
3646-
3647-
#
3648-
# Display Engine Configuration
3649-
#
3650-
CONFIG_DRM_AMD_DC=y
3651-
CONFIG_DRM_AMD_DC_FP=y
3652-
# CONFIG_DRM_AMD_SECURE_DISPLAY is not set
3653-
# end of Display Engine Configuration
3654-
3655-
# CONFIG_HSA_AMD is not set
3629+
# CONFIG_DRM_AMDGPU is not set
36563630
# CONFIG_DRM_NOUVEAU is not set
36573631
# CONFIG_DRM_I915 is not set
36583632
# CONFIG_DRM_XE is not set

packages/kernel-6.12/kernel-6.12.spec

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -726,12 +726,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
726726
%{_cross_kmoddir}/kernel/drivers/gpu/drm/display/drm_display_helper.%{_ko}
727727
%{_cross_kmoddir}/kernel/drivers/gpu/drm/ttm/ttm.%{_ko}
728728

729-
%{_cross_kmoddir}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.%{_ko}
730-
%{_cross_kmoddir}/kernel/drivers/gpu/drm/amd/amdxcp/amdxcp.%{_ko}
731-
%{_cross_kmoddir}/kernel/drivers/gpu/drm/drm_buddy.%{_ko}
732-
%{_cross_kmoddir}/kernel/drivers/gpu/drm/drm_exec.%{_ko}
733-
%{_cross_kmoddir}/kernel/drivers/gpu/drm/scheduler/gpu-sched.%{_ko}
734-
735729
%if "%{_cross_arch}" == "x86_64"
736730
%{_cross_kmoddir}/kernel/drivers/gpu/drm/vmwgfx/vmwgfx.%{_ko}
737731
%endif

0 commit comments

Comments
 (0)