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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 B5E58C5517A for ; Wed, 11 Nov 2020 14:23:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4358C2087D for ; Wed, 11 Nov 2020 14:23:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="YHYqe1XA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726136AbgKKOXe (ORCPT ); Wed, 11 Nov 2020 09:23:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:37124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726900AbgKKOXc (ORCPT ); Wed, 11 Nov 2020 09:23:32 -0500 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6957021D7F for ; Wed, 11 Nov 2020 14:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605104611; bh=xm3rQeDIh2FuZjYEyhCI9+5vLDwhs0MB53yet3dsIaE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=YHYqe1XAaUhHzsv5Kqp60wcUzpVUg10Rf1hE9WUDffB3eyNSez3bzOaE0urommKG+ 4S/vthSBxzglvADka+L/wmjplP1wrZSFya3A2DZMt+SFMkyiXj7GV1ewX1/3nmIqMC zwd2312Z1N6FCegBdAAEv/fyh0fYMibHUH+wFsJ8= Received: by mail-ed1-f48.google.com with SMTP id v4so2505942edi.0 for ; Wed, 11 Nov 2020 06:23:31 -0800 (PST) X-Gm-Message-State: AOAM531/ckvwWA4UBkJP+0eyDKCfG5v5SSzDLZZDdTLF0Ty36KSLqi1u eeRsho8KEnGUYV3dyTtlmE2SpZMqk15OoiXOMA== X-Google-Smtp-Source: ABdhPJxh+77oiphOx3YcIcxiUEmfWiMYRwROdlpWqzLsSf75JddHNGi9QfuS9fuMmuFcPm/rgVNfg169e9VDB275Qg8= X-Received: by 2002:a50:f0d4:: with SMTP id a20mr5290937edm.303.1605104609593; Wed, 11 Nov 2020 06:23:29 -0800 (PST) MIME-Version: 1.0 References: <20201109103242.19544-1-tzimmermann@suse.de> <20201109103242.19544-3-tzimmermann@suse.de> In-Reply-To: <20201109103242.19544-3-tzimmermann@suse.de> From: Chun-Kuang Hu Date: Wed, 11 Nov 2020 22:23:15 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/2] drm/mediatek: Use struct dma_buf_map in GEM vmap ops To: Thomas Zimmermann Cc: Daniel Vetter , David Airlie , Chun-Kuang Hu , Philipp Zabel , robdclark@gmail.com, sean@poorly.run, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, DRI Development , =?UTF-8?Q?Christian_K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Dave Airlie , Lucas Stach , Russell King , Christian Gmeiner , Qiang Yu , Ben Skeggs , Rob Herring , Tomeu Vizoso , Steven Price , Alyssa Rosenzweig , Gerd Hoffmann , Alex Deucher , Sandy Huang , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Hans de Goede , Eric Anholt , Rodrigo Siqueira , Melissa Wen , Haneen Mohammed , Oleksandr Andrushchenko , Sumit Semwal , Emil Velikov , Marek Szyprowski , Arunpravin , Huang Rui , Luben Tuikov , Madhav Chauhan , Nirmoy Das , Jason Gunthorpe , Sam Ravnborg , Chris Wilson , etnaviv@lists.freedesktop.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, virtualization@lists.linux-foundation.org, spice-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Linux ARM , linux-rockchip@lists.infradead.org, xen-devel@lists.xenproject.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi, Thomas: Thomas Zimmermann =E6=96=BC 2020=E5=B9=B411=E6=9C=889= =E6=97=A5 =E9=80=B1=E4=B8=80 =E4=B8=8B=E5=8D=886:32=E5=AF=AB=E9=81=93=EF=BC= =9A > > Fixes a build failure with mediatek. > > This change was supposed to be part of commit 49a3f51dfeee ("drm/gem: > Use struct dma_buf_map in GEM vmap ops and convert GEM backends"), but > mediatek was forgotten. Acked-by: Chun-Kuang Hu > > Signed-off-by: Thomas Zimmermann > Fixes: 49a3f51dfeee ("drm/gem: Use struct dma_buf_map in GEM vmap ops and= convert GEM backends") > Cc: Thomas Zimmermann > Cc: Christian K=C3=B6nig > Cc: David Airlie > Cc: Daniel Vetter > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Dave Airlie > Cc: Lucas Stach > Cc: Russell King > Cc: Christian Gmeiner > Cc: Qiang Yu > Cc: Ben Skeggs > Cc: Rob Herring > Cc: Tomeu Vizoso > Cc: Steven Price > Cc: Alyssa Rosenzweig > Cc: Gerd Hoffmann > Cc: Alex Deucher > Cc: "Christian K=C3=B6nig" > Cc: Sandy Huang > Cc: "Heiko St=C3=BCbner" > Cc: Hans de Goede > Cc: Sean Paul > Cc: Eric Anholt > Cc: Rodrigo Siqueira > Cc: Melissa Wen > Cc: Haneen Mohammed > Cc: Oleksandr Andrushchenko > Cc: Sumit Semwal > Cc: Emil Velikov > Cc: Marek Szyprowski > Cc: Arunpravin > Cc: Huang Rui > Cc: Luben Tuikov > Cc: Madhav Chauhan > Cc: Nirmoy Das > Cc: Jason Gunthorpe > Cc: Sam Ravnborg > Cc: Chris Wilson > Cc: dri-devel@lists.freedesktop.org > Cc: etnaviv@lists.freedesktop.org > Cc: lima@lists.freedesktop.org > Cc: nouveau@lists.freedesktop.org > Cc: virtualization@lists.linux-foundation.org > Cc: spice-devel@lists.freedesktop.org > Cc: amd-gfx@lists.freedesktop.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rockchip@lists.infradead.org > Cc: xen-devel@lists.xenproject.org > --- > drivers/gpu/drm/mediatek/mtk_drm_gem.c | 20 ++++++++++++-------- > drivers/gpu/drm/mediatek/mtk_drm_gem.h | 4 ++-- > 2 files changed, 14 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/med= iatek/mtk_drm_gem.c > index cdd1a6e61564..28a2ee1336ef 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c > @@ -240,23 +240,25 @@ struct drm_gem_object *mtk_gem_prime_import_sg_tabl= e(struct drm_device *dev, > return &mtk_gem->base; > } > > -void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj) > +int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_ma= p *map) > { > struct mtk_drm_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); > - struct sg_table *sgt; > + struct sg_table *sgt =3D NULL; > unsigned int npages; > > if (mtk_gem->kvaddr) > - return mtk_gem->kvaddr; > + goto out; > > sgt =3D mtk_gem_prime_get_sg_table(obj); > if (IS_ERR(sgt)) > - return NULL; > + return PTR_ERR(sgt); > > npages =3D obj->size >> PAGE_SHIFT; > mtk_gem->pages =3D kcalloc(npages, sizeof(*mtk_gem->pages), GFP_K= ERNEL); > - if (!mtk_gem->pages) > - goto out; > + if (!mtk_gem->pages) { > + kfree(sgt); > + return -ENOMEM; > + } > > drm_prime_sg_to_page_addr_arrays(sgt, mtk_gem->pages, NULL, npage= s); > > @@ -265,13 +267,15 @@ void *mtk_drm_gem_prime_vmap(struct drm_gem_object = *obj) > > out: > kfree(sgt); > + dma_buf_map_set_vaddr(map, mtk_gem->kvaddr); > > - return mtk_gem->kvaddr; > + return 0; > } > > -void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) > +void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf= _map *map) > { > struct mtk_drm_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); > + void *vaddr =3D map->vaddr; > > if (!mtk_gem->pages) > return; > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/med= iatek/mtk_drm_gem.h > index ff9f976d9807..6da5ccb4b933 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.h > @@ -45,7 +45,7 @@ int mtk_drm_gem_mmap_buf(struct drm_gem_object *obj, > struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj); > struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *= dev, > struct dma_buf_attachment *attach, struct sg_tabl= e *sg); > -void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj); > -void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); > +int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_ma= p *map); > +void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf= _map *map); > > #endif > -- > 2.29.2 >