From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Madhav.Chauhan@amd.com, michael.j.ruhl@intel.com, tzimmermann@suse.de
Subject: [PATCH 09/11] drm/nouveau: stop using TTM_MEMTYPE_FLAG_MAPPABLE
Date: Tue, 21 Jul 2020 09:32:43 +0200 [thread overview]
Message-ID: <20200721073245.2484-9-christian.koenig@amd.com> (raw)
In-Reply-To: <20200721073245.2484-1-christian.koenig@amd.com>
The driver doesn't expose any not-mapable memory resources.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 7883341f8c83..4ccf937df0d0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -655,13 +655,12 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
switch (type) {
case TTM_PL_SYSTEM:
- man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
+ man->flags = 0;
man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED;
break;
case TTM_PL_VRAM:
- man->flags = TTM_MEMTYPE_FLAG_FIXED |
- TTM_MEMTYPE_FLAG_MAPPABLE;
+ man->flags = TTM_MEMTYPE_FLAG_FIXED;
man->available_caching = TTM_PL_FLAG_UNCACHED |
TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
@@ -690,12 +689,12 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
man->func = &ttm_bo_manager_func;
if (drm->agp.bridge) {
- man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
+ man->flags = 0;
man->available_caching = TTM_PL_FLAG_UNCACHED |
TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
} else {
- man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
+ man->flags = 0;
man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED;
}
@@ -1437,7 +1436,6 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp)
static int
nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
{
- struct ttm_mem_type_manager *man = &bdev->man[reg->mem_type];
struct nouveau_drm *drm = nouveau_bdev(bdev);
struct nvkm_device *device = nvxx_device(&drm->client.device);
struct nouveau_mem *mem = nouveau_mem(reg);
@@ -1447,8 +1445,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
reg->bus.size = reg->num_pages << PAGE_SHIFT;
reg->bus.base = 0;
reg->bus.is_iomem = false;
- if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
- return -EINVAL;
+
switch (reg->mem_type) {
case TTM_PL_SYSTEM:
/* System memory */
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-21 7:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 7:32 [PATCH 01/11] drm: remove optional dummy function from drivers using TTM Christian König
2020-07-21 7:32 ` [PATCH 02/11] drm/ttm: cleanup io_mem interface with nouveau Christian König
2020-07-21 8:50 ` daniel
2020-07-22 7:05 ` Chauhan, Madhav
2020-07-21 7:32 ` [PATCH 03/11] drm/ttm: remove io_reserve_fastpath flag Christian König
2020-07-21 8:52 ` daniel
2020-07-21 7:32 ` [PATCH 04/11] drm/ttm: cleanup coding style and implementation Christian König
2020-07-21 8:56 ` daniel
2020-07-21 7:32 ` [PATCH 05/11] drm/ttm: remove TTM_MEMTYPE_FLAG_CMA Christian König
2020-07-21 9:01 ` daniel
2020-07-21 7:32 ` [PATCH 06/11] drm/radeon: stop using TTM_MEMTYPE_FLAG_MAPPABLE Christian König
2020-07-21 9:24 ` daniel
2020-07-21 14:46 ` Christian König
2020-07-22 5:34 ` Daniel Vetter
2020-07-22 11:13 ` Christian König
2020-07-22 11:42 ` Daniel Vetter
2020-07-22 11:49 ` Christian König
2020-07-22 11:58 ` Daniel Vetter
2020-07-21 7:32 ` [PATCH 07/11] drm/vmwgfx: " Christian König
2020-07-21 9:26 ` daniel
2020-07-21 7:32 ` [PATCH 08/11] drm/amdgpu: " Christian König
2020-07-21 9:28 ` daniel
2020-07-21 9:45 ` Chauhan, Madhav
2020-07-21 14:30 ` Christian König
2020-07-21 7:32 ` Christian König [this message]
2020-07-21 9:28 ` [PATCH 09/11] drm/nouveau: " daniel
2020-07-21 7:32 ` [PATCH 10/11] drm/qxl: stop using TTM_MEMTYPE_FLAG_MAPPABLE v2 Christian König
2020-07-21 9:29 ` daniel
2020-07-21 7:32 ` [PATCH 11/11] drm/ttm: remove TTM_MEMTYPE_FLAG_MAPPABLE Christian König
2020-07-21 9:30 ` daniel
2020-07-21 9:54 ` kernel test robot
2020-07-21 7:55 ` [PATCH 01/11] drm: remove optional dummy function from drivers using TTM Daniel Vetter
2020-07-21 8:02 ` Christian König
2020-07-21 9:15 ` Chauhan, Madhav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200721073245.2484-9-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=Madhav.Chauhan@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=michael.j.ruhl@intel.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).