Change-Id: Ie2a812716a6802f7a5a0bc09b1a8db824c5bf2ed Signed-off-by: Flora Cui Flora.Cui@amd.com --- amdgpu/amdgpu.h | 2 +- amdgpu/amdgpu_gpu_info.c | 2 +- include/drm/amdgpu_drm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..34ca5f1 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,7 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number; - uint32_t cu_ao_mask; + uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4]; /* video memory type info*/ uint32_t vram_type; diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..acfd700 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -229,7 +229,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev) }
dev->info.cu_active_number = dev->dev_info.cu_active_number; - dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask; + memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap));
/* TODO: info->max_quad_shader_pipes is not set */ diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number; - __u32 cu_ao_mask; + __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
I'm not 100% sure what this is all about, but it clearly won't work like this.
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
That is a non-backward compatible change to the kernel interface and as such forbidden.
Regards, Christian.
Am 20.06.2017 um 11:04 schrieb Flora Cui:
Change-Id: Ie2a812716a6802f7a5a0bc09b1a8db824c5bf2ed Signed-off-by: Flora Cui Flora.Cui@amd.com
amdgpu/amdgpu.h | 2 +- amdgpu/amdgpu_gpu_info.c | 2 +- include/drm/amdgpu_drm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..34ca5f1 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,7 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number;
- uint32_t cu_ao_mask;
- uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4]; /* video memory type info*/ uint32_t vram_type;
diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..acfd700 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -229,7 +229,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev) }
dev->info.cu_active_number = dev->dev_info.cu_active_number;
- dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask;
memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap));
/* TODO: info->max_quad_shader_pipes is not set */
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
On Tue, Jun 20, 2017 at 11:49:23AM +0200, Christian König wrote:
I'm not 100% sure what this is all about, but it clearly won't work like this.
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
That is a non-backward compatible change to the kernel interface and as such forbidden.
The uabi changes should also flow from the kernel first, only then land in libdrm. See libdrm/include/drm/README. -Daniel
Regards, Christian.
Am 20.06.2017 um 11:04 schrieb Flora Cui:
Change-Id: Ie2a812716a6802f7a5a0bc09b1a8db824c5bf2ed Signed-off-by: Flora Cui Flora.Cui@amd.com
amdgpu/amdgpu.h | 2 +- amdgpu/amdgpu_gpu_info.c | 2 +- include/drm/amdgpu_drm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..34ca5f1 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,7 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number;
- uint32_t cu_ao_mask;
- uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4]; /* video memory type info*/ uint32_t vram_type;
diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..acfd700 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -229,7 +229,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev) } dev->info.cu_active_number = dev->dev_info.cu_active_number;
- dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask;
- memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap)); /* TODO: info->max_quad_shader_pipes is not set */
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
each SE take 16 bit in cu_ao_mask. For ASICs with 4 SE, cu_ao_mask has invalid value. so I change cu_ao_mask to cu_ao_bitmap[4][4] and increase kmd driver version.
On Tue, Jun 20, 2017 at 11:49:23AM +0200, Christian König wrote:
I'm not 100% sure what this is all about, but it clearly won't work like this.
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
That is a non-backward compatible change to the kernel interface and as such forbidden.
Regards, Christian.
Am 20.06.2017 um 11:04 schrieb Flora Cui:
Change-Id: Ie2a812716a6802f7a5a0bc09b1a8db824c5bf2ed Signed-off-by: Flora Cui Flora.Cui@amd.com
amdgpu/amdgpu.h | 2 +- amdgpu/amdgpu_gpu_info.c | 2 +- include/drm/amdgpu_drm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..34ca5f1 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,7 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number;
- uint32_t cu_ao_mask;
- uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4]; /* video memory type info*/ uint32_t vram_type;
diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..acfd700 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -229,7 +229,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev) } dev->info.cu_active_number = dev->dev_info.cu_active_number;
- dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask;
- memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap)); /* TODO: info->max_quad_shader_pipes is not set */
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
On Wed, Jun 21, 2017 at 10:13:54AM +0800, Flora Cui wrote:
each SE take 16 bit in cu_ao_mask. For ASICs with 4 SE, cu_ao_mask has invalid value. so I change cu_ao_mask to cu_ao_bitmap[4][4] and increase kmd driver version.
Please read Documentation/ioctl/botching-up-ioctls.txt
You cannot change ioctl structures like you're proposing here.
Thanks, Daniel
On Tue, Jun 20, 2017 at 11:49:23AM +0200, Christian König wrote:
I'm not 100% sure what this is all about, but it clearly won't work like this.
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
That is a non-backward compatible change to the kernel interface and as such forbidden.
Regards, Christian.
Am 20.06.2017 um 11:04 schrieb Flora Cui:
Change-Id: Ie2a812716a6802f7a5a0bc09b1a8db824c5bf2ed Signed-off-by: Flora Cui Flora.Cui@amd.com
amdgpu/amdgpu.h | 2 +- amdgpu/amdgpu_gpu_info.c | 2 +- include/drm/amdgpu_drm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..34ca5f1 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,7 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number;
- uint32_t cu_ao_mask;
- uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4]; /* video memory type info*/ uint32_t vram_type;
diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..acfd700 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -229,7 +229,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev) } dev->info.cu_active_number = dev->dev_info.cu_active_number;
- dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask;
- memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap)); /* TODO: info->max_quad_shader_pipes is not set */
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..dcbe22c 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,7 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- __u32 cu_ao_mask;
- __u32 cu_ao_bitmap[4][4]; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ __u32 enabled_rb_pipes_mask;
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
keep cu_ao_mask unchanged for backward compatibility.
Change-Id: I9f497aadd309977468e246fea333b392c0150276 Signed-off-by: Flora Cui Flora.Cui@amd.com --- This patch should be landed after the kmd patch upsteam. right? amdgpu/amdgpu.h | 2 ++ amdgpu/amdgpu_gpu_info.c | 1 + include/drm/amdgpu_drm.h | 3 +++ 3 files changed, 6 insertions(+)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..cc80493 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,9 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number; + /* NOTE: cu_ao_mask is INVALID, DON'T use it */ uint32_t cu_ao_mask; + uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4]; /* video memory type info*/ uint32_t vram_type; diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..7a5feb9 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -230,6 +230,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
dev->info.cu_active_number = dev->dev_info.cu_active_number; dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask; + memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap));
/* TODO: info->max_quad_shader_pipes is not set */ diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..05c4e72 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,6 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number; + /* NOTE: cu_ao_mask is INVALID, DON'T use it */ __u32 cu_ao_mask; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ @@ -886,6 +887,8 @@ struct drm_amdgpu_info_device { /* max gs wavefront per vgt*/ __u32 max_gs_waves_per_vgt; __u32 _pad1; + /* always on cu bitmap */ + __u32 cu_ao_bitmap[4][4]; };
struct drm_amdgpu_info_hw_ip {
On 26/06/17 03:12 PM, Flora Cui wrote:
keep cu_ao_mask unchanged for backward compatibility.
Change-Id: I9f497aadd309977468e246fea333b392c0150276 Signed-off-by: Flora Cui Flora.Cui@amd.com
This patch should be landed after the kmd patch upsteam. right?
Right. Also, include/drm/amdgpu_drm.h should be updated in a separate patch, see include/drm/README (in particular the "When and how to update these files").
Am 26.06.2017 um 08:12 schrieb Flora Cui:
keep cu_ao_mask unchanged for backward compatibility.
Change-Id: I9f497aadd309977468e246fea333b392c0150276 Signed-off-by: Flora Cui Flora.Cui@amd.com
This patch should be landed after the kmd patch upsteam. right?
In general yes, but this patch is a NAK as well.
amdgpu/amdgpu.h | 2 ++ amdgpu/amdgpu_gpu_info.c | 1 + include/drm/amdgpu_drm.h | 3 +++ 3 files changed, 6 insertions(+)
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index b6779f9..cc80493 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -486,7 +486,9 @@ struct amdgpu_gpu_info { uint32_t pa_sc_raster_cfg1[4]; /* CU info */ uint32_t cu_active_number;
- /* NOTE: cu_ao_mask is INVALID, DON'T use it */ uint32_t cu_ao_mask;
- uint32_t cu_ao_bitmap[4][4]; uint32_t cu_bitmap[4][4];
You can't change the amdgpu_gpu_info structure here for the same reasons you can't change the kernel interface.
Even worse in oposite to the kernel interface this structure isn't versionized, so you can't change it at all.
I suggest that we deprecate amdgpu_gpu_info and clients just call the appropriate info query directly.
Regards, Christian.
/* video memory type info*/ uint32_t vram_type; diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c index 34f77be..7a5feb9 100644 --- a/amdgpu/amdgpu_gpu_info.c +++ b/amdgpu/amdgpu_gpu_info.c @@ -230,6 +230,7 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
dev->info.cu_active_number = dev->dev_info.cu_active_number; dev->info.cu_ao_mask = dev->dev_info.cu_ao_mask;
memcpy(&dev->info.cu_ao_bitmap[0][0], &dev->dev_info.cu_ao_bitmap[0][0], sizeof(dev->info.cu_ao_bitmap)); memcpy(&dev->info.cu_bitmap[0][0], &dev->dev_info.cu_bitmap[0][0], sizeof(dev->info.cu_bitmap));
/* TODO: info->max_quad_shader_pipes is not set */
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index df250de..05c4e72 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -832,6 +832,7 @@ struct drm_amdgpu_info_device { __u64 max_memory_clock; /* cu information */ __u32 cu_active_number;
- /* NOTE: cu_ao_mask is INVALID, DON'T use it */ __u32 cu_ao_mask; __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */
@@ -886,6 +887,8 @@ struct drm_amdgpu_info_device { /* max gs wavefront per vgt*/ __u32 max_gs_waves_per_vgt; __u32 _pad1;
/* always on cu bitmap */
__u32 cu_ao_bitmap[4][4]; };
struct drm_amdgpu_info_hw_ip {
dri-devel@lists.freedesktop.org
-
Christian König -
Daniel Vetter -
Flora Cui -
Flora Cui
-
Michel Dänzer