drm/msm: Fix a couple incorrect usages of get_vaddr_active()
authorRob Clark <robdclark@chromium.org>
Fri, 23 Oct 2020 16:51:02 +0000 (09:51 -0700)
committerRob Clark <robdclark@chromium.org>
Thu, 5 Nov 2020 00:00:55 +0000 (16:00 -0800)
The microcode bo's should never be madvise(WONTNEED), so these should
not be using msm_gem_get_vaddr_active().

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/adreno/a5xx_gpu.c
drivers/gpu/drm/msm/adreno/a6xx_gpu.c

index a4cc361..ad84f9e 100644 (file)
@@ -426,7 +426,7 @@ static int a5xx_preempt_start(struct msm_gpu *gpu)
 static void a5xx_ucode_check_version(struct a5xx_gpu *a5xx_gpu,
                struct drm_gem_object *obj)
 {
-       u32 *buf = msm_gem_get_vaddr_active(obj);
+       u32 *buf = msm_gem_get_vaddr(obj);
 
        if (IS_ERR(buf))
                return;
index 09ea147..ab932ab 100644 (file)
@@ -522,7 +522,7 @@ static int a6xx_cp_init(struct msm_gpu *gpu)
 static void a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu,
                struct drm_gem_object *obj)
 {
-       u32 *buf = msm_gem_get_vaddr_active(obj);
+       u32 *buf = msm_gem_get_vaddr(obj);
 
        if (IS_ERR(buf))
                return;