diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0670-drm-amdgpu-remove-SRIOV-specific-handling-from-sdma_.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0670-drm-amdgpu-remove-SRIOV-specific-handling-from-sdma_.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0670-drm-amdgpu-remove-SRIOV-specific-handling-from-sdma_.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0670-drm-amdgpu-remove-SRIOV-specific-handling-from-sdma_.patch new file mode 100644 index 00000000..9db710ea --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0670-drm-amdgpu-remove-SRIOV-specific-handling-from-sdma_.patch @@ -0,0 +1,47 @@ +From 5582e064a55e43e52cb62cc8fdc7a5624b8648c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Thu, 4 Oct 2018 19:31:27 +0200 +Subject: [PATCH 0670/2940] drm/amdgpu: remove SRIOV specific handling from + sdma_v4_0_gfx_resume +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Just use the same code path for both SRIOV and bare metal. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 49c8feb14d10..aa5bb9cfa738 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -725,11 +725,6 @@ static void sdma_v4_0_gfx_resume(struct amdgpu_device *adev, unsigned int i) + /* before programing wptr to a less value, need set minor_ptr_update first */ + WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_MINOR_PTR_UPDATE), 1); + +- if (!amdgpu_sriov_vf(adev)) { /* only bare-metal use register write for wptr */ +- WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_RB_WPTR), lower_32_bits(ring->wptr) << 2); +- WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_RB_WPTR_HI), upper_32_bits(ring->wptr) << 2); +- } +- + doorbell = RREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_DOORBELL)); + doorbell_offset = RREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_DOORBELL_OFFSET)); + +@@ -745,8 +740,7 @@ static void sdma_v4_0_gfx_resume(struct amdgpu_device *adev, unsigned int i) + adev->nbio_funcs->sdma_doorbell_range(adev, i, ring->use_doorbell, + ring->doorbell_index); + +- if (amdgpu_sriov_vf(adev)) +- sdma_v4_0_ring_set_wptr(ring); ++ sdma_v4_0_ring_set_wptr(ring); + + /* set minor_ptr_update to 0 after wptr programed */ + WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_MINOR_PTR_UPDATE), 0); +-- +2.17.1 + |