linux-pikaos-template/patches/nobara-rebased/amdgpu-si-cik-default.patch

64 lines
2.3 KiB
Diff
Raw Normal View History

2023-11-04 19:46:45 +01:00
diff '--color=auto' -uraN cachyos/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c cachyos-amdgpu/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
--- cachyos/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 2023-10-30 05:31:08.000000000 +0300
+++ cachyos-amdgpu/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 2023-11-04 18:03:47.475158392 +0300
@@ -582,15 +582,11 @@
2023-02-24 09:12:59 +01:00
*/
#ifdef CONFIG_DRM_AMDGPU_SI
2023-11-04 19:37:27 +01:00
2023-11-04 19:46:45 +01:00
-#if IS_ENABLED(CONFIG_DRM_RADEON) || IS_ENABLED(CONFIG_DRM_RADEON_MODULE)
2023-02-24 09:12:59 +01:00
-int amdgpu_si_support = 0;
-MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))");
-#else
int amdgpu_si_support = 1;
MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
-#endif
2023-11-04 19:46:45 +01:00
2023-02-24 09:12:59 +01:00
module_param_named(si_support, amdgpu_si_support, int, 0444);
+
#endif
2023-11-04 19:37:27 +01:00
2023-02-24 09:12:59 +01:00
/**
2023-11-04 19:46:45 +01:00
@@ -601,15 +597,11 @@
2023-02-24 09:12:59 +01:00
*/
#ifdef CONFIG_DRM_AMDGPU_CIK
2023-11-04 19:37:27 +01:00
2023-11-04 19:46:45 +01:00
-#if IS_ENABLED(CONFIG_DRM_RADEON) || IS_ENABLED(CONFIG_DRM_RADEON_MODULE)
2023-02-24 09:12:59 +01:00
-int amdgpu_cik_support = 0;
-MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");
-#else
int amdgpu_cik_support = 1;
MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");
-#endif
2023-11-04 19:46:45 +01:00
2023-02-24 09:12:59 +01:00
module_param_named(cik_support, amdgpu_cik_support, int, 0444);
+
#endif
2023-11-04 19:37:27 +01:00
2023-02-24 09:12:59 +01:00
/**
2023-11-04 19:46:45 +01:00
diff '--color=auto' -uraN cachyos/drivers/gpu/drm/radeon/radeon_drv.c cachyos-amdgpu/drivers/gpu/drm/radeon/radeon_drv.c
--- cachyos/drivers/gpu/drm/radeon/radeon_drv.c 2023-10-30 05:31:08.000000000 +0300
+++ cachyos-amdgpu/drivers/gpu/drm/radeon/radeon_drv.c 2023-11-04 18:00:50.099902000 +0300
@@ -239,12 +239,22 @@
2023-02-24 09:12:59 +01:00
MODULE_PARM_DESC(vce, "vce enable/disable vce support (1 = enable, 0 = disable)");
module_param_named(vce, radeon_vce, int, 0444);
2023-11-04 19:37:27 +01:00
2023-02-24 09:12:59 +01:00
+#ifdef CONFIG_DRM_AMDGPU_SI
+int radeon_si_support = 0;
+MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))");
+#else
int radeon_si_support = 1;
MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
+#endif
module_param_named(si_support, radeon_si_support, int, 0444);
2023-11-04 19:37:27 +01:00
2023-02-24 09:12:59 +01:00
+#ifdef CONFIG_DRM_AMDGPU_CIK
+int radeon_cik_support = 0;
+MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");
+#else
int radeon_cik_support = 1;
MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");
+#endif
module_param_named(cik_support, radeon_cik_support, int, 0444);
2023-11-04 19:37:27 +01:00
2023-02-24 09:12:59 +01:00
static struct pci_device_id pciidlist[] = {