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

drm/amdgpu/jpeg: skip set pg for sriov

Host handles PG.

Signed-off-by: Vignesh Chander <Vignesh.Chander@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Vignesh Chander and committed by
Alex Deucher
8c95cda3 b157df66

+12 -11
+7 -4
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
··· 360 360 361 361 cancel_delayed_work_sync(&adev->jpeg.idle_work); 362 362 363 - if (!amdgpu_sriov_vf(adev)) { 364 - if (adev->jpeg.cur_state != AMD_PG_STATE_GATE) 365 - ret = jpeg_v4_0_3_set_powergating_state(adev, AMD_PG_STATE_GATE); 366 - } 363 + if (adev->jpeg.cur_state != AMD_PG_STATE_GATE) 364 + ret = jpeg_v4_0_3_set_powergating_state(adev, AMD_PG_STATE_GATE); 367 365 368 366 return ret; 369 367 } ··· 947 949 { 948 950 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 949 951 int ret; 952 + 953 + if (amdgpu_sriov_vf(adev)) { 954 + adev->jpeg.cur_state = AMD_PG_STATE_UNGATE; 955 + return 0; 956 + } 950 957 951 958 if (state == adev->jpeg.cur_state) 952 959 return 0;
+5 -7
drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h
··· 35 35 36 36 #define MMSCH_VF_ENGINE_STATUS__PASS 0x1 37 37 38 - #define MMSCH_VF_MAILBOX_RESP__OK 0x1 39 - #define MMSCH_VF_MAILBOX_RESP__INCOMPLETE 0x2 40 - 41 - #define MMSCH_VF_ENGINE_STATUS__PASS 0x1 42 - 43 - #define MMSCH_VF_MAILBOX_RESP__OK 0x1 44 - #define MMSCH_VF_MAILBOX_RESP__INCOMPLETE 0x2 38 + #define MMSCH_VF_MAILBOX_RESP__OK 0x1 39 + #define MMSCH_VF_MAILBOX_RESP__INCOMPLETE 0x2 40 + #define MMSCH_VF_MAILBOX_RESP__FAILED 0x3 41 + #define MMSCH_VF_MAILBOX_RESP__FAILED_SMALL_CTX_SIZE 0x4 42 + #define MMSCH_VF_MAILBOX_RESP__UNKNOWN_CMD 0x5 45 43 46 44 #define MMSCH_V4_0_VCN_INSTANCES 0x2 47 45