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=-8.0 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 E2A19C2D0A8 for ; Wed, 30 Sep 2020 08:05:21 +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 81DFC2072E for ; Wed, 30 Sep 2020 08:05:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eBNfVeJp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81DFC2072E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 0C04F6E4D0; Wed, 30 Sep 2020 08:05:21 +0000 (UTC) Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id A29986E190; Wed, 30 Sep 2020 08:05:19 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id c8so827541edv.5; Wed, 30 Sep 2020 01:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=reply-to:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=hYkMEPfbgpUi2wWiTMu+Q1BqhfCkqr+lEZgubxfz0nA=; b=eBNfVeJpwIUfgxpXMfhfR0Ga8oDx11PUlM6ZLsOdkWgkiEEf604G5KchU88cbbhuTL /cSzUT7hf4le3Woies3p2ql/1tUPVwdgzLLAsbo77pbyWZy+XD8jltcJLpcJkaGXxPU1 N34JQ3ukOS13XvtqMFdfk/kJYTMVbTkvACuAj+W4rZUVleJ2YwvviOGxnD1NHZzWukYD ymPBR6mnl42s8Kgak2EVD6TFFiCSfTxKl3U85Z3qbT/v4OQR4pc9o2u6piFGKxNZNeey LeMsb3JYRPSdnlui/g4/QzbSwzFDsDgFnvLP5nTVf7/cF3SFzawtbrQ8l031h/EkoHdU Xcwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language; bh=hYkMEPfbgpUi2wWiTMu+Q1BqhfCkqr+lEZgubxfz0nA=; b=cEp2wVwPlC1Tzese0iiccvVaZDALtFuzPhINL6xIQAKD9FDddMKeQDshnLLaUlPygf AqcShPF01LSuFcROCg+cCsJLRSv9OwKvDyF8dkQrx5Xaf51yUszTxPGaQVW2IiGnl/zw ZjBi/9X8mM4HpMnWRoiD9MWk5KQcYzMQPQiH3+NQGNJPZHjhBNRbOvXlE7UyR8joLm0+ /eCBI0iALimSLfPa5IOcyehLyUeuCdJngxYRNuz7Y6k1/cRm8W3KFZVfE/QZldK1zjNM GL60j062JVW5M/cz0FcrWarzs1W6qgRrHRwaC0+BYTa9r8+DsNqBqap3NWy28zJk8eLk Rfeg== X-Gm-Message-State: AOAM533iIPWk7f+Ac+O1xCWpeiMXJys23P2Md3gKdX1QSWOsbe7rrxo5 hH9zijPQADjecByoekpr//o= X-Google-Smtp-Source: ABdhPJzwiwgmcLj0yHokl5225Rqp/SVc6sU6c2RZNeNbLTKr1w/PH6NZKJHqEBp3o7hguXCp85FEQg== X-Received: by 2002:a05:6402:17f6:: with SMTP id t22mr1376405edy.374.1601453118231; Wed, 30 Sep 2020 01:05:18 -0700 (PDT) Received: from ?IPv6:2a02:908:1252:fb60:be8a:bd56:1f94:86e7? ([2a02:908:1252:fb60:be8a:bd56:1f94:86e7]) by smtp.gmail.com with ESMTPSA id m10sm847124ejx.123.2020.09.30.01.05.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Sep 2020 01:05:17 -0700 (PDT) Subject: Re: [PATCH v3 2/7] drm/ttm: Add ttm_kmap_obj_to_dma_buf_map() for type conversion To: Thomas Zimmermann , =?UTF-8?Q?Christian_K=c3=b6nig?= , maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, 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, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walleij@linaro.org, melissa.srw@gmail.com, chris@chris-wilson.co.uk, miaoqinglang@huawei.com References: <20200929151437.19717-1-tzimmermann@suse.de> <20200929151437.19717-3-tzimmermann@suse.de> <8fad0114-064a-4ed5-c21d-d1b4294de0a1@amd.com> <2614314a-81f7-4722-c400-68d90e48e09a@suse.de> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <8a84f62b-33f3-f44c-52af-c859a0e0d1fb@gmail.com> Date: Wed, 30 Sep 2020 10:05:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <2614314a-81f7-4722-c400-68d90e48e09a@suse.de> Content-Language: en-US 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: , Reply-To: christian.koenig@amd.com Cc: linux-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, etnaviv@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, spice-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: multipart/mixed; boundary="===============1886118315==" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" This is a multi-part message in MIME format. --===============1886118315== Content-Type: multipart/alternative; boundary="------------635115E847F12105B10D495F" Content-Language: en-US This is a multi-part message in MIME format. --------------635115E847F12105B10D495F Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Am 29.09.20 um 19:49 schrieb Thomas Zimmermann: > Hi Christian > > Am 29.09.20 um 17:35 schrieb Christian König: >> Am 29.09.20 um 17:14 schrieb Thomas Zimmermann: >>> The new helper ttm_kmap_obj_to_dma_buf() extracts address and location >>> from and instance of TTM's kmap_obj and initializes struct dma_buf_map >>> with these values. Helpful for TTM-based drivers. >> We could completely drop that if we use the same structure inside TTM as >> well. >> >> Additional to that which driver is going to use this? > As Daniel mentioned, it's in patch 3. The TTM-based drivers will > retrieve the pointer via this function. > > I do want to see all that being more tightly integrated into TTM, but > not in this series. This one is about fixing the bochs-on-sparc64 > problem for good. Patch 7 adds an update to TTM to the DRM TODO list. I should have asked which driver you try to fix here :) In this case just keep the function inside bochs and only fix it there. All other drivers can be fixed when we generally pump this through TTM. Regards, Christian. > > Best regards > Thomas > >> Regards, >> Christian. >> >>> Signed-off-by: Thomas Zimmermann >>> --- >>>   include/drm/ttm/ttm_bo_api.h | 24 ++++++++++++++++++++++++ >>>   include/linux/dma-buf-map.h  | 20 ++++++++++++++++++++ >>>   2 files changed, 44 insertions(+) >>> >>> diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h >>> index c96a25d571c8..62d89f05a801 100644 >>> --- a/include/drm/ttm/ttm_bo_api.h >>> +++ b/include/drm/ttm/ttm_bo_api.h >>> @@ -34,6 +34,7 @@ >>>   #include >>>   #include >>>   #include >>> +#include >>>   #include >>>   #include >>>   #include >>> @@ -486,6 +487,29 @@ static inline void *ttm_kmap_obj_virtual(struct >>> ttm_bo_kmap_obj *map, >>>       return map->virtual; >>>   } >>>   +/** >>> + * ttm_kmap_obj_to_dma_buf_map >>> + * >>> + * @kmap: A struct ttm_bo_kmap_obj returned from ttm_bo_kmap. >>> + * @map: Returns the mapping as struct dma_buf_map >>> + * >>> + * Converts struct ttm_bo_kmap_obj to struct dma_buf_map. If the memory >>> + * is not mapped, the returned mapping is initialized to NULL. >>> + */ >>> +static inline void ttm_kmap_obj_to_dma_buf_map(struct ttm_bo_kmap_obj >>> *kmap, >>> +                           struct dma_buf_map *map) >>> +{ >>> +    bool is_iomem; >>> +    void *vaddr = ttm_kmap_obj_virtual(kmap, &is_iomem); >>> + >>> +    if (!vaddr) >>> +        dma_buf_map_clear(map); >>> +    else if (is_iomem) >>> +        dma_buf_map_set_vaddr_iomem(map, (void __force __iomem *)vaddr); >>> +    else >>> +        dma_buf_map_set_vaddr(map, vaddr); >>> +} >>> + >>>   /** >>>    * ttm_bo_kmap >>>    * >>> diff --git a/include/linux/dma-buf-map.h b/include/linux/dma-buf-map.h >>> index fd1aba545fdf..2e8bbecb5091 100644 >>> --- a/include/linux/dma-buf-map.h >>> +++ b/include/linux/dma-buf-map.h >>> @@ -45,6 +45,12 @@ >>>    * >>>    *    dma_buf_map_set_vaddr(&map. 0xdeadbeaf); >>>    * >>> + * To set an address in I/O memory, use dma_buf_map_set_vaddr_iomem(). >>> + * >>> + * .. code-block:: c >>> + * >>> + *    dma_buf_map_set_vaddr_iomem(&map. 0xdeadbeaf); >>> + * >>>    * Test if a mapping is valid with either dma_buf_map_is_set() or >>>    * dma_buf_map_is_null(). >>>    * >>> @@ -118,6 +124,20 @@ static inline void dma_buf_map_set_vaddr(struct >>> dma_buf_map *map, void *vaddr) >>>       map->is_iomem = false; >>>   } >>>   +/** >>> + * dma_buf_map_set_vaddr_iomem - Sets a dma-buf mapping structure to >>> an address in I/O memory >>> + * @map:        The dma-buf mapping structure >>> + * @vaddr_iomem:    An I/O-memory address >>> + * >>> + * Sets the address and the I/O-memory flag. >>> + */ >>> +static inline void dma_buf_map_set_vaddr_iomem(struct dma_buf_map *map, >>> +                           void __iomem *vaddr_iomem) >>> +{ >>> +    map->vaddr_iomem = vaddr_iomem; >>> +    map->is_iomem = true; >>> +} >>> + >>>   /** >>>    * dma_buf_map_is_equal - Compares two dma-buf mapping structures >>> for equality >>>    * @lhs:    The dma-buf mapping structure >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx --------------635115E847F12105B10D495F Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit
Am 29.09.20 um 19:49 schrieb Thomas Zimmermann:
Hi Christian

