drm/amdgpu: Fix MMIO access page fault

From Andrey Grodzovsky
2114f80889d89f96e65e0f8a74bd0ecf10b658f5 in linux 5.10.y/5.10.80
c03509cbc01559549700e14c4a6239f2572ab4ba in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
index 6e06120..2b8e875 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/firmware.h>
+#include <drm/drm_drv.h>
 
 #include "amdgpu.h"
 #include "amdgpu_vcn.h"
@@ -192,11 +193,14 @@ static int vcn_v2_0_sw_init(void *handle)
  */
 static int vcn_v2_0_sw_fini(void *handle)
 {
-       int r;
+       int r, idx;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        volatile struct amdgpu_fw_shared *fw_shared = adev->vcn.inst->fw_shared_cpu_addr;
 
-       fw_shared->present_flag_0 = 0;
+       if (drm_dev_enter(&adev->ddev, &idx)) {
+               fw_shared->present_flag_0 = 0;
+               drm_dev_exit(idx);
+       }
 
        amdgpu_virt_free_mm_table(adev);
 

diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
index b0f7239..124f417 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/firmware.h>
+#include <drm/drm_drv.h>
 
 #include "amdgpu.h"
 #include "amdgpu_vcn.h"
@@ -233,17 +234,21 @@ static int vcn_v2_5_sw_init(void *handle)
  */
 static int vcn_v2_5_sw_fini(void *handle)
 {
-       int i, r;
+       int i, r, idx;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        volatile struct amdgpu_fw_shared *fw_shared;
 
-       for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-               if (adev->vcn.harvest_config & (1 << i))
-                       continue;
-               fw_shared = adev->vcn.inst[i].fw_shared_cpu_addr;
-               fw_shared->present_flag_0 = 0;
+       if (drm_dev_enter(&adev->ddev, &idx)) {
+               for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
+                       if (adev->vcn.harvest_config & (1 << i))
+                               continue;
+                       fw_shared = adev->vcn.inst[i].fw_shared_cpu_addr;
+                       fw_shared->present_flag_0 = 0;
+               }
+               drm_dev_exit(idx);
        }
 
+
        if (amdgpu_sriov_vf(adev))
                amdgpu_virt_free_mm_table(adev);