FAILED: patch "[PATCH] drm/amdgpu:Always save uvd vcpu_bo in VM Mode" failed to apply to 4.16-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.16-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
f6c3b601bd490eda08c27b03607448abd4b4841bMon Sep 17 00:00:00 2001
From: James Zhu <[email protected]>
Date: Tue, 6 Mar 2018 14:52:35 -0500
Subject: [PATCH] drm/amdgpu:Always save uvd vcpu_bo in VM Mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When UVD is in VM mode, there is not uvd handle exchanged, uvd.handles are always 0. So vcpu_bo always need save, Otherwise amdgpu driver will fail during suspend/resume.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105021
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +8 -5
@@ -299,12 +299,15 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)cancel_delayed_work_sync (&adev->uvd.idle_work); -for (i =0 ; i < adev->uvd.max_handles; ++i) -if (atomic_read (&adev->uvd.handles[i])) -break ; +/* only valid for physical mode */ +if (adev->asic_type <CHIP_POLARIS10 ) { +for (i =0 ; i < adev->uvd.max_handles; ++i) +if (atomic_read (&adev->uvd.handles[i])) +break ; -if (i == adev->uvd.max_handles) -return 0 ; +if (i == adev->uvd.max_handles) +return 0 ; + } size =amdgpu_bo_size (adev->uvd.vcpu_bo); ptr = adev->uvd.cpu_addr;