From: Daniel Vetter Date: Fri, 14 Jun 2019 20:36:03 +0000 (+0200) Subject: drm/vc4: Don set gem_obj->resv in prime import anymore X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3886666a2568007f0fa46a5c01eb178def22b3b5;p=openwrt%2Fstaging%2Fblogic.git drm/vc4: Don set gem_obj->resv in prime import anymore This is done in drm_prime.c now. Reviewed-by: Eric Anholt Reviewed-by: Emil Velikov Signed-off-by: Daniel Vetter Cc: Eric Anholt 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; }