From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: "Chauhan, Madhav" <Madhav.Chauhan@amd.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 2/8] drm/radeon: stop using TTM_MEMTYPE_FLAG_MAPPABLE
Date: Mon, 20 Jul 2020 13:02:17 +0200 [thread overview]
Message-ID: <aacb5a0c-8be3-4df7-75c1-a8cbc506096e@gmail.com> (raw)
In-Reply-To: <BL0PR12MB24332E2D588EEE15F702AEFD9C7A0@BL0PR12MB2433.namprd12.prod.outlook.com>
Am 19.07.20 um 14:57 schrieb Chauhan, Madhav:
> [AMD Public Use]
>
> -----Original Message-----
> From: Christian König <ckoenig.leichtzumerken@gmail.com>
> Sent: Thursday, July 16, 2020 6:21 PM
> To: dri-devel@lists.freedesktop.org
> Cc: Chauhan, Madhav <Madhav.Chauhan@amd.com>
> Subject: [PATCH 2/8] drm/radeon: stop using TTM_MEMTYPE_FLAG_MAPPABLE
>
> The driver doesn't expose any not-mapable memory resources.
>
> Looks like spell mistake in "mapable". Please check.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_ttm.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 54af06df865b..b474781a0920 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -76,7 +76,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
> switch (type) {
> case TTM_PL_SYSTEM:
> /* System memory */
> - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
> + man->flags = 0;
>
> adev memory was set to zero while allocated and adev->mman.bdev used to fetch different mman.
> Do we need explicit initialization to '0'??
No, not really. But I wasn't sure if other drivers initialize their
structures as well.
So I just kept it to be uniform across drivers to completely rework
mem_type init at some point.
Regards,
Christian.
>
> Regards,
> Madhav
>
> man->available_caching = TTM_PL_MASK_CACHING;
> man->default_caching = TTM_PL_FLAG_CACHED;
> break;
> @@ -84,7 +84,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
> man->func = &ttm_bo_manager_func;
> man->available_caching = TTM_PL_MASK_CACHING;
> man->default_caching = TTM_PL_FLAG_CACHED;
> - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
> + man->flags = 0;
> #if IS_ENABLED(CONFIG_AGP)
> if (rdev->flags & RADEON_IS_AGP) {
> if (!rdev->ddev->agp) {
> @@ -92,8 +92,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
> (unsigned)type);
> return -EINVAL;
> }
> - if (!rdev->ddev->agp->cant_use_aperture)
> - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
> man->available_caching = TTM_PL_FLAG_UNCACHED |
> TTM_PL_FLAG_WC;
> man->default_caching = TTM_PL_FLAG_WC; @@ -103,8 +101,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
> case TTM_PL_VRAM:
> /* "On-card" video ram */
> man->func = &ttm_bo_manager_func;
> - 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;
> break;
> @@ -394,7 +391,6 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
>
> static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) {
> - struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
> struct radeon_device *rdev = radeon_get_rdev(bdev);
>
> mem->bus.addr = NULL;
> @@ -402,8 +398,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
> mem->bus.size = mem->num_pages << PAGE_SHIFT;
> mem->bus.base = 0;
> mem->bus.is_iomem = false;
> - if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
> - return -EINVAL;
> +
> switch (mem->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-20 11:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 12:50 [PATCH 1/8] drm/ttm: remove TTM_MEMTYPE_FLAG_CMA Christian König
2020-07-16 12:50 ` [PATCH 2/8] drm/radeon: stop using TTM_MEMTYPE_FLAG_MAPPABLE Christian König
2020-07-19 12:57 ` Chauhan, Madhav
2020-07-20 11:02 ` Christian König [this message]
2020-07-16 12:50 ` [PATCH 3/8] drm/vmwgfx: " Christian König
2020-07-16 12:50 ` [PATCH 4/8] drm/amdgpu: " Christian König
2020-07-16 12:50 ` [PATCH 5/8] drm/nouveau: " Christian König
2020-07-16 12:50 ` [PATCH 6/8] drm/qxl: " Christian König
2020-07-16 12:50 ` [PATCH 7/8] drm/vram-helper: " Christian König
2020-07-16 13:01 ` Thomas Zimmermann
2020-07-16 12:50 ` [PATCH 8/8] drm/ttm: remove TTM_MEMTYPE_FLAG_MAPPABLE Christian König
2020-07-16 13:05 ` [PATCH 1/8] drm/ttm: remove TTM_MEMTYPE_FLAG_CMA Thomas Zimmermann
2020-07-20 11:10 ` Christian König
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=aacb5a0c-8be3-4df7-75c1-a8cbc506096e@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=Madhav.Chauhan@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
/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).