From: Thomas Zimmermann <tzimmermann@suse.de>
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: linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org,
intel-gfx@lists.freedesktop.org, etnaviv@lists.freedesktop.org,
dri-devel@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@ffwll.ch>,
linux-rockchip@lists.infradead.org,
linux-mediatek@lists.infradead.org,
amd-gfx@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>,
nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org,
xen-devel@lists.xenproject.org, freedreno@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 09/22] drm/msm: Introduce GEM object funcs
Date: Wed, 23 Sep 2020 12:21:46 +0200 [thread overview]
Message-ID: <20200923102159.24084-10-tzimmermann@suse.de> (raw)
In-Reply-To: <20200923102159.24084-1-tzimmermann@suse.de>
GEM object functions deprecate several similar callback interfaces in
struct drm_driver. This patch replaces the per-driver callbacks with
per-instance callbacks in msm. The only exception is gem_prime_mmap,
which is non-trivial to convert.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/msm/msm_drv.c | 13 -------------
drivers/gpu/drm/msm/msm_drv.h | 1 -
drivers/gpu/drm/msm/msm_gem.c | 19 ++++++++++++++++++-
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 79333842f70a..5952767ea478 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -978,12 +978,6 @@ static const struct drm_ioctl_desc msm_ioctls[] = {
DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW),
};
-static const struct vm_operations_struct vm_ops = {
- .fault = msm_gem_fault,
- .open = drm_gem_vm_open,
- .close = drm_gem_vm_close,
-};
-
static const struct file_operations fops = {
.owner = THIS_MODULE,
.open = drm_open,
@@ -1009,18 +1003,11 @@ static struct drm_driver msm_driver = {
.irq_preinstall = msm_irq_preinstall,
.irq_postinstall = msm_irq_postinstall,
.irq_uninstall = msm_irq_uninstall,
- .gem_free_object_unlocked = msm_gem_free_object,
- .gem_vm_ops = &vm_ops,
.dumb_create = msm_gem_dumb_create,
.dumb_map_offset = msm_gem_dumb_map_offset,
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
- .gem_prime_pin = msm_gem_prime_pin,
- .gem_prime_unpin = msm_gem_prime_unpin,
- .gem_prime_get_sg_table = msm_gem_prime_get_sg_table,
.gem_prime_import_sg_table = msm_gem_prime_import_sg_table,
- .gem_prime_vmap = msm_gem_prime_vmap,
- .gem_prime_vunmap = msm_gem_prime_vunmap,
.gem_prime_mmap = msm_gem_prime_mmap,
#ifdef CONFIG_DEBUG_FS
.debugfs_init = msm_debugfs_init,
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index af259b0573ea..7bcea10be81f 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -269,7 +269,6 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev);
int msm_gem_mmap_obj(struct drm_gem_object *obj,
struct vm_area_struct *vma);
int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
-vm_fault_t msm_gem_fault(struct vm_fault *vmf);
uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
int msm_gem_get_iova(struct drm_gem_object *obj,
struct msm_gem_address_space *aspace, uint64_t *iova);
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index e47958c3704a..3f4a3be53de6 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -244,7 +244,7 @@ int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
return msm_gem_mmap_obj(vma->vm_private_data, vma);
}
-vm_fault_t msm_gem_fault(struct vm_fault *vmf)
+static vm_fault_t msm_gem_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *obj = vma->vm_private_data;
@@ -991,6 +991,22 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
return ret;
}
+static const struct vm_operations_struct vm_ops = {
+ .fault = msm_gem_fault,
+ .open = drm_gem_vm_open,
+ .close = drm_gem_vm_close,
+};
+
+static const struct drm_gem_object_funcs msm_gem_object_funcs = {
+ .free = msm_gem_free_object,
+ .pin = msm_gem_prime_pin,
+ .unpin = msm_gem_prime_unpin,
+ .get_sg_table = msm_gem_prime_get_sg_table,
+ .vmap = msm_gem_prime_vmap,
+ .vunmap = msm_gem_prime_vunmap,
+ .vm_ops = &vm_ops,
+};
+
static int msm_gem_new_impl(struct drm_device *dev,
uint32_t size, uint32_t flags,
struct drm_gem_object **obj)
@@ -1021,6 +1037,7 @@ static int msm_gem_new_impl(struct drm_device *dev,
INIT_LIST_HEAD(&msm_obj->vmas);
*obj = &msm_obj->base;
+ (*obj)->funcs = &msm_gem_object_funcs;
return 0;
}
--
2.28.0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-09-23 10:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 10:21 [PATCH v3 00/22] Convert all remaining drivers to GEM object functions Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 01/22] drm/amdgpu: Introduce " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 02/22] drm/armada: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 03/22] drm/etnaviv: " Thomas Zimmermann
2020-09-23 12:27 ` Lucas Stach
2020-09-23 10:21 ` [PATCH v3 04/22] drm/exynos: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 05/22] drm/gma500: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 06/22] drm/i915: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 07/22] drm/imx/dcss: Initialize DRM driver instance with CMA helper macro Thomas Zimmermann
2020-09-23 11:18 ` Laurentiu Palcu
2020-09-23 10:21 ` [PATCH v3 08/22] drm/mediatek: Introduce GEM object functions Thomas Zimmermann
2020-09-23 10:21 ` Thomas Zimmermann [this message]
2020-09-23 10:21 ` [PATCH v3 10/22] drm/nouveau: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 11/22] drm/omapdrm: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 12/22] drm/pl111: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 13/22] drm/radeon: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 14/22] drm/rockchip: Convert to drm_gem_object_funcs Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 15/22] drm/tegra: Introduce GEM object functions Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 16/22] drm/vc4: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 17/22] drm/vgem: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 18/22] drm/virtgpu: Set PRIME export function in struct drm_gem_object_funcs Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 19/22] drm/vkms: Introduce GEM object functions Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 20/22] drm/xen: " Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 21/22] drm/xlnx: Initialize DRM driver instance with CMA helper macro Thomas Zimmermann
2020-09-23 10:21 ` [PATCH v3 22/22] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver Thomas Zimmermann
2020-09-23 14:33 ` [PATCH v3 00/22] Convert all remaining drivers to GEM object functions Christian König
2020-09-25 8:40 ` 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=20200923102159.24084-10-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--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=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--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=festevam@gmail.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=kernel@pengutronix.de \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=l.stach@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=laurentiu.palcu@oss.nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--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=s.hauer@pengutronix.de \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=shawnguo@kernel.org \
--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=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).