From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Thomas Zimmermann <tzimmermann@suse.de>,
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, andi.shyti@intel.com, sam@ravnborg.org,
miaoqinglang@huawei.com, emil.velikov@collabora.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,
linux-rockchip@lists.infradead.org,
linux-mediatek@lists.infradead.org,
amd-gfx@lists.freedesktop.org, 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: Re: [Intel-gfx] [PATCH v2 06/21] drm/i915: Introduce GEM object functions
Date: Tue, 15 Sep 2020 17:14:27 +0100 [thread overview]
Message-ID: <76e5eb2f-e324-8f56-866a-15b022abba8d@linux.intel.com> (raw)
In-Reply-To: <20200915145958.19993-7-tzimmermann@suse.de>
On 15/09/2020 15:59, 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 i915.
>
> v2:
> * move object-function instance to i915_gem_object.c (Jani)
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 ++++++++++++++++---
> drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 ---
> drivers/gpu/drm/i915/i915_drv.c | 4 ----
> .../gpu/drm/i915/selftests/mock_gem_device.c | 3 ---
> 4 files changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> index c8421fd9d2dc..3389ac972d16 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> @@ -39,9 +39,18 @@ static struct i915_global_object {
> struct kmem_cache *slab_objects;
> } global;
>
> +static const struct drm_gem_object_funcs i915_gem_object_funcs;
> +
> struct drm_i915_gem_object *i915_gem_object_alloc(void)
> {
> - return kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);
> + struct drm_i915_gem_object *obj;
> +
> + obj = kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);
> + if (!obj)
> + return NULL;
> + obj->base.funcs = &i915_gem_object_funcs;
> +
> + return obj;
> }
>
> void i915_gem_object_free(struct drm_i915_gem_object *obj)
> @@ -101,7 +110,7 @@ void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj,
> !(obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_WRITE);
> }
>
> -void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file)
> +static void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file)
> {
> struct drm_i915_gem_object *obj = to_intel_bo(gem);
> struct drm_i915_file_private *fpriv = file->driver_priv;
> @@ -264,7 +273,7 @@ static void __i915_gem_free_work(struct work_struct *work)
> i915_gem_flush_free_objects(i915);
> }
>
> -void i915_gem_free_object(struct drm_gem_object *gem_obj)
> +static void i915_gem_free_object(struct drm_gem_object *gem_obj)
> {
> struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
> struct drm_i915_private *i915 = to_i915(obj->base.dev);
> @@ -403,6 +412,12 @@ int __init i915_global_objects_init(void)
> return 0;
> }
>
> +static const struct drm_gem_object_funcs i915_gem_object_funcs = {
> + .free = i915_gem_free_object,
> + .close = i915_gem_close_object,
> + .export = i915_gem_prime_export,
> +};
> +
> #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
> #include "selftests/huge_gem_object.c"
> #include "selftests/huge_pages.c"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> index d46db8d8f38e..eaf3d4147be0 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> @@ -38,9 +38,6 @@ void __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,
>
> int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align);
>
> -void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file);
> -void i915_gem_free_object(struct drm_gem_object *obj);
> -
> void i915_gem_flush_free_objects(struct drm_i915_private *i915);
>
> struct sg_table *
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 94e00e450683..011a3fb41ece 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1750,12 +1750,8 @@ static struct drm_driver driver = {
> .lastclose = i915_driver_lastclose,
> .postclose = i915_driver_postclose,
>
> - .gem_close_object = i915_gem_close_object,
> - .gem_free_object_unlocked = i915_gem_free_object,
> -
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> - .gem_prime_export = i915_gem_prime_export,
> .gem_prime_import = i915_gem_prime_import,
>
> .dumb_create = i915_gem_dumb_create,
> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> index f127e633f7ca..9244b5d6fb01 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> @@ -87,9 +87,6 @@ static struct drm_driver mock_driver = {
> .name = "mock",
> .driver_features = DRIVER_GEM,
> .release = mock_device_release,
> -
> - .gem_close_object = i915_gem_close_object,
> - .gem_free_object_unlocked = i915_gem_free_object,
> };
>
> static void release_dev(struct device *dev)
>
Looks obviously fine.
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-09-15 16:15 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 14:59 [Intel-gfx] [PATCH v2 00/21] Convert all remaining drivers to GEM object functions Thomas Zimmermann
2020-09-15 14:59 ` [Intel-gfx] [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 ` [Intel-gfx] [PATCH v2 02/21] drm/armada: " Thomas Zimmermann
2020-09-15 15:07 ` Russell King - ARM Linux admin
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 03/21] drm/etnaviv: " Thomas Zimmermann
2020-09-16 11:21 ` Daniel Vetter
2020-09-15 14:59 ` [Intel-gfx] [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 ` [Intel-gfx] [PATCH v2 05/21] drm/gma500: " Thomas Zimmermann
2020-09-16 11:31 ` Daniel Vetter
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 06/21] drm/i915: " Thomas Zimmermann
2020-09-15 16:14 ` Tvrtko Ursulin [this message]
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 07/21] drm/mediatek: " Thomas Zimmermann
2020-09-16 11:35 ` Daniel Vetter
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 08/21] drm/msm: Introduce GEM object funcs Thomas Zimmermann
2020-09-16 12:01 ` Daniel Vetter
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 09/21] drm/nouveau: Introduce GEM object functions Thomas Zimmermann
2020-09-16 12:04 ` Daniel Vetter
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 10/21] drm/omapdrm: " Thomas Zimmermann
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 11/21] drm/pl111: " Thomas Zimmermann
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 12/21] drm/radeon: " Thomas Zimmermann
2020-09-15 15:08 ` Christian König
2020-09-15 14:59 ` [Intel-gfx] [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 ` [Intel-gfx] [PATCH v2 14/21] drm/tegra: Introduce GEM object functions Thomas Zimmermann
2020-09-17 10:56 ` Thierry Reding
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 15/21] drm/vc4: " Thomas Zimmermann
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 16/21] drm/vgem: " Thomas Zimmermann
2020-09-17 14:01 ` Melissa Wen
2020-09-15 14:59 ` [Intel-gfx] [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 ` [Intel-gfx] [PATCH v2 18/21] drm/vkms: Introduce GEM object functions Thomas Zimmermann
2020-09-17 11:31 ` Melissa Wen
2020-09-15 14:59 ` [Intel-gfx] [PATCH v2 19/21] drm/xen: " Thomas Zimmermann
2020-09-15 14:59 ` [Intel-gfx] [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 ` [Intel-gfx] [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 ` [Intel-gfx] [PATCH v2 00/21] Convert all remaining drivers to GEM object functions Christian König
2020-09-17 7:05 ` Thomas Zimmermann
2020-09-15 16:22 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Convert all remaining drivers to GEM object functions (rev2) Patchwork
2020-09-15 16:24 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-09-15 16:39 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
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=76e5eb2f-e324-8f56-866a-15b022abba8d@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--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@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=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=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).