Am 29.09.20 um 17:35 schrieb Christian König:

Am 29.09.20 um 17:14 schrieb Thomas Zimmermann:

The new helper ttm_kmap_obj_to_dma_buf() extracts address and location
from and instance of TTM's kmap_obj and initializes struct dma_buf_map
with these values. Helpful for TTM-based drivers.

We could completely drop that if we use the same structure inside TTM as
well.

Additional to that which driver is going to use this?

As Daniel mentioned, it's in patch 3. The TTM-based drivers will
retrieve the pointer via this function.

I do want to see all that being more tightly integrated into TTM, but
not in this series. This one is about fixing the bochs-on-sparc64
problem for good. Patch 7 adds an update to TTM to the DRM TODO list.

I should have asked which driver you try to fix here :)

In this case just keep the function inside bochs and only fix it there.

All other drivers can be fixed when we generally pump this through TTM.

Regards,
Christian.


Best regards
Thomas


Regards,
Christian.


Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
  include/drm/ttm/ttm_bo_api.h | 24 ++++++++++++++++++++++++
  include/linux/dma-buf-map.h  | 20 ++++++++++++++++++++
  2 files changed, 44 insertions(+)

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index c96a25d571c8..62d89f05a801 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -34,6 +34,7 @@
  #include <drm/drm_gem.h>
  #include <drm/drm_hashtab.h>
  #include <drm/drm_vma_manager.h>
+#include <linux/dma-buf-map.h>
  #include <linux/kref.h>
  #include <linux/list.h>
  #include <linux/wait.h>
@@ -486,6 +487,29 @@ static inline void *ttm_kmap_obj_virtual(struct
ttm_bo_kmap_obj *map,
      return map->virtual;
  }
  +/**
+ * ttm_kmap_obj_to_dma_buf_map
+ *
+ * @kmap: A struct ttm_bo_kmap_obj returned from ttm_bo_kmap.
+ * @map: Returns the mapping as struct dma_buf_map
+ *
+ * Converts struct ttm_bo_kmap_obj to struct dma_buf_map. If the memory
+ * is not mapped, the returned mapping is initialized to NULL.
+ */
+static inline void ttm_kmap_obj_to_dma_buf_map(struct ttm_bo_kmap_obj
*kmap,
+                           struct dma_buf_map *map)
+{
+    bool is_iomem;
+    void *vaddr = ttm_kmap_obj_virtual(kmap, &is_iomem);
+
+    if (!vaddr)
+        dma_buf_map_clear(map);
+    else if (is_iomem)
+        dma_buf_map_set_vaddr_iomem(map, (void __force __iomem *)vaddr);
+    else
+        dma_buf_map_set_vaddr(map, vaddr);
+}
+
  /**
   * ttm_bo_kmap
   *
diff --git a/include/linux/dma-buf-map.h b/include/linux/dma-buf-map.h
index fd1aba545fdf..2e8bbecb5091 100644
--- a/include/linux/dma-buf-map.h
+++ b/include/linux/dma-buf-map.h
@@ -45,6 +45,12 @@
   *
   *    dma_buf_map_set_vaddr(&map. 0xdeadbeaf);
   *
+ * To set an address in I/O memory, use dma_buf_map_set_vaddr_iomem().
+ *
+ * .. code-block:: c
+ *
+ *    dma_buf_map_set_vaddr_iomem(&map. 0xdeadbeaf);
+ *
   * Test if a mapping is valid with either dma_buf_map_is_set() or
   * dma_buf_map_is_null().
   *
@@ -118,6 +124,20 @@ static inline void dma_buf_map_set_vaddr(struct
dma_buf_map *map, void *vaddr)
      map->is_iomem = false;
  }
  +/**
+ * dma_buf_map_set_vaddr_iomem - Sets a dma-buf mapping structure to
an address in I/O memory
+ * @map:        The dma-buf mapping structure
+ * @vaddr_iomem:    An I/O-memory address
+ *
+ * Sets the address and the I/O-memory flag.
+ */
+static inline void dma_buf_map_set_vaddr_iomem(struct dma_buf_map *map,
+                           void __iomem *vaddr_iomem)
+{
+    map->vaddr_iomem = vaddr_iomem;
+    map->is_iomem = true;
+}
+
  /**
   * dma_buf_map_is_equal - Compares two dma-buf mapping structures
for equality
   * @lhs:    The dma-buf mapping structure

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


      

      

      
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


    

    

  


--------------635115E847F12105B10D495F--

--===============1886118315==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

--===============1886118315==--