drm/msm: Fix a couple incorrect usages of get_vaddr_active()

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>

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index a4cc3618abee32b9d001f0e923b1ff869cc11b49..ad84f9eaa03ce2560176417fcfd79489ed6fd363 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -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;

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 09ea147936ad49f2c109d644a0735e743d486c16..ab932ab8290ac5efc82fa0ac06432ef7315711dc 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -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;