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 72C45C433E2 for ; Wed, 16 Sep 2020 12:07:41 +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 1E66522209 for ; Wed, 16 Sep 2020 12:07:41 +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="D8Cn+Lnz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E66522209 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B84D6E9E2; Wed, 16 Sep 2020 12:07:40 +0000 (UTC) Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A9B46E9BA for ; Wed, 16 Sep 2020 12:07:39 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id w5so6635689wrp.8 for ; Wed, 16 Sep 2020 05:07:39 -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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=D8Cn+LnzRzcwcAFRiK+P1SGw66Mhbu0VayIxxEwp3/Ke3uFcgTtEyg2O2TchfbyaU1 /t1Jed/k7t8UhbtyHLBWwi9QGEEtHwtsdBVK0+CssfY95ypMsX9PNDgpg6PAhXIZmBww EM4H0+Gc3gntNd2KUdiNeLGf+3Tz2z1yDgJeU= 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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=T2UgPkzQBBzEHBQieq80iVrU9ce4lwIgTlr8xK50sH4pN4bjUJNa8o0vK1iMLM0LG6 uXy8VXvccL9qVRrv1f8kauzJWxZ2AN4km85Bac8yYUvhIG/or9iLzpk42y5/WZ9A3qVU Z1SFAiEkXhLeoXMDuGRn9kjdxEJFACt2sfbLRepx4tAhWr7wnaOBlkUzRU9DhdxTs9lC d2S1HSVvIvjTwBZ9t1D0qULeX6Vg5/4CzyCC0UZuvzWG+uFS8aDNAe51qG/0FZ0Oy5t2 RyMWaDiq9Tf8krl5PrXqh8WC0GcwVUPzM6f9hFitzyND65ekrCC/xMv7VeTtQIHN5ydd pvHw== X-Gm-Message-State: AOAM532IJU+Agy8eqffoyb62to0/GSRlsc4g94AI5wdsD4SrqR9UdMlu nUdgQEgkcCjcNRRYBu+ELjYOfQ== X-Google-Smtp-Source: ABdhPJwrWIpLSYf41av9bZsrjEfrlf4lf8//RpX+N0WUgXGOZN7ZDB+gPcHHEGIp6RA3wivQd9OHbQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr26158129wrx.173.1600258057971; Wed, 16 Sep 2020 05:07:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y2sm4834552wmg.23.2020.09.16.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:07:36 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:33 +0200 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx 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, joonas.lahtinen@linux.intel.com, dri-devel@lists.freedesktop.org, michal.simek@xilinx.com, eric@anholt.net, thierry.reding@gmail.com, robdclark@gmail.com, 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, patrik.r.jakobsson@gmail.com, 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, andi.shyti@intel.com, daniel@ffwll.ch, linux-arm-msm@vger.kernel.org, marek.olsak@amd.com, tianci.yin@amd.com, maarten.lankhorst@linux.intel.com, etnaviv@lists.freedesktop.org, jani.nikula@linux.intel.com, inki.dae@samsung.com, hdegoede@redhat.com, christian.gmeiner@gmail.com, linux-mediatek@lists.infradead.org, mripard@kernel.org, rodrigo.vivi@intel.com, matthias.bgg@gmail.com, evan.quan@amd.com, sean@poorly.run, linux-arm-kernel@lists.infradead.org, tvrtko.ursulin@linux.intel.com, 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: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On Tue, Sep 15, 2020 at 04:59:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 2.28.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx 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=unavailable 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 446F2C433E2 for ; Wed, 16 Sep 2020 12:07:43 +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 F022F22209 for ; Wed, 16 Sep 2020 12:07:42 +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="D8Cn+Lnz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F022F22209 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 3C7E76E9C0; Wed, 16 Sep 2020 12:07:40 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 708C26E9ED for ; Wed, 16 Sep 2020 12:07:39 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id j2so6640190wrx.7 for ; Wed, 16 Sep 2020 05:07:39 -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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=D8Cn+LnzRzcwcAFRiK+P1SGw66Mhbu0VayIxxEwp3/Ke3uFcgTtEyg2O2TchfbyaU1 /t1Jed/k7t8UhbtyHLBWwi9QGEEtHwtsdBVK0+CssfY95ypMsX9PNDgpg6PAhXIZmBww EM4H0+Gc3gntNd2KUdiNeLGf+3Tz2z1yDgJeU= 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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=bLeun5GmaxrOhApkqcQ0jfZoZMsfuXGEjaTmcqYWdOBBzeal/dWB8/MnZbdDv+Y+5h oaRfOTVJAPAndO2oFH6xhOkUXIdIQLu6swLlLo/ApnXkE9usGZuZbWUk9HdQiHijSTuh dv5clkefQvbXZNpVvWglp6rQ52jpK5zMbr1N71uIm9Z3CrhqcFPCxusgA03yzFd08YTU PisC61HMCiCqfsTIJhVl+7DfYOlpPvVqgGRCbcjwE8NhrxuAQ2JxYP/eduEcNHZ4u9DJ UR7owZjKQUTBw4y2oHN5mi8iRG/NFOswF5QW6CmJrISt/pCr6ga/5GBQPIYKD2Z2TxzY qeQQ== X-Gm-Message-State: AOAM5333+gN7/WzSe+/3T1cykKklc9nWJpz8xbC0HR4LEXUIEOqzg6YN Nun6wXa8ESjzHF6jShxGsXQIzw== X-Google-Smtp-Source: ABdhPJwrWIpLSYf41av9bZsrjEfrlf4lf8//RpX+N0WUgXGOZN7ZDB+gPcHHEGIp6RA3wivQd9OHbQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr26158129wrx.173.1600258057971; Wed, 16 Sep 2020 05:07:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y2sm4834552wmg.23.2020.09.16.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:07:36 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:33 +0200 From: Daniel Vetter To: Thomas Zimmermann Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 Subject: Re: [Intel-gfx] [PATCH v2 13/21] drm/rockchip: Convert to drm_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:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 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 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 CF83CC43461 for ; Wed, 16 Sep 2020 18:44:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9311D20809 for ; Wed, 16 Sep 2020 18:44:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="D8Cn+Lnz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728165AbgIPSn4 (ORCPT ); Wed, 16 Sep 2020 14:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727964AbgIPSW4 (ORCPT ); Wed, 16 Sep 2020 14:22:56 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45A31C035438 for ; Wed, 16 Sep 2020 05:07:39 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id k15so6632762wrn.10 for ; Wed, 16 Sep 2020 05:07:39 -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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=D8Cn+LnzRzcwcAFRiK+P1SGw66Mhbu0VayIxxEwp3/Ke3uFcgTtEyg2O2TchfbyaU1 /t1Jed/k7t8UhbtyHLBWwi9QGEEtHwtsdBVK0+CssfY95ypMsX9PNDgpg6PAhXIZmBww EM4H0+Gc3gntNd2KUdiNeLGf+3Tz2z1yDgJeU= 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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=BpASlsHKVJu+kh/1gPP9XhJy7yCfBCdI0AcMQpd3v4h+dXz7ytyqywHh34U5SXLPTi Eo4xiglkzsbGWMjVctGwYWM5a+VOOjfNEtbOwi0gclaDyBLg8gifCO3ATksQ2SK7OJs8 FRrFqfvlMQmi9TMPwXCN+9lo7S/oeeqTPj0FgsRTRsADSXbv55I4M3C7oKdT2h7YZr32 IW5eJhAMvJookyu3cKTTBVk6+fTeTMZfL/DW3AxbtrVRFaEgrDxBkYGp7tue7YwOZKVS +BP1gKkyDPZxz42nZug8xNY9wCzQfd4BzKVCuWm07oaEZfh4GwXSqhp8MOlsroalB6Me UB1g== X-Gm-Message-State: AOAM532xm/2sWJ5R+dMme4VPKughpvImLkoeovMsdqc2qC8dz7r0dkfL mham23vo8/XFm5LKu0QLdRC7Sg== X-Google-Smtp-Source: ABdhPJwrWIpLSYf41av9bZsrjEfrlf4lf8//RpX+N0WUgXGOZN7ZDB+gPcHHEGIp6RA3wivQd9OHbQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr26158129wrx.173.1600258057971; Wed, 16 Sep 2020 05:07:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y2sm4834552wmg.23.2020.09.16.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:07:36 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:33 +0200 From: Daniel Vetter To: Thomas Zimmermann Cc: 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, 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 Subject: Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Tue, Sep 15, 2020 at 04:59:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 2.28.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 3190BC433E2 for ; Wed, 16 Sep 2020 12:07:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 9A29522209 for ; Wed, 16 Sep 2020 12:07:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gr0X7wqL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="D8Cn+Lnz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A29522209 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gxA/2J4dcAYNON4kxqf9Sdkv0ZCX1QxvR+6W35Wifd4=; b=gr0X7wqLn93WcD7ZDi1IuIIfU 1TabQgECFcvXd328MxOzsqT4rs6W74yc3yR4vp4xjn1iG5uwME+//zN2XcnlwTosek6Nz6Two8zKS ygEUpCZFe2jiL5TuHdRg/G8zLdD63oY1bYaRA3HpXtXb4sBzihChqoBbEVhRMUZ2c1dNTl4IMAAYB i7o7/Rid8xuFrOmwG9e3+Qe640cFvLa4Yz6TbKI72I9t3sb/gKoMSnnaVvpKa429E5INwxjx5A9hp 2Wg3shaXO3mw8XvIPY503s6f4WwZJdT8QLgUG9UWdiAeSzRcJRrN3ppE5Ws79ZYYGvvF5bgSy1BhS H0odGvv1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIWDv-0001Xe-9E; Wed, 16 Sep 2020 12:07:43 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIWDr-0001WU-7Z for linux-mediatek@lists.infradead.org; Wed, 16 Sep 2020 12:07:41 +0000 Received: by mail-wr1-x442.google.com with SMTP id w5so6635691wrp.8 for ; Wed, 16 Sep 2020 05:07:38 -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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=D8Cn+LnzRzcwcAFRiK+P1SGw66Mhbu0VayIxxEwp3/Ke3uFcgTtEyg2O2TchfbyaU1 /t1Jed/k7t8UhbtyHLBWwi9QGEEtHwtsdBVK0+CssfY95ypMsX9PNDgpg6PAhXIZmBww EM4H0+Gc3gntNd2KUdiNeLGf+3Tz2z1yDgJeU= 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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=I4F28doOIW94LK8TdVjwhJU+attsi7xdeuBXu2/1EwJPvgPfvltW4GcdbNd0Q7Iwi5 /bablFv4zmhnlRcYdeAHwXEFqCJ2mq7NVmur4Em+C3Ln88BuQP4k5UNw3OzKHMeGfPaQ j9PvqpK6wC1p3tPsJlNlABhIym/SzYkdPHDQR9GzFD4W1jc4YXYyO2SQ4y7nw/G9Z6VO nAjQkR/TAtFEgYQnyz/tIq39Vf/xXONs+rqNwT/wkwm1QeQC1dZOdUF5kOkZRSaq6Iy8 TuR0C70CGWHwlwGyXQMfx6f+G8c2UfAlnKODNHDCEt3zoGA8e82JL5OmCsLOYlg+jHrj +MBA== X-Gm-Message-State: AOAM530pqx01sAWbptKnr79l2EVlQWXO25mq7lc0pWMqDYexEmFRBPP9 qOWp6ieLrbLErk0WtX+LCXu/vQ== X-Google-Smtp-Source: ABdhPJwrWIpLSYf41av9bZsrjEfrlf4lf8//RpX+N0WUgXGOZN7ZDB+gPcHHEGIp6RA3wivQd9OHbQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr26158129wrx.173.1600258057971; Wed, 16 Sep 2020 05:07:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y2sm4834552wmg.23.2020.09.16.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:07:36 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:33 +0200 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_080739_336261_0C5306A2 X-CRM114-Status: GOOD ( 19.20 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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, joonas.lahtinen@linux.intel.com, dri-devel@lists.freedesktop.org, michal.simek@xilinx.com, eric@anholt.net, thierry.reding@gmail.com, robdclark@gmail.com, 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, patrik.r.jakobsson@gmail.com, 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, andi.shyti@intel.com, daniel@ffwll.ch, linux-arm-msm@vger.kernel.org, marek.olsak@amd.com, tianci.yin@amd.com, maarten.lankhorst@linux.intel.com, etnaviv@lists.freedesktop.org, jani.nikula@linux.intel.com, inki.dae@samsung.com, hdegoede@redhat.com, christian.gmeiner@gmail.com, linux-mediatek@lists.infradead.org, mripard@kernel.org, rodrigo.vivi@intel.com, matthias.bgg@gmail.com, evan.quan@amd.com, sean@poorly.run, linux-arm-kernel@lists.infradead.org, tvrtko.ursulin@linux.intel.com, 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 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Tue, Sep 15, 2020 at 04:59:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 2.28.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 7AD13C43461 for ; Wed, 16 Sep 2020 12:07:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 C7DC72220E for ; Wed, 16 Sep 2020 12:07:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VvH8OuQG"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="D8Cn+Lnz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7DC72220E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sCULmFfhSjjmJGHMZocvwdZihD9WOB7qnMiNEPPFzcM=; b=VvH8OuQGEF2+kV+/zzlS9y0nH n5cFbdT0eCh+QFloowz6eLOw4kOZpPGgSJBKG0jEzpoCvhQar6bZAFp6XG92GZG/SRbtoD1v0JVup 924yjjqOoEzEKNneInzonApevWTrT3/JmDxxK/7/u0RLEKV3+G/aQqHm1XhilZFD02nGCraotq45t +JQsI9TqC41KwqXVKe0D1KDoPLVhY4HVQjAZ3k7n4LOy8eaZLXWyxIvA36XKA9IKrTGdDYbov/vLH qnmI1ejf2OupnZoqKzma+w3BGJ6a5XoO8v3F+grE8/JxMom5LAaoZHd85o1qBPMqelhZd51GF/Pfj fnUb3g87A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIWDt-0001XT-PC; Wed, 16 Sep 2020 12:07:41 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIWDr-0001WS-7R for linux-rockchip@lists.infradead.org; Wed, 16 Sep 2020 12:07:40 +0000 Received: by mail-wr1-x444.google.com with SMTP id o5so6579349wrn.13 for ; Wed, 16 Sep 2020 05:07:38 -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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=D8Cn+LnzRzcwcAFRiK+P1SGw66Mhbu0VayIxxEwp3/Ke3uFcgTtEyg2O2TchfbyaU1 /t1Jed/k7t8UhbtyHLBWwi9QGEEtHwtsdBVK0+CssfY95ypMsX9PNDgpg6PAhXIZmBww EM4H0+Gc3gntNd2KUdiNeLGf+3Tz2z1yDgJeU= 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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=lo+ptjxGEz3YfMmhgu8ryqtbMxYJhJGtFIPo2TA8YN1GaPmIs2HoqjResBcg8vopRn p7tB2XO/FgOSI/kx/PNVi3dTcEPUhM71Mtn/0Mn39kEceGWbKgDXT84N95ZWf3gqQfW5 3IfrXOMf3dHJQX9xLw4ukHKDJOMyIOIyTZOz4ZemNeMncoys2rJxAbajIcj/nXSjWJj8 V/hKZQngTw9Y2FCvM3pkDWKZX4HOQOWakTk2f2uHvlvHGUJcJx3pnQ7fgmK0X9UHjJDi TGm/oRthbDh1cuxIktzVF2cUsiN3pk655fewfAisK+0c9W5W8VVZdKnKu1Hi5ut22uof u3Kg== X-Gm-Message-State: AOAM533blJOYeJmS+6Bp5O5DY5FX/hD9+Ln0wBerhoP5o/bOR/rQ2zjm 5mWmF6pXN8i0SDe6V849Rs1kkA== X-Google-Smtp-Source: ABdhPJwrWIpLSYf41av9bZsrjEfrlf4lf8//RpX+N0WUgXGOZN7ZDB+gPcHHEGIp6RA3wivQd9OHbQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr26158129wrx.173.1600258057971; Wed, 16 Sep 2020 05:07:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y2sm4834552wmg.23.2020.09.16.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:07:36 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:33 +0200 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_080739_315079_2269D811 X-CRM114-Status: GOOD ( 19.41 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms 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, joonas.lahtinen@linux.intel.com, dri-devel@lists.freedesktop.org, michal.simek@xilinx.com, eric@anholt.net, thierry.reding@gmail.com, robdclark@gmail.com, 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, patrik.r.jakobsson@gmail.com, 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, andi.shyti@intel.com, daniel@ffwll.ch, linux-arm-msm@vger.kernel.org, marek.olsak@amd.com, tianci.yin@amd.com, maarten.lankhorst@linux.intel.com, etnaviv@lists.freedesktop.org, jani.nikula@linux.intel.com, inki.dae@samsung.com, hdegoede@redhat.com, christian.gmeiner@gmail.com, linux-mediatek@lists.infradead.org, mripard@kernel.org, rodrigo.vivi@intel.com, matthias.bgg@gmail.com, evan.quan@amd.com, sean@poorly.run, linux-arm-kernel@lists.infradead.org, tvrtko.ursulin@linux.intel.com, 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 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Tue, Sep 15, 2020 at 04:59:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 2.28.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Date: Wed, 16 Sep 2020 14:07:33 +0200 Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann-l3A5Bk7waGM@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Thomas Zimmermann Cc: hamohammed.sa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org, andrey.grodzovsky-5C7GfCeVMHo@public.gmane.org, airlied-cv59FeDIM0c@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, joonas.lahtinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org, eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org, sumit.semwal-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, emil.velikov-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jy0922.shim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, oleksandr_andrushchenko-uRwfk40T5oI@public.gmane.org, tomi.valkeinen-l0cyMroinI0@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org, patrik.r.jakobsson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b@public.gmane.org, miaoqinglang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, matthew.auld-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, chunkuang.hu-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, andi.shyti-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, daniel-/w4YWyX8dFk@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, marek.olsak@amd.c List-Id: nouveau.vger.kernel.org On Tue, Sep 15, 2020 at 04:59:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 2.28.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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=unavailable 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 EEA11C43461 for ; Wed, 16 Sep 2020 12:07:44 +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 9C7C622209 for ; Wed, 16 Sep 2020 12:07:44 +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="D8Cn+Lnz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C7C622209 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 321CF6E9EC; Wed, 16 Sep 2020 12:07:41 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A3C36E9C0 for ; Wed, 16 Sep 2020 12:07:39 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id k15so6632765wrn.10 for ; Wed, 16 Sep 2020 05:07:39 -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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=D8Cn+LnzRzcwcAFRiK+P1SGw66Mhbu0VayIxxEwp3/Ke3uFcgTtEyg2O2TchfbyaU1 /t1Jed/k7t8UhbtyHLBWwi9QGEEtHwtsdBVK0+CssfY95ypMsX9PNDgpg6PAhXIZmBww EM4H0+Gc3gntNd2KUdiNeLGf+3Tz2z1yDgJeU= 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=MGCPV3gxMGzqEc3cNJPEYSeaflc+Izh53Gg+hbi1Nhw=; b=SKfPbe+bIQifnRAJrta6GUQW7XpouMRO8GKNarxyEA0VOqbTGi6m5+v/pqshdBG0bR MA4Q7PfZtRhqtnmvy9wAJX9xknoLn4ghVJ1yjk2YZUtJZ6FZlyEnWM+3v/pQz21pG576 3ZU98go+kyffHa/je5yopDxW0G/pYzKv7pcyTDsVZPfaoHgl28h/+9+DPEwVNw8fiSpC luP84Upt6xpYqb18ONK5xvgY6PXLRiQZkPIcDB3B/lkHaIVzU6W9Sj/GOSGaAR3yRUqU eaBQPLyACd/pUaF44xahqAExWC83ygZhSXuYFsIcCGk8jTOc7IXrm49oHGa092eEabos U7XQ== X-Gm-Message-State: AOAM530HC3l0sc2Vx2+yGbFNlSBAh0oOfBotfzxwvYL54ObCpyRpWF01 2SQp1Vr7tNxtVt4jXa23Cg+eRg== X-Google-Smtp-Source: ABdhPJwrWIpLSYf41av9bZsrjEfrlf4lf8//RpX+N0WUgXGOZN7ZDB+gPcHHEGIp6RA3wivQd9OHbQ== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr26158129wrx.173.1600258057971; Wed, 16 Sep 2020 05:07:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y2sm4834552wmg.23.2020.09.16.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:07:36 -0700 (PDT) Date: Wed, 16 Sep 2020 14:07:33 +0200 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs Message-ID: <20200916120733.GN438822@phenom.ffwll.local> References: <20200915145958.19993-1-tzimmermann@suse.de> <20200915145958.19993-14-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200915145958.19993-14-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, airlied@linux.ie, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, michal.simek@xilinx.com, thierry.reding@gmail.com, krzk@kernel.org, sam@ravnborg.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, andi.shyti@intel.com, linux-arm-msm@vger.kernel.org, marek.olsak@amd.com, tianci.yin@amd.com, etnaviv@lists.freedesktop.org, hdegoede@redhat.com, linux-mediatek@lists.infradead.org, rodrigo.vivi@intel.com, matthias.bgg@gmail.com, evan.quan@amd.com, sean@poorly.run, linux-arm-kernel@lists.infradead.org, tvrtko.ursulin@linux.intel.com, 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, alexander.deucher@amd.com, Hawking.Zhang@amd.com, freedreno@lists.freedesktop.org, christian.koenig@amd.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Sep 15, 2020 at 04:59:50PM +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 rockchip. 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/rockchip/rockchip_drm_drv.c | 5 ----- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 0f3eb392fe39..b7654f5e4225 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { > static struct drm_driver rockchip_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - .gem_vm_ops = &drm_gem_cma_vm_ops, > - .gem_free_object_unlocked = rockchip_gem_free_object, > .dumb_create = rockchip_gem_dumb_create, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, > .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, > - .gem_prime_vmap = rockchip_gem_prime_vmap, > - .gem_prime_vunmap = rockchip_gem_prime_vunmap, > .gem_prime_mmap = rockchip_gem_mmap_buf, > .fops = &rockchip_drm_driver_fops, > .name = DRIVER_NAME, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 0055d86576f7..bddc7d99efe3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -296,6 +296,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) > kfree(rk_obj); > } > > +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { > + .free = rockchip_gem_free_object, > + .get_sg_table = rockchip_gem_prime_get_sg_table, > + .vmap = rockchip_gem_prime_vmap, > + .vunmap = rockchip_gem_prime_vunmap, > + .vm_ops = &drm_gem_cma_vm_ops, > +}; > + > static struct rockchip_gem_object * > rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) > { > @@ -310,6 +318,8 @@ static struct rockchip_gem_object * > > obj = &rk_obj->base; > > + obj->funcs = &rockchip_gem_object_funcs; > + > drm_gem_object_init(drm, obj, size); > > return rk_obj; > -- > 2.28.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel