Commit 16c642ec authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Alex Deucher
Browse files

drm/amdgpu: new ids flag for tmz (v2) 



Allows UMD to know if TMZ is supported and enabled.

This commit also bumps KMS_DRIVER_MINOR because if we don't
UMD can't tell if "ids_flags & AMDGPU_IDS_FLAGS_TMZ == 0" means
"tmz is not enabled" or "tmz may be enabled but the kernel doesn't
report it".

v2: use amdgpu_is_tmz() and reworded commit message.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bf110287

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -88,9 +88,10 @@ 
 * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness

 * - 3.38.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC

 * - 3.39.0 - DMABUF implicit sync does a full pipeline sync

 * - 3.40.0 - Add AMDGPU_IDS_FLAGS_TMZ

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	39

#define KMS_DRIVER_MINOR	40

#define KMS_DRIVER_PATCHLEVEL	0



int amdgpu_vram_limit = 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+2 −0
Original line number Diff line number Diff line
@@ -737,6 +737,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_FUSION;

		if (amdgpu_mcbp || amdgpu_sriov_vf(adev))

			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_PREEMPTION;

		if (amdgpu_is_tmz(adev))

			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_TMZ;



		vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;

		vm_size -= AMDGPU_VA_RESERVED_SIZE;

include/uapi/drm/amdgpu_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ struct drm_amdgpu_cs_chunk_data { 
 */

#define AMDGPU_IDS_FLAGS_FUSION         0x1

#define AMDGPU_IDS_FLAGS_PREEMPTION     0x2

#define AMDGPU_IDS_FLAGS_TMZ            0x4



/* indicate if acceleration can be working */

#define AMDGPU_INFO_ACCEL_WORKING		0x00