Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

kernel: 提交

kernel


Commit MetaInfo

修订版b8f6e6f8a57ae8a7246ef5ac640a359e638a2873 (tree)
时间2019-02-02 23:25:59
作者Chih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Revert "drm: amdgpu,radeon: force amdgpu for si,cik"

This reverts commit d735e330c3e3b85e9e87529e6f347a3d2d365020.

更改概述

差异

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -492,8 +492,8 @@ module_param_named(emu_mode, amdgpu_emu_mode, int, 0444);
492492 #ifdef CONFIG_DRM_AMDGPU_SI
493493
494494 #if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE)
495-int amdgpu_si_support = 1;
496-MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
495+int amdgpu_si_support = 0;
496+MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))");
497497 #else
498498 int amdgpu_si_support = 1;
499499 MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
@@ -511,8 +511,8 @@ module_param_named(si_support, amdgpu_si_support, int, 0444);
511511 #ifdef CONFIG_DRM_AMDGPU_CIK
512512
513513 #if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE)
514-int amdgpu_cik_support = 1;
515-MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");
514+int amdgpu_cik_support = 0;
515+MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");
516516 #else
517517 int amdgpu_cik_support = 1;
518518 MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -298,12 +298,12 @@ module_param_named(uvd, radeon_uvd, int, 0444);
298298 MODULE_PARM_DESC(vce, "vce enable/disable vce support (1 = enable, 0 = disable)");
299299 module_param_named(vce, radeon_vce, int, 0444);
300300
301-int radeon_si_support = 0;
302-MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))");
301+int radeon_si_support = 1;
302+MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
303303 module_param_named(si_support, radeon_si_support, int, 0444);
304304
305-int radeon_cik_support = 0;
306-MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");
305+int radeon_cik_support = 1;
306+MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");
307307 module_param_named(cik_support, radeon_cik_support, int, 0444);
308308
309309 static struct pci_device_id pciidlist[] = {
Show on old repository browser