From: Daniel Vetter <daniel@ffwll.ch>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: hamohammed.sa@gmail.com, heiko@sntech.de,
andrey.grodzovsky@amd.com, airlied@linux.ie,
nouveau@lists.freedesktop.org, joonas.lahtinen@linux.intel.com,
dri-devel@lists.freedesktop.org, michal.simek@xilinx.com,
eric@anholt.net, thierry.reding@gmail.com, robdclark@gmail.com,
krzk@kernel.org, sam@ravnborg.org, sumit.semwal@linaro.org,
emil.velikov@collabora.com, linux-samsung-soc@vger.kernel.org,
jy0922.shim@samsung.com, oleksandr_andrushchenko@epam.com,
tomi.valkeinen@ti.com, linux-tegra@vger.kernel.org,
linux@armlinux.org.uk, patrik.r.jakobsson@gmail.com,
jonathanh@nvidia.com, linux-rockchip@lists.infradead.org,
kgene@kernel.org, bskeggs@redhat.com,
xen-devel@lists.xenproject.org, miaoqinglang@huawei.com,
intel-gfx@lists.freedesktop.org, matthew.auld@intel.com,
chunkuang.hu@kernel.org, andi.shyti@intel.com, daniel@ffwll.ch,
linux-arm-msm@vger.kernel.org, marek.olsak@amd.com,
tianci.yin@amd.com, maarten.lankhorst@linux.intel.com,
etnaviv@lists.freedesktop.org, jani.nikula@linux.intel.com,
inki.dae@samsung.com, hdegoede@redhat.com,
christian.gmeiner@gmail.com, linux-mediatek@lists.infradead.org,
mripard@kernel.org, rodrigo.vivi@intel.com,
matthias.bgg@gmail.com, evan.quan@amd.com, sean@poorly.run,
linux-arm-kernel@lists.infradead.org,
tvrtko.ursulin@linux.intel.com, amd-gfx@lists.freedesktop.org,
laurent.pinchart@ideasonboard.com, hyun.kwon@xilinx.com,
rodrigosiqueiramelo@gmail.com, aaron.liu@amd.com,
Felix.Kuehling@amd.com, xinhui.pan@amd.com,
sw0312.kim@samsung.com, hjc@rock-chips.com,
chris@chris-wilson.co.uk, kyungmin.park@samsung.com,
nirmoy.das@amd.com, p.zabel@pengutronix.de,
alexander.deucher@amd.com, Hawking.Zhang@amd.com,
freedreno@lists.freedesktop.org, christian.koenig@amd.com,
l.stach@pengutronix.de
Subject: Re: [PATCH v2 03/21] drm/etnaviv: Introduce GEM object functions
Date: Wed, 16 Sep 2020 13:21:36 +0200 [thread overview]
Message-ID: <20200916112136.GG438822@phenom.ffwll.local> (raw)
In-Reply-To: <20200915145958.19993-4-tzimmermann@suse.de>
On Tue, Sep 15, 2020 at 04:59:40PM +0200, Thomas Zimmermann wrote:
> 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 <tzimmermann@suse.de>
> ---
> 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/etnaviv/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[] = {
> ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW),
> };
>
> -static const struct vm_operations_struct vm_ops = {
> - .fault = etnaviv_gem_fault,
> - .open = drm_gem_vm_open,
> - .close = drm_gem_vm_close,
> -};
> -
> static const struct file_operations fops = {
> .owner = THIS_MODULE,
> .open = drm_open,
> @@ -490,16 +484,9 @@ static struct drm_driver etnaviv_drm_driver = {
> .driver_features = DRIVER_GEM | DRIVER_RENDER,
> .open = etnaviv_open,
> .postclose = etnaviv_postclose,
> - .gem_free_object_unlocked = etnaviv_gem_free_object,
> - .gem_vm_ops = &vm_ops,
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> - .gem_prime_pin = etnaviv_gem_prime_pin,
> - .gem_prime_unpin = etnaviv_gem_prime_unpin,
> - .gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table,
> .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table,
> - .gem_prime_vmap = etnaviv_gem_prime_vmap,
> - .gem_prime_vunmap = etnaviv_gem_prime_vunmap,
> .gem_prime_mmap = etnaviv_gem_prime_mmap,
> #ifdef CONFIG_DEBUG_FS
> .debugfs_init = etnaviv_debugfs_init,
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/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);
>
> 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/etnaviv/etnaviv_gem.c
> index ea19f1d27275..312e9d58d5a7 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);
> }
>
> -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 = vmf->vma;
> struct drm_gem_object *obj = vma->vm_private_data;
> @@ -561,6 +561,22 @@ void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)
> mutex_unlock(&priv->gem_lock);
> }
>
> +static const struct vm_operations_struct vm_ops = {
> + .fault = etnaviv_gem_fault,
> + .open = drm_gem_vm_open,
> + .close = drm_gem_vm_close,
> +};
> +
> +static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = {
> + .free = etnaviv_gem_free_object,
> + .pin = etnaviv_gem_prime_pin,
> + .unpin = etnaviv_gem_prime_unpin,
> + .get_sg_table = etnaviv_gem_prime_get_sg_table,
> + .vmap = etnaviv_gem_prime_vmap,
> + .vunmap = etnaviv_gem_prime_vunmap,
> + .vm_ops = &vm_ops,
> +};
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> +
> static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
> const struct etnaviv_gem_ops *ops, struct drm_gem_object **obj)
> {
> @@ -595,6 +611,7 @@ static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
> INIT_LIST_HEAD(&etnaviv_obj->vram_list);
>
> *obj = &etnaviv_obj->base;
> + (*obj)->funcs = &etnaviv_gem_object_funcs;
>
> return 0;
> }
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-09-16 11:21 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 14:59 [PATCH v2 00/21] Convert all remaining drivers to GEM object functions Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 01/21] drm/amdgpu: Introduce " Thomas Zimmermann
2020-09-15 15:05 ` Christian König
2020-09-17 7:40 ` Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 02/21] drm/armada: " Thomas Zimmermann
2020-09-15 15:07 ` Russell King - ARM Linux admin
2020-09-15 14:59 ` [PATCH v2 03/21] drm/etnaviv: " Thomas Zimmermann
2020-09-16 11:21 ` Daniel Vetter [this message]
2020-09-15 14:59 ` [PATCH v2 04/21] drm/exynos: " Thomas Zimmermann
2020-09-16 10:03 ` Daniel Vetter
2020-09-16 10:36 ` Thomas Zimmermann
2020-09-16 11:24 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 05/21] drm/gma500: " Thomas Zimmermann
2020-09-16 11:31 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 06/21] drm/i915: " Thomas Zimmermann
2020-09-15 16:14 ` Tvrtko Ursulin
2020-09-15 14:59 ` [PATCH v2 07/21] drm/mediatek: " Thomas Zimmermann
2020-09-16 11:35 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 08/21] drm/msm: Introduce GEM object funcs Thomas Zimmermann
2020-09-16 12:01 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 09/21] drm/nouveau: Introduce GEM object functions Thomas Zimmermann
2020-09-16 12:04 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 10/21] drm/omapdrm: " Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 11/21] drm/pl111: " Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 12/21] drm/radeon: " Thomas Zimmermann
2020-09-15 15:08 ` Christian König
2020-09-15 14:59 ` [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Thomas Zimmermann
2020-09-16 12:07 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 14/21] drm/tegra: Introduce GEM object functions Thomas Zimmermann
2020-09-17 10:56 ` Thierry Reding
2020-09-15 14:59 ` [PATCH v2 15/21] drm/vc4: " Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 16/21] drm/vgem: " Thomas Zimmermann
2020-09-17 14:01 ` Melissa Wen
2020-09-15 14:59 ` [PATCH v2 17/21] drm/virtgpu: Set PRIME export function in struct drm_gem_object_funcs Thomas Zimmermann
2020-09-16 12:09 ` Daniel Vetter
2020-09-15 14:59 ` [PATCH v2 18/21] drm/vkms: Introduce GEM object functions Thomas Zimmermann
2020-09-17 11:31 ` Melissa Wen
2020-09-15 14:59 ` [PATCH v2 19/21] drm/xen: " Thomas Zimmermann
2020-09-15 14:59 ` [PATCH v2 20/21] drm/xlnx: Initialize DRM driver instance with CMA helper macro Thomas Zimmermann
2020-09-15 15:53 ` Laurent Pinchart
2020-09-15 18:39 ` Hyun Kwon
2020-09-15 14:59 ` [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver Thomas Zimmermann
2020-09-16 12:12 ` Daniel Vetter
2020-09-16 17:55 ` Thomas Zimmermann
2020-09-15 15:25 ` [PATCH v2 00/21] Convert all remaining drivers to GEM object functions Christian König
2020-09-17 7:05 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200916112136.GG438822@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=Felix.Kuehling@amd.com \
--cc=Hawking.Zhang@amd.com \
--cc=aaron.liu@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=andi.shyti@intel.com \
--cc=andrey.grodzovsky@amd.com \
--cc=bskeggs@redhat.com \
--cc=chris@chris-wilson.co.uk \
--cc=christian.gmeiner@gmail.com \
--cc=christian.koenig@amd.com \
--cc=chunkuang.hu@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=eric@anholt.net \
--cc=etnaviv@lists.freedesktop.org \
--cc=evan.quan@amd.com \
--cc=freedreno@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=hdegoede@redhat.com \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hyun.kwon@xilinx.com \
--cc=inki.dae@samsung.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jonathanh@nvidia.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jy0922.shim@samsung.com \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=l.stach@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marek.olsak@amd.com \
--cc=matthew.auld@intel.com \
--cc=matthias.bgg@gmail.com \
--cc=miaoqinglang@huawei.com \
--cc=michal.simek@xilinx.com \
--cc=mripard@kernel.org \
--cc=nirmoy.das@amd.com \
--cc=nouveau@lists.freedesktop.org \
--cc=oleksandr_andrushchenko@epam.com \
--cc=p.zabel@pengutronix.de \
--cc=patrik.r.jakobsson@gmail.com \
--cc=robdclark@gmail.com \
--cc=rodrigo.vivi@intel.com \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=sumit.semwal@linaro.org \
--cc=sw0312.kim@samsung.com \
--cc=thierry.reding@gmail.com \
--cc=tianci.yin@amd.com \
--cc=tomi.valkeinen@ti.com \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=xen-devel@lists.xenproject.org \
--cc=xinhui.pan@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).