[PATCH] Revert "drm/amdgpu: Add flags to distinguish vf/pf/pt mode"
Alex Deucher
alexander.deucher at amd.com
Fri Sep 6 17:47:06 UTC 2024
This reverts commit f03b874313cc9b5859596fe9c5b368387b6da771.
This is unused so far and has not gone upstream yet, so remove
it until the userspace side is ready.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 ---------
include/uapi/drm/amdgpu_drm.h | 10 ----------
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index f7ed1e356d96..d90473aec942 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -117,10 +117,9 @@
* - 3.56.0 - Update IB start address and size alignment for decode and encode
* - 3.57.0 - Compute tunneling on GFX10+
* - 3.58.0 - Add GFX12 DCC support
- * - 3.59.0 - Add AMDGPU_IDS_FLAGS_MODE_PF, AMDGPU_IDS_FLAGS_MODE_VF & AMDGPU_IDS_FLAGS_MODE_PT
*/
#define KMS_DRIVER_MAJOR 3
-#define KMS_DRIVER_MINOR 59
+#define KMS_DRIVER_MINOR 58
#define KMS_DRIVER_PATCHLEVEL 0
/*
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index d9fde38f6ee2..96af9ff1acb6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -888,15 +888,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
if (adev->gfx.config.ta_cntl2_truncate_coord_mode)
dev_info->ids_flags |= AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD;
- if (amdgpu_passthrough(adev))
- dev_info->ids_flags |= (AMDGPU_IDS_FLAGS_MODE_PT <<
- AMDGPU_IDS_FLAGS_MODE_SHIFT) &
- AMDGPU_IDS_FLAGS_MODE_MASK;
- else if (amdgpu_sriov_vf(adev))
- dev_info->ids_flags |= (AMDGPU_IDS_FLAGS_MODE_VF <<
- AMDGPU_IDS_FLAGS_MODE_SHIFT) &
- AMDGPU_IDS_FLAGS_MODE_MASK;
-
vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;
vm_size -= AMDGPU_VA_RESERVED_TOP;
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 3e488b0119eb..e44362e74fa1 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -756,16 +756,6 @@ struct drm_amdgpu_cs_chunk_cp_gfx_shadow {
#define AMDGPU_IDS_FLAGS_TMZ 0x4
#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD 0x8
-/*
- * Query h/w info: Flag identifying VF/PF/PT mode
- *
- */
-#define AMDGPU_IDS_FLAGS_MODE_MASK 0x300
-#define AMDGPU_IDS_FLAGS_MODE_SHIFT 0x8
-#define AMDGPU_IDS_FLAGS_MODE_PF 0x0
-#define AMDGPU_IDS_FLAGS_MODE_VF 0x1
-#define AMDGPU_IDS_FLAGS_MODE_PT 0x2
-
/* indicate if acceleration can be working */
#define AMDGPU_INFO_ACCEL_WORKING 0x00
/* get the crtc_id from the mode object id? */
--
2.46.0
More information about the amd-gfx
mailing list