From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD890C43461 for ; Wed, 16 Sep 2020 12:01:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD1362220F for ; Wed, 16 Sep 2020 12:01:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="kXxeFKQt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD1362220F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04BED6E9AE; Wed, 16 Sep 2020 12:01:36 +0000 (UTC) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C3906E9B6 for ; Wed, 16 Sep 2020 12:01:35 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id b79so2718458wmb.4 for ; Wed, 16 Sep 2020 05:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=igBfcxeCtlQN5CLlSYPTKG81q+ycX2teEyiF94cMRWs=; b=kXxeFKQt9X9g8aLTM+QgfFognrWsi7bbeKyXtbUa6Sw3vDhO1pk5GhyGWNAwFRiYV/ y3+Zb9FAd6+OgeWN2UBgXkLCkDAoTOIILHbMfIswZ+DjZ6vsfBBnkeLG6pdGQ2oE+uvl +Byrs6EBHXRCTzlSe/2XCwaludcXLVt60J20Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=igBfcxeCtlQN5CLlSYPTKG81q+ycX2teEyiF94cMRWs=; b=aPI3S3VcR42uTj2xBZ94sS6PY36SqZjmUusD6btSzt1GIc6IzSfXhOKdF5CSoERx8/ U8wmBsbOe1JNzWqr8T7b4ObmGeOaSR4dRisT2dPsBzxniwJSigvViLADXXfPJ2Nmyu0y hSpnGVSysgXdluv+lHMWGRuytGsOR9XXxbBuoRgzbQlBdbFYFtcjaAuQbCLl/zjFhfcR Hz6nvCuS5T95y+EGmSoLwv+MikxQLvSCfr8bHF4UvHHp1PogyjpaCGnc6d1dv9nBsA6p MbFUISs2R1ZnoVnv1U8TMAAPPgXozux6gIRRpmlqoNozhEBT7JkxFPLZyvQd5v0kZovG gmJg== X-Gm-Message-State: AOAM533rYjmFOnroVzHl1V+39kt5IgvqRKWjmyqMEAgFgdQNSyjsbV64 86Hdms9B+RouMByC1BFc0KIndA== X-Google-Smtp-Source: ABdhPJzfc+smqAu2u0R++9ZZRUwUh0N8NfJRxHBrlnztnEgrnVKh20aLbXU2FBFNb/vMU9OQyVRfcw== X-Received: by 2002:a1c:1d08:: with SMTP id d8mr4572504wmd.78.1600257693715; Wed, 16 Sep 2020 05:01:33 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id x16sm31915068wrq.62.2020.09.16.05.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:01:32 -0700 (PDT) Date: Wed, 16 Sep 2020 14:01:29 +0200 From: Daniel Vetter To: Thomas Zimmermann Message-ID: <20200916120129.GL438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-9-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915145958.19993-9-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 Subject: Re: [Intel-gfx] [PATCH v2 08/21] drm/msm: Introduce GEM object funcs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, heiko@sntech.de, andrey.grodzovsky@amd.com, airlied@linux.ie, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, michal.simek@xilinx.com, eric@anholt.net, 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, 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, linux-arm-msm@vger.kernel.org, marek.olsak@amd.com, tianci.yin@amd.com, etnaviv@lists.freedesktop.org, inki.dae@samsung.com, christian.gmeiner@gmail.com, linux-mediatek@lists.infradead.org, mripard@kernel.org, matthias.bgg@gmail.com, evan.quan@amd.com, linux-arm-kernel@lists.infradead.org, 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Sep 15, 2020 at 04:59:45PM +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 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[] = { > 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 b4553caaa196..de915ff6f4b4 100644 > --- a/drivers/gpu/drm/msm/msm_gem.c > +++ b/drivers/gpu/drm/msm/msm_gem.c > @@ -247,7 +247,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; > @@ -994,6 +994,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) > @@ -1024,6 +1040,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 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx