From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 14 Jun 2019 20:36:03 +0000 (+0200)
Subject: drm/vc4: Don set gem_obj->resv in prime import anymore
X-Git-Tag: for-linus-2019-09-27~66^2~18^2~340
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3886666a2568007f0fa46a5c01eb178def22b3b5;p=linux-2.6-block.git

drm/vc4: Don set gem_obj->resv in prime import anymore

This is done in drm_prime.c now.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190614203615.12639-48-daniel.vetter@ffwll.ch
---

diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
index b0f9eb6632a2..707bcd9927f3 100644
--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -793,8 +793,6 @@ vc4_prime_import_sg_table(struct drm_device *dev,
 	if (IS_ERR(obj))
 		return obj;
 
-	obj->resv = attach->dmabuf->resv;
-
 	return obj;
 }