projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'xen-tip/linux-next'
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_powerplay.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index c5738a22b69041356db2ef7e488defce76db6f30..545074479e1f08a7f79461547da144e5e3239854 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@
-52,7
+52,9
@@
static int amdgpu_powerplay_init(struct amdgpu_device *adev)
pp_init->chip_family = adev->family;
pp_init->chip_id = adev->asic_type;
pp_init->device = amdgpu_cgs_create_device(adev);
pp_init->chip_family = adev->family;
pp_init->chip_id = adev->asic_type;
pp_init->device = amdgpu_cgs_create_device(adev);
- pp_init->powercontainment_enabled = amdgpu_powercontainment;
+ pp_init->rev_id = adev->pdev->revision;
+ pp_init->sub_sys_id = adev->pdev->subsystem_device;
+ pp_init->sub_vendor_id = adev->pdev->subsystem_vendor;
ret = amd_powerplay_init(pp_init, amd_pp);
kfree(pp_init);
ret = amd_powerplay_init(pp_init, amd_pp);
kfree(pp_init);
@@
-106,11
+108,10
@@
static int amdgpu_pp_early_init(void *handle)
break;
case CHIP_TONGA:
case CHIP_FIJI:
break;
case CHIP_TONGA:
case CHIP_FIJI:
- adev->pp_enabled = (amdgpu_powerplay == 0) ? false : true;
- break;
+ case CHIP_TOPAZ:
case CHIP_CARRIZO:
case CHIP_STONEY:
case CHIP_CARRIZO:
case CHIP_STONEY:
- adev->pp_enabled = (amdgpu_powerplay
> 0) ? true : fals
e;
+ adev->pp_enabled = (amdgpu_powerplay
== 0) ? false : tru
e;
break;
/* These chips don't have powerplay implemenations */
case CHIP_BONAIRE:
break;
/* These chips don't have powerplay implemenations */
case CHIP_BONAIRE:
@@
-118,7
+119,6
@@
static int amdgpu_pp_early_init(void *handle)
case CHIP_KABINI:
case CHIP_MULLINS:
case CHIP_KAVERI:
case CHIP_KABINI:
case CHIP_MULLINS:
case CHIP_KAVERI:
- case CHIP_TOPAZ:
default:
adev->pp_enabled = false;
break;
default:
adev->pp_enabled = false;
break;
This page took
0.024576 seconds
and
5
git commands to generate.