From: "Marek Olšák" <maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Grazvydas Ignotas <notasas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: amd-gfx mailing list
<amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Subject: Re: [PATCH] drm/amdgpu: allow shifts >= 32 in AMDGPU_TILING_SET/GET
Date: Wed, 22 Mar 2017 17:32:02 +0100 [thread overview]
Message-ID: <CAAxE2A7wE7vbVVWadddf9TrH7U=VvybW785WvSRyjoDvrA_sXw@mail.gmail.com> (raw)
In-Reply-To: <CANOLnOPaUu1_U7eq2Mk-8G=zws8x5a2fLp-svKEHkfmPkrpitQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
On Wed, Mar 22, 2017 at 11:43 AM, Grazvydas Ignotas <notasas@gmail.com> wrote:
> On Tue, Mar 21, 2017 at 9:44 PM, Marek Olšák <maraeo@gmail.com> wrote:
>> From: Marek Olšák <marek.olsak@amd.com>
>>
>> also adjust the comments
>>
>> Signed-off-by: Marek Olšák <marek.olsak@amd.com>
>> ---
>> include/uapi/drm/amdgpu_drm.h | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
>> index 7c6cc11..7fb9d10 100644
>> --- a/include/uapi/drm/amdgpu_drm.h
>> +++ b/include/uapi/drm/amdgpu_drm.h
>> @@ -204,46 +204,48 @@ union drm_amdgpu_ctx {
>>
>> struct drm_amdgpu_gem_userptr {
>> __u64 addr;
>> __u64 size;
>> /* AMDGPU_GEM_USERPTR_* */
>> __u32 flags;
>> /* Resulting GEM handle */
>> __u32 handle;
>> };
>>
>> +/* SI-CI-VI: */
>> /* same meaning as the GB_TILE_MODE and GL_MACRO_TILE_MODE fields */
>> #define AMDGPU_TILING_ARRAY_MODE_SHIFT 0
>> #define AMDGPU_TILING_ARRAY_MODE_MASK 0xf
>> #define AMDGPU_TILING_PIPE_CONFIG_SHIFT 4
>> #define AMDGPU_TILING_PIPE_CONFIG_MASK 0x1f
>> #define AMDGPU_TILING_TILE_SPLIT_SHIFT 9
>> #define AMDGPU_TILING_TILE_SPLIT_MASK 0x7
>> #define AMDGPU_TILING_MICRO_TILE_MODE_SHIFT 12
>> #define AMDGPU_TILING_MICRO_TILE_MODE_MASK 0x7
>> #define AMDGPU_TILING_BANK_WIDTH_SHIFT 15
>> #define AMDGPU_TILING_BANK_WIDTH_MASK 0x3
>> #define AMDGPU_TILING_BANK_HEIGHT_SHIFT 17
>> #define AMDGPU_TILING_BANK_HEIGHT_MASK 0x3
>> #define AMDGPU_TILING_MACRO_TILE_ASPECT_SHIFT 19
>> #define AMDGPU_TILING_MACRO_TILE_ASPECT_MASK 0x3
>> #define AMDGPU_TILING_NUM_BANKS_SHIFT 21
>> #define AMDGPU_TILING_NUM_BANKS_MASK 0x3
>> -/* Tiling flags for GFX9. */
>> +
>> +/* GFX9 and later: */
>> #define AMDGPU_TILING_SWIZZLE_MODE_SHIFT 0
>> #define AMDGPU_TILING_SWIZZLE_MODE_MASK 0x1f
>>
>> /* Set/Get helpers for tiling flags. */
>> #define AMDGPU_TILING_SET(field, value) \
>> - (((value) & AMDGPU_TILING_##field##_MASK) << AMDGPU_TILING_##field##_SHIFT)
>> + (((uint64_t)(value) & AMDGPU_TILING_##field##_MASK) << AMDGPU_TILING_##field##_SHIFT)
>> #define AMDGPU_TILING_GET(value, field) \
>> - (((value) >> AMDGPU_TILING_##field##_SHIFT) & AMDGPU_TILING_##field##_MASK)
>> + (((uint64_t)(value) >> AMDGPU_TILING_##field##_SHIFT) & AMDGPU_TILING_##field##_MASK)
>
> Shouldn't it be __u64 instead of uint64_t? The kernel header doesn't
> include stdint.h or use any uint* types.
Yeah, I'll fix that before pushing.
Marek
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2017-03-22 16:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 19:44 [PATCH] drm/amdgpu: allow shifts >= 32 in AMDGPU_TILING_SET/GET Marek Olšák
[not found] ` <1490125443-2458-1-git-send-email-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-21 20:05 ` Deucher, Alexander
2017-03-22 10:43 ` Grazvydas Ignotas
[not found] ` <CANOLnOPaUu1_U7eq2Mk-8G=zws8x5a2fLp-svKEHkfmPkrpitQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-03-22 16:32 ` Marek Olšák [this message]
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='CAAxE2A7wE7vbVVWadddf9TrH7U=VvybW785WvSRyjoDvrA_sXw@mail.gmail.com' \
--to=maraeo-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=notasas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.