drm/amdgpu/userq: drop VCN and VPE doorbell handling

VCN and VPE userqs are not yet supported and this code is
not correct.  Userspace should provide the correct
doorbell offset with in their doorbell page for the IP.
Adjusting it here will not work as expected as userspace
and the queue itself will have different offsets.

We need to add a INFO IOCTL query to get the offset and
range for each IP within the doorbell page to handle this
properly.

Cc: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Reviewed-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 1400114dc9342383d75105ccd707c093c986efc6..33c54ecd46d531b10dcaa01ca3dbe4a8961a19b1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -417,17 +417,6 @@ amdgpu_userq_get_doorbell_index(struct amdgpu_userq_mgr *uq_mgr,
        case AMDGPU_HW_IP_DMA:
                db_size = sizeof(u64);
                break;
-
-       case AMDGPU_HW_IP_VCN_ENC:
-               db_size = sizeof(u32);
-               db_info->doorbell_offset += AMDGPU_NAVI10_DOORBELL64_VCN0_1 << 1;
-               break;
-
-       case AMDGPU_HW_IP_VPE:
-               db_size = sizeof(u32);
-               db_info->doorbell_offset += AMDGPU_NAVI10_DOORBELL64_VPE << 1;
-               break;
-
        default:
                drm_file_err(uq_mgr->file, "[Usermode queues] IP %d not support\n",
                             db_info->queue_type);