From nobody Mon Feb 9 16:18:27 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=1597307837; cv=none; d=zohomail.com; s=zohoarc; b=KQ7/5Lvwhbl8Lj4uu/aQ+nmuDHFzC350ty4uDsLw61Y0/jrc+fgW5/ce7Ew+6avUUv27+VIaDiZX3JqjxGVbjKvc9tF6PPhIpmCG5bp2RaYYflFI8YF7KpuZJpzcSuKRJwbkyon6Nmg3Y56K/kYIx+1BM50JLlwwWafysT+p/yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597307837; 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=nGWu51NoehlZEs6W6XNg7MUeE4bcRB+fcBqB0RiPEYs=; b=FgalcVlkP7b6TuC5Z0bdd1F3gnqSEwUljWoH17WaMdbSAKmSc5mWfPsEmoPReF3Qyt1W+pyh4PsAqdD2Xi1ND017mF/ZwsaZA1ZtpoWTMKS2vvss259mSb6TbnFvAj6Ukm4lTFaRFQxCE/GLiRvFcewvOO9qvbvJKC59Ffm+Dps= 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 1597307837662139.73735191646608; Thu, 13 Aug 2020 01:37:17 -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 1k68jO-0006OL-Dm; Thu, 13 Aug 2020 08:37:02 +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 1k68jM-0006LY-GS for xen-devel@lists.xenproject.org; Thu, 13 Aug 2020 08:37:00 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c9e0906d-99f3-49fb-aa91-2e0c150e399e; Thu, 13 Aug 2020 08:36:57 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 25C5DB59A; Thu, 13 Aug 2020 08:37:19 +0000 (UTC) X-Inumbo-ID: c9e0906d-99f3-49fb-aa91-2e0c150e399e 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, abdiel.janulgue@linux.intel.com, tvrtko.ursulin@linux.intel.com, andi.shyti@intel.com, sam@ravnborg.org, miaoqinglang@huawei.com, emil.velikov@collabora.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 Subject: [PATCH 07/20] drm/mediatek: Introduce GEM object functions Date: Thu, 13 Aug 2020 10:36:31 +0200 Message-Id: <20200813083644.31711-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200813083644.31711-1-tzimmermann@suse.de> References: <20200813083644.31711-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 mediatek. The only exception is gem_prime_mmap, which is non-trivial to convert. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ----- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/mtk_drm_drv.c index 040a8f393fe2..2f8d0043fca7 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -301,18 +301,13 @@ struct drm_gem_object *mtk_drm_gem_prime_import(struc= t drm_device *dev, static struct drm_driver mtk_drm_driver =3D { .driver_features =3D DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, =20 - .gem_free_object_unlocked =3D mtk_drm_gem_free_object, - .gem_vm_ops =3D &drm_gem_cma_vm_ops, .dumb_create =3D mtk_drm_gem_dumb_create, =20 .prime_handle_to_fd =3D drm_gem_prime_handle_to_fd, .prime_fd_to_handle =3D drm_gem_prime_fd_to_handle, .gem_prime_import =3D mtk_drm_gem_prime_import, - .gem_prime_get_sg_table =3D mtk_gem_prime_get_sg_table, .gem_prime_import_sg_table =3D mtk_gem_prime_import_sg_table, .gem_prime_mmap =3D mtk_drm_gem_mmap_buf, - .gem_prime_vmap =3D mtk_drm_gem_prime_vmap, - .gem_prime_vunmap =3D mtk_drm_gem_prime_vunmap, .fops =3D &mtk_drm_fops, =20 .name =3D DRIVER_NAME, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/media= tek/mtk_drm_gem.c index 6190cc3b7b0d..591b90410e4a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -8,11 +8,20 @@ #include #include #include +#include #include =20 #include "mtk_drm_drv.h" #include "mtk_drm_gem.h" =20 +static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs =3D { + .free =3D mtk_drm_gem_free_object, + .get_sg_table =3D mtk_gem_prime_get_sg_table, + .vmap =3D mtk_drm_gem_prime_vmap, + .vunmap =3D mtk_drm_gem_prime_vunmap, + .vm_ops =3D &drm_gem_cma_vm_ops, +}; + static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev, unsigned long size) { @@ -25,6 +34,8 @@ static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct dr= m_device *dev, if (!mtk_gem_obj) return ERR_PTR(-ENOMEM); =20 + mtk_gem_obj->base.funcs =3D &mtk_drm_gem_object_funcs; + ret =3D drm_gem_object_init(dev, &mtk_gem_obj->base, size); if (ret < 0) { DRM_ERROR("failed to initialize gem object\n"); --=20 2.28.0