diff options
| author | Luben Tuikov <luben.tuikov@amd.com> | 2020-03-19 16:47:51 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-04-28 16:20:29 -0400 |
| commit | c6252390fccdd768d1250a45cbd2a7e3610a1283 (patch) | |
| tree | 0ce84aa5c33c9b5dc3e746623a8bdc286b647cc0 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 562366c9452c534242a55a47c6431ab1e9b6b07c (diff) | |
drm/amdgpu: implement TMZ accessor (v3)
Implement an accessor of adev->tmz.enabled. Let not
code around access it as "if (adev->tmz.enabled)"
as the organization may change. Instead...
Recruit "bool amdgpu_is_tmz(adev)" to return
exactly this Boolean value. That is, this function
is now an accessor of an already initialized and
set adev and adev->tmz.
Add "void amdgpu_gmc_tmz_set(adev)" to check and
set adev->gmc.tmz_enabled at initialization
time. After which one uses "bool
amdgpu_is_tmz(adev)" to query whether adev
supports TMZ.
Also, remove circular header file include.
v2: Remove amdgpu_tmz.[ch] as requested.
v3: Move TMZ into GMC.
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index f54532abfe78..589d8783fa21 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -103,7 +103,6 @@ #include "amdgpu_umc.h" #include "amdgpu_mmhub.h" #include "amdgpu_df.h" -#include "amdgpu_tmz.h" #define MAX_GPU_INSTANCE 16 @@ -937,9 +936,6 @@ struct amdgpu_device { /* df */ struct amdgpu_df df; - /* tmz */ - struct amdgpu_tmz tmz; - struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM]; int num_ip_blocks; struct mutex mn_lock; @@ -1269,5 +1265,9 @@ _name##_show(struct device *dev, \ \ static struct device_attribute pmu_attr_##_name = __ATTR_RO(_name) -#endif +static inline bool amdgpu_is_tmz(struct amdgpu_device *adev) +{ + return adev->gmc.tmz_enabled; +} +#endif |