From nobody Sun Feb 8 16:53:31 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=1600856551; cv=none; d=zohomail.com; s=zohoarc; b=e8HhUxg0VXUo8aACwZi0hBJF/qkQRpryMjP64a8x2EEdBjwcik+nqRIBqf4UtwZtb9PmEiWIrwljXxBeRhznyAievYY88pQe+GYcsTNcYATT88oXfxaKY7aqBgvcny2/rkQc7YwpxBOrwwRyVJe7NyOqfa4Jxno1xhzVn8smZbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600856551; 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=071dagVtv4Wblp1vtvbs46sjuXDv/pEcOJIWOVkGwh0=; b=mtEwqSX2mJx6MoTFgOWXzyf/z4pQlh/xjC5HjaxqDaqyDPqJDv60nzPDEbnxZZyQqU+SqOvv1PPmqDd0O7a3vcGTaS8YRpXyy/Q53QULrSIp8X1ZR4mOd49EYjon9DRYtAn8xtj65D2HW1URwj67aoBBhxcmqqSeNxIB2j2LFyM= 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 1600856551806713.9517282304065; Wed, 23 Sep 2020 03:22:31 -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 1kL1ug-00068f-UB; Wed, 23 Sep 2020 10:22:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kL1uf-00064P-U4 for xen-devel@lists.xenproject.org; Wed, 23 Sep 2020 10:22:13 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 884eb3f3-7235-40a5-bd4b-db4e1b96e0c0; Wed, 23 Sep 2020 10:22:10 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 499BEB278; Wed, 23 Sep 2020 10:22:47 +0000 (UTC) X-Inumbo-ID: 884eb3f3-7235-40a5-bd4b-db4e1b96e0c0 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 09/22] drm/msm: Introduce GEM object funcs Date: Wed, 23 Sep 2020 12:21:46 +0200 Message-Id: <20200923102159.24084-10-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 msm. The only exception is gem_prime_mmap, which is non-trivial to convert. Signed-off-by: Thomas Zimmermann Reviewed-by: Daniel Vetter --- 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[] =3D { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM= _RENDER_ALLOW), }; =20 -static const struct vm_operations_struct vm_ops =3D { - .fault =3D msm_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, @@ -1009,18 +1003,11 @@ static struct drm_driver msm_driver =3D { .irq_preinstall =3D msm_irq_preinstall, .irq_postinstall =3D msm_irq_postinstall, .irq_uninstall =3D msm_irq_uninstall, - .gem_free_object_unlocked =3D msm_gem_free_object, - .gem_vm_ops =3D &vm_ops, .dumb_create =3D msm_gem_dumb_create, .dumb_map_offset =3D msm_gem_dumb_map_offset, .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 msm_gem_prime_pin, - .gem_prime_unpin =3D msm_gem_prime_unpin, - .gem_prime_get_sg_table =3D msm_gem_prime_get_sg_table, .gem_prime_import_sg_table =3D msm_gem_prime_import_sg_table, - .gem_prime_vmap =3D msm_gem_prime_vmap, - .gem_prime_vunmap =3D msm_gem_prime_vunmap, .gem_prime_mmap =3D msm_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init =3D 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_stru= ct *vma) return msm_gem_mmap_obj(vma->vm_private_data, vma); } =20 -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 =3D vmf->vma; struct drm_gem_object *obj =3D vma->vm_private_data; @@ -991,6 +991,22 @@ int msm_gem_new_handle(struct drm_device *dev, struct = drm_file *file, return ret; } =20 +static const struct vm_operations_struct vm_ops =3D { + .fault =3D msm_gem_fault, + .open =3D drm_gem_vm_open, + .close =3D drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs msm_gem_object_funcs =3D { + .free =3D msm_gem_free_object, + .pin =3D msm_gem_prime_pin, + .unpin =3D msm_gem_prime_unpin, + .get_sg_table =3D msm_gem_prime_get_sg_table, + .vmap =3D msm_gem_prime_vmap, + .vunmap =3D msm_gem_prime_vunmap, + .vm_ops =3D &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); =20 *obj =3D &msm_obj->base; + (*obj)->funcs =3D &msm_gem_object_funcs; =20 return 0; } --=20 2.28.0