tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amd/pm: move pp_force_state_enabled member to amdgpu_pm structure

As it lables an internal pm state and amdgpu_pm structure is the more
proper place than amdgpu_device structure for it.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Evan Quan and committed by
Alex Deucher d698a2c4 84176663

+5 -4
-1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 949 949 950 950 /* powerplay */ 951 951 struct amd_powerplay powerplay; 952 - bool pp_force_state_enabled; 953 952 954 953 /* smu */ 955 954 struct smu_context smu;
+3 -3
drivers/gpu/drm/amd/pm/amdgpu_pm.c
··· 469 469 if (adev->in_suspend && !adev->in_runpm) 470 470 return -EPERM; 471 471 472 - if (adev->pp_force_state_enabled) 472 + if (adev->pm.pp_force_state_enabled) 473 473 return amdgpu_get_pp_cur_state(dev, attr, buf); 474 474 else 475 475 return sysfs_emit(buf, "\n"); ··· 492 492 if (adev->in_suspend && !adev->in_runpm) 493 493 return -EPERM; 494 494 495 - adev->pp_force_state_enabled = false; 495 + adev->pm.pp_force_state_enabled = false; 496 496 497 497 if (strlen(buf) == 1) 498 498 return count; ··· 523 523 if (ret) 524 524 goto err_out; 525 525 526 - adev->pp_force_state_enabled = true; 526 + adev->pm.pp_force_state_enabled = true; 527 527 } 528 528 529 529 pm_runtime_mark_last_busy(ddev->dev);
+2
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
··· 343 343 * 0 = disabled (default), otherwise enable corresponding debug mode 344 344 */ 345 345 uint32_t smu_debug_mask; 346 + 347 + bool pp_force_state_enabled; 346 348 }; 347 349 348 350 #define R600_SSTU_DFLT 0