* [PATCH libdrm] amdgpu: update amdgpu_drm.h
@ 2019-01-15 19:25 Marek Olšák
[not found] ` <20190115192527.11581-1-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Marek Olšák @ 2019-01-15 19:25 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
From: Marek Olšák <marek.olsak@amd.com>
---
include/drm/amdgpu_drm.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index 1ceec56d..be84e43c 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/drm/amdgpu_drm.h
@@ -319,20 +319,26 @@ struct drm_amdgpu_gem_userptr {
#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
/* GFX9 and later: */
#define AMDGPU_TILING_SWIZZLE_MODE_SHIFT 0
#define AMDGPU_TILING_SWIZZLE_MODE_MASK 0x1f
+#define AMDGPU_TILING_DCC_OFFSET_256B_SHIFT 5
+#define AMDGPU_TILING_DCC_OFFSET_256B_MASK 0xFFFFFF
+#define AMDGPU_TILING_DCC_PITCH_MAX_SHIFT 29
+#define AMDGPU_TILING_DCC_PITCH_MAX_MASK 0x3FFF
+#define AMDGPU_TILING_DCC_INDEPENDENT_64B_SHIFT 43
+#define AMDGPU_TILING_DCC_INDEPENDENT_64B_MASK 0x1
/* Set/Get helpers for tiling flags. */
#define AMDGPU_TILING_SET(field, value) \
(((__u64)(value) & AMDGPU_TILING_##field##_MASK) << AMDGPU_TILING_##field##_SHIFT)
#define AMDGPU_TILING_GET(value, field) \
(((__u64)(value) >> AMDGPU_TILING_##field##_SHIFT) & AMDGPU_TILING_##field##_MASK)
#define AMDGPU_GEM_METADATA_OP_SET_METADATA 1
#define AMDGPU_GEM_METADATA_OP_GET_METADATA 2
@@ -658,20 +664,22 @@ struct drm_amdgpu_cs_chunk_data {
/* Subquery id: Query PSP ASD firmware version */
#define AMDGPU_INFO_FW_ASD 0x0d
/* Subquery id: Query VCN firmware version */
#define AMDGPU_INFO_FW_VCN 0x0e
/* Subquery id: Query GFX RLC SRLC firmware version */
#define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_CNTL 0x0f
/* Subquery id: Query GFX RLC SRLG firmware version */
#define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_GPM_MEM 0x10
/* Subquery id: Query GFX RLC SRLS firmware version */
#define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_SRM_MEM 0x11
+ /* Subquery id: Query DMCU firmware version */
+ #define AMDGPU_INFO_FW_DMCU 0x12
/* number of bytes moved for TTM migration */
#define AMDGPU_INFO_NUM_BYTES_MOVED 0x0f
/* the used VRAM size */
#define AMDGPU_INFO_VRAM_USAGE 0x10
/* the used GTT size */
#define AMDGPU_INFO_GTT_USAGE 0x11
/* Information about GDS, etc. resource configuration */
#define AMDGPU_INFO_GDS_CONFIG 0x13
/* Query information about VRAM and GTT domains */
#define AMDGPU_INFO_VRAM_GTT 0x14
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH libdrm] amdgpu: update amdgpu_drm.h
[not found] ` <20190115192527.11581-1-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2019-01-16 7:37 ` Christian König
[not found] ` <92ca5d38-50d3-f00a-3750-b00fd11b6851-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Christian König @ 2019-01-16 7:37 UTC (permalink / raw)
To: Marek Olšák, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 15.01.19 um 20:25 schrieb Marek Olšák:
> From: Marek Olšák <marek.olsak@amd.com>
Maybe note in the commit message from which upstream kernel.
With that in place the patch is Reviewed-by: Christian König
<christian.koenig@amd.com>
>
> ---
> include/drm/amdgpu_drm.h | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
> index 1ceec56d..be84e43c 100644
> --- a/include/drm/amdgpu_drm.h
> +++ b/include/drm/amdgpu_drm.h
> @@ -319,20 +319,26 @@ struct drm_amdgpu_gem_userptr {
> #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
>
> /* GFX9 and later: */
> #define AMDGPU_TILING_SWIZZLE_MODE_SHIFT 0
> #define AMDGPU_TILING_SWIZZLE_MODE_MASK 0x1f
> +#define AMDGPU_TILING_DCC_OFFSET_256B_SHIFT 5
> +#define AMDGPU_TILING_DCC_OFFSET_256B_MASK 0xFFFFFF
> +#define AMDGPU_TILING_DCC_PITCH_MAX_SHIFT 29
> +#define AMDGPU_TILING_DCC_PITCH_MAX_MASK 0x3FFF
> +#define AMDGPU_TILING_DCC_INDEPENDENT_64B_SHIFT 43
> +#define AMDGPU_TILING_DCC_INDEPENDENT_64B_MASK 0x1
>
> /* Set/Get helpers for tiling flags. */
> #define AMDGPU_TILING_SET(field, value) \
> (((__u64)(value) & AMDGPU_TILING_##field##_MASK) << AMDGPU_TILING_##field##_SHIFT)
> #define AMDGPU_TILING_GET(value, field) \
> (((__u64)(value) >> AMDGPU_TILING_##field##_SHIFT) & AMDGPU_TILING_##field##_MASK)
>
> #define AMDGPU_GEM_METADATA_OP_SET_METADATA 1
> #define AMDGPU_GEM_METADATA_OP_GET_METADATA 2
>
> @@ -658,20 +664,22 @@ struct drm_amdgpu_cs_chunk_data {
> /* Subquery id: Query PSP ASD firmware version */
> #define AMDGPU_INFO_FW_ASD 0x0d
> /* Subquery id: Query VCN firmware version */
> #define AMDGPU_INFO_FW_VCN 0x0e
> /* Subquery id: Query GFX RLC SRLC firmware version */
> #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_CNTL 0x0f
> /* Subquery id: Query GFX RLC SRLG firmware version */
> #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_GPM_MEM 0x10
> /* Subquery id: Query GFX RLC SRLS firmware version */
> #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_SRM_MEM 0x11
> + /* Subquery id: Query DMCU firmware version */
> + #define AMDGPU_INFO_FW_DMCU 0x12
> /* number of bytes moved for TTM migration */
> #define AMDGPU_INFO_NUM_BYTES_MOVED 0x0f
> /* the used VRAM size */
> #define AMDGPU_INFO_VRAM_USAGE 0x10
> /* the used GTT size */
> #define AMDGPU_INFO_GTT_USAGE 0x11
> /* Information about GDS, etc. resource configuration */
> #define AMDGPU_INFO_GDS_CONFIG 0x13
> /* Query information about VRAM and GTT domains */
> #define AMDGPU_INFO_VRAM_GTT 0x14
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH libdrm] amdgpu: update amdgpu_drm.h
[not found] ` <92ca5d38-50d3-f00a-3750-b00fd11b6851-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2019-01-16 16:15 ` Marek Olšák
[not found] ` <CAAxE2A4Xz3DC7C7YV+GRSqznrRGBk7TCvpVk7pS+z+w80++XLA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Marek Olšák @ 2019-01-16 16:15 UTC (permalink / raw)
To: Christian König; +Cc: amd-gfx mailing list
[-- Attachment #1.1: Type: text/plain, Size: 375 bytes --]
On Wed, Jan 16, 2019 at 2:37 AM Christian König <
ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Am 15.01.19 um 20:25 schrieb Marek Olšák:
> > From: Marek Olšák <marek.olsak-5C7GfCeVMHo@public.gmane.org>
>
> Maybe note in the commit message from which upstream kernel.
>
No upstream kernel. It's from amd-staging-drm-next.
Marek
[-- Attachment #1.2: Type: text/html, Size: 834 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH libdrm] amdgpu: update amdgpu_drm.h
[not found] ` <CAAxE2A4Xz3DC7C7YV+GRSqznrRGBk7TCvpVk7pS+z+w80++XLA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2019-01-16 16:24 ` Koenig, Christian
[not found] ` <7b174535-ed89-9137-b204-dc21ca4ce896-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Koenig, Christian @ 2019-01-16 16:24 UTC (permalink / raw)
To: Marek Olšák; +Cc: amd-gfx mailing list
[-- Attachment #1.1: Type: text/plain, Size: 585 bytes --]
Am 16.01.19 um 17:15 schrieb Marek Olšák:
On Wed, Jan 16, 2019 at 2:37 AM Christian König <ckoenig.leichtzumerken@gmail.com<mailto:ckoenig.leichtzumerken@gmail.com>> wrote:
Am 15.01.19 um 20:25 schrieb Marek Olšák:
> From: Marek Olšák <marek.olsak@amd.com<mailto:marek.olsak@amd.com>>
Maybe note in the commit message from which upstream kernel.
No upstream kernel. It's from amd-staging-drm-next.
That's a problem, see the rules for updating this.
IIRC the code must land in an upstream kernel before it can be committed to libdrm.
Christian.
Marek
[-- Attachment #1.2: Type: text/html, Size: 1598 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH libdrm] amdgpu: update amdgpu_drm.h
[not found] ` <7b174535-ed89-9137-b204-dc21ca4ce896-5C7GfCeVMHo@public.gmane.org>
@ 2019-01-16 16:55 ` Kazlauskas, Nicholas
2019-01-16 16:56 ` Marek Olšák
1 sibling, 0 replies; 7+ messages in thread
From: Kazlauskas, Nicholas @ 2019-01-16 16:55 UTC (permalink / raw)
To: Koenig, Christian, Marek Olšák; +Cc: amd-gfx mailing list
On 1/16/19 11:24 AM, Koenig, Christian wrote:
> Am 16.01.19 um 17:15 schrieb Marek Olšák:
>> On Wed, Jan 16, 2019 at 2:37 AM Christian König
>> <ckoenig.leichtzumerken@gmail.com
>> <mailto:ckoenig.leichtzumerken@gmail.com>> wrote:
>>
>> Am 15.01.19 um 20:25 schrieb Marek Olšák:
>> > From: Marek Olšák <marek.olsak@amd.com <mailto:marek.olsak@amd.com>>
>>
>> Maybe note in the commit message from which upstream kernel.
>>
>>
>> No upstream kernel. It's from amd-staging-drm-next.
>
> That's a problem, see the rules for updating this.
>
> IIRC the code must land in an upstream kernel before it can be committed
> to libdrm.
>
> Christian.
>
>>
>> Marek
The DCC flags should be in 5.0.
Nicholas Kazlauskas
>>
>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH libdrm] amdgpu: update amdgpu_drm.h
[not found] ` <7b174535-ed89-9137-b204-dc21ca4ce896-5C7GfCeVMHo@public.gmane.org>
2019-01-16 16:55 ` Kazlauskas, Nicholas
@ 2019-01-16 16:56 ` Marek Olšák
[not found] ` <CAAxE2A5-q2hc6QugbtLU4n564263S6bemvmY_+VvapXeYmRcLg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
1 sibling, 1 reply; 7+ messages in thread
From: Marek Olšák @ 2019-01-16 16:56 UTC (permalink / raw)
To: Koenig, Christian; +Cc: amd-gfx mailing list
[-- Attachment #1.1: Type: text/plain, Size: 770 bytes --]
On Wed, Jan 16, 2019 at 11:25 AM Koenig, Christian <Christian.Koenig-urvtwAKJhsc@public.gmane.orgm>
wrote:
> Am 16.01.19 um 17:15 schrieb Marek Olšák:
>
> On Wed, Jan 16, 2019 at 2:37 AM Christian König <
> ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>
>> Am 15.01.19 um 20:25 schrieb Marek Olšák:
>> > From: Marek Olšák <marek.olsak-5C7GfCeVMHo@public.gmane.org>
>>
>> Maybe note in the commit message from which upstream kernel.
>>
>
> No upstream kernel. It's from amd-staging-drm-next.
>
>
> That's a problem, see the rules for updating this.
>
> IIRC the code must land in an upstream kernel before it can be committed
> to libdrm.
>
> Christian.
>
It looks like it's all in the master branch.
Marek
[-- Attachment #1.2: Type: text/html, Size: 1753 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH libdrm] amdgpu: update amdgpu_drm.h
[not found] ` <CAAxE2A5-q2hc6QugbtLU4n564263S6bemvmY_+VvapXeYmRcLg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2019-01-16 17:24 ` Michel Dänzer
0 siblings, 0 replies; 7+ messages in thread
From: Michel Dänzer @ 2019-01-16 17:24 UTC (permalink / raw)
To: Marek Olšák, Koenig, Christian; +Cc: amd-gfx mailing list
On 2019-01-16 5:56 p.m., Marek Olšák wrote:
> On Wed, Jan 16, 2019 at 11:25 AM Koenig, Christian <Christian.Koenig@amd.com>
> wrote:
>> Am 16.01.19 um 17:15 schrieb Marek Olšák:
>> On Wed, Jan 16, 2019 at 2:37 AM Christian König <
>> ckoenig.leichtzumerken@gmail.com> wrote:
>>
>>> Am 15.01.19 um 20:25 schrieb Marek Olšák:
>>>> From: Marek Olšák <marek.olsak@amd.com>
>>>
>>> Maybe note in the commit message from which upstream kernel.
>>>
>>
>> No upstream kernel. It's from amd-staging-drm-next.
>>
>>
>> That's a problem, see the rules for updating this.
>>
>> IIRC the code must land in an upstream kernel before it can be committed
>> to libdrm.
>>
>> Christian.
>>
>
> It looks like it's all in the master branch.
That's good, but please follow the procedure documented in
include/drm/README next time.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-01-16 17:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-15 19:25 [PATCH libdrm] amdgpu: update amdgpu_drm.h Marek Olšák
[not found] ` <20190115192527.11581-1-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-01-16 7:37 ` Christian König
[not found] ` <92ca5d38-50d3-f00a-3750-b00fd11b6851-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-01-16 16:15 ` Marek Olšák
[not found] ` <CAAxE2A4Xz3DC7C7YV+GRSqznrRGBk7TCvpVk7pS+z+w80++XLA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-01-16 16:24 ` Koenig, Christian
[not found] ` <7b174535-ed89-9137-b204-dc21ca4ce896-5C7GfCeVMHo@public.gmane.org>
2019-01-16 16:55 ` Kazlauskas, Nicholas
2019-01-16 16:56 ` Marek Olšák
[not found] ` <CAAxE2A5-q2hc6QugbtLU4n564263S6bemvmY_+VvapXeYmRcLg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-01-16 17:24 ` Michel Dänzer
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.