From nobody Sun Feb 8 17:04:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1600856548; cv=none; d=zohomail.com; s=zohoarc; b=EAb1GlnKtZ+Iwj7/B5MfyZ/vC3k4QbvF4JRoHKyubtROyv4PiIlw4RSdlKU59axjYRRDupKZGSE4IXF35i7ql7tnkeBU4e7wmql+ZbskhQ51bWKvUueCqkGmOjdAbq3H5sJKAMwleVdan6A8wx94EBUhmJu98cayjMHEa35m6uE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600856548; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+kgyxm+fsy+dyqKCmgypxwlYKMtnaM7TA1nE9jzlecQ=; b=YNDa9VEFfWlprt2sfyYDNrkb1M5/r3AGrMJYYaIJgBcQUGO3NeaYqWmzyAIMpaRF/oMUD58StU5H+KLB4GdoQj3fRUDcYq3MEraR3WXdZukYYrJlOGUOCA2KIV3U0A1Y3wFeaN4G3GLrx1YcUdiLDLMDjkMtq16QnPGsHRA7pzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1600856548826750.773849225948; Wed, 23 Sep 2020 03:22:28 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kL1ud-00066w-J3; Wed, 23 Sep 2020 10:22:11 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kL1uc-00064a-AJ for xen-devel@lists.xenproject.org; Wed, 23 Sep 2020 10:22:10 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f272901a-7e10-4a6e-9bb7-84be898d7ae8; Wed, 23 Sep 2020 10:22:05 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 7CE1EB27E; Wed, 23 Sep 2020 10:22:41 +0000 (UTC) X-Inumbo-ID: f272901a-7e10-4a6e-9bb7-84be898d7ae8 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Thomas Zimmermann To: alexander.deucher@amd.com, christian.koenig@amd.com, airlied@linux.ie, daniel@ffwll.ch, linux@armlinux.org.uk, maarten.lankhorst@linux.intel.com, mripard@kernel.org, l.stach@pengutronix.de, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, patrik.r.jakobsson@gmail.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, chunkuang.hu@kernel.org, p.zabel@pengutronix.de, matthias.bgg@gmail.com, robdclark@gmail.com, sean@poorly.run, bskeggs@redhat.com, tomi.valkeinen@ti.com, eric@anholt.net, hjc@rock-chips.com, heiko@sntech.de, thierry.reding@gmail.com, jonathanh@nvidia.com, rodrigosiqueiramelo@gmail.com, hamohammed.sa@gmail.com, oleksandr_andrushchenko@epam.com, hyun.kwon@xilinx.com, laurent.pinchart@ideasonboard.com, michal.simek@xilinx.com, sumit.semwal@linaro.org, evan.quan@amd.com, Hawking.Zhang@amd.com, tianci.yin@amd.com, marek.olsak@amd.com, hdegoede@redhat.com, andrey.grodzovsky@amd.com, Felix.Kuehling@amd.com, xinhui.pan@amd.com, aaron.liu@amd.com, nirmoy.das@amd.com, chris@chris-wilson.co.uk, matthew.auld@intel.com, tvrtko.ursulin@linux.intel.com, andi.shyti@intel.com, sam@ravnborg.org, miaoqinglang@huawei.com, emil.velikov@collabora.com, laurentiu.palcu@oss.nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org, xen-devel@lists.xenproject.org, Thomas Zimmermann , Daniel Vetter Subject: [PATCH v3 03/22] drm/etnaviv: Introduce GEM object functions Date: Wed, 23 Sep 2020 12:21:40 +0200 Message-Id: <20200923102159.24084-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200923102159.24084-1-tzimmermann@suse.de> References: <20200923102159.24084-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" GEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in etnaviv. The only exception is gem_prime_mmap, which is non-trivial to convert. Signed-off-by: Thomas Zimmermann Reviewed-by: Daniel Vetter Acked-by: Lucas Stach --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 ------------- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnavi= v/etnaviv_drv.c index a9a3afaef9a1..aa270b79e585 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -468,12 +468,6 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = =3D { ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW), }; =20 -static const struct vm_operations_struct vm_ops =3D { - .fault =3D etnaviv_gem_fault, - .open =3D drm_gem_vm_open, - .close =3D drm_gem_vm_close, -}; - static const struct file_operations fops =3D { .owner =3D THIS_MODULE, .open =3D drm_open, @@ -490,16 +484,9 @@ static struct drm_driver etnaviv_drm_driver =3D { .driver_features =3D DRIVER_GEM | DRIVER_RENDER, .open =3D etnaviv_open, .postclose =3D etnaviv_postclose, - .gem_free_object_unlocked =3D etnaviv_gem_free_object, - .gem_vm_ops =3D &vm_ops, .prime_handle_to_fd =3D drm_gem_prime_handle_to_fd, .prime_fd_to_handle =3D drm_gem_prime_fd_to_handle, - .gem_prime_pin =3D etnaviv_gem_prime_pin, - .gem_prime_unpin =3D etnaviv_gem_prime_unpin, - .gem_prime_get_sg_table =3D etnaviv_gem_prime_get_sg_table, .gem_prime_import_sg_table =3D etnaviv_gem_prime_import_sg_table, - .gem_prime_vmap =3D etnaviv_gem_prime_vmap, - .gem_prime_vunmap =3D etnaviv_gem_prime_vunmap, .gem_prime_mmap =3D etnaviv_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init =3D etnaviv_debugfs_init, diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnavi= v/etnaviv_drv.h index 4d8dc9236e5f..914f0867ff71 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -49,7 +49,6 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void= *data, struct drm_file *file); =20 int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma); -vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf); int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset); struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj= ); void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnavi= v/etnaviv_gem.c index d1533bdc1335..67d9a2b9ea6a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -171,7 +171,7 @@ int etnaviv_gem_mmap(struct file *filp, struct vm_area_= struct *vma) return obj->ops->mmap(obj, vma); } =20 -vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf) +static vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma =3D vmf->vma; struct drm_gem_object *obj =3D vma->vm_private_data; @@ -559,6 +559,22 @@ void etnaviv_gem_obj_add(struct drm_device *dev, struc= t drm_gem_object *obj) mutex_unlock(&priv->gem_lock); } =20 +static const struct vm_operations_struct vm_ops =3D { + .fault =3D etnaviv_gem_fault, + .open =3D drm_gem_vm_open, + .close =3D drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs etnaviv_gem_object_funcs =3D { + .free =3D etnaviv_gem_free_object, + .pin =3D etnaviv_gem_prime_pin, + .unpin =3D etnaviv_gem_prime_unpin, + .get_sg_table =3D etnaviv_gem_prime_get_sg_table, + .vmap =3D etnaviv_gem_prime_vmap, + .vunmap =3D etnaviv_gem_prime_vunmap, + .vm_ops =3D &vm_ops, +}; + static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flag= s, const struct etnaviv_gem_ops *ops, struct drm_gem_object **obj) { @@ -593,6 +609,7 @@ static int etnaviv_gem_new_impl(struct drm_device *dev,= u32 size, u32 flags, INIT_LIST_HEAD(&etnaviv_obj->vram_list); =20 *obj =3D &etnaviv_obj->base; + (*obj)->funcs =3D &etnaviv_gem_object_funcs; =20 return 0; } --=20 2.28.0