drm/panfrost: Remove type name from internal struct again

Message ID 20221103114036.1581854-1-steven.price@arm.com
State New
Headers
Series drm/panfrost: Remove type name from internal struct again |

Commit Message

Steven Price Nov. 3, 2022, 11:40 a.m. UTC
  Commit 72655fb942c1 ("drm/panfrost: replace endian-specific types with
native ones") accidentally reverted part of the parent commit
7228d9d79248 ("drm/panfrost: Remove type name from internal structs")
leading to the situation that the Panfrost UAPI header still doesn't
compile correctly in C++.

Revert the accidental revert and pass me a brown paper bag.

Reported-by: Alyssa Rosenzweig <alyssa@collabora.com>
Fixes: 72655fb942c1 ("drm/panfrost: replace endian-specific types with native ones")
Signed-off-by: Steven Price <steven.price@arm.com>
---
 include/uapi/drm/panfrost_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Alyssa Rosenzweig Nov. 7, 2022, 1:22 p.m. UTC | #1
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>

On Thu, Nov 03, 2022 at 11:40:36AM +0000, Steven Price wrote:
> Commit 72655fb942c1 ("drm/panfrost: replace endian-specific types with
> native ones") accidentally reverted part of the parent commit
> 7228d9d79248 ("drm/panfrost: Remove type name from internal structs")
> leading to the situation that the Panfrost UAPI header still doesn't
> compile correctly in C++.
> 
> Revert the accidental revert and pass me a brown paper bag.
> 
> Reported-by: Alyssa Rosenzweig <alyssa@collabora.com>
> Fixes: 72655fb942c1 ("drm/panfrost: replace endian-specific types with native ones")
> Signed-off-by: Steven Price <steven.price@arm.com>
> ---
>  include/uapi/drm/panfrost_drm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h
> index 6f93c915cc88..9f231d40a146 100644
> --- a/include/uapi/drm/panfrost_drm.h
> +++ b/include/uapi/drm/panfrost_drm.h
> @@ -254,7 +254,7 @@ struct panfrost_dump_object_header {
>  			__u64 nbos;
>  		} reghdr;
>  
> -		struct pan_bomap_hdr {
> +		struct {
>  			__u32 valid;
>  			__u64 iova;
>  			__u32 data[2];
> -- 
> 2.34.1
>
  
Steven Price Nov. 7, 2022, 3:47 p.m. UTC | #2
On 07/11/2022 13:22, Alyssa Rosenzweig wrote:
> Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>

Thanks, pushed to drm-misc-fixes:

c4299907c09a drm/panfrost: Remove type name from internal struct again

Steve

> On Thu, Nov 03, 2022 at 11:40:36AM +0000, Steven Price wrote:
>> Commit 72655fb942c1 ("drm/panfrost: replace endian-specific types with
>> native ones") accidentally reverted part of the parent commit
>> 7228d9d79248 ("drm/panfrost: Remove type name from internal structs")
>> leading to the situation that the Panfrost UAPI header still doesn't
>> compile correctly in C++.
>>
>> Revert the accidental revert and pass me a brown paper bag.
>>
>> Reported-by: Alyssa Rosenzweig <alyssa@collabora.com>
>> Fixes: 72655fb942c1 ("drm/panfrost: replace endian-specific types with native ones")
>> Signed-off-by: Steven Price <steven.price@arm.com>
>> ---
>>  include/uapi/drm/panfrost_drm.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h
>> index 6f93c915cc88..9f231d40a146 100644
>> --- a/include/uapi/drm/panfrost_drm.h
>> +++ b/include/uapi/drm/panfrost_drm.h
>> @@ -254,7 +254,7 @@ struct panfrost_dump_object_header {
>>  			__u64 nbos;
>>  		} reghdr;
>>  
>> -		struct pan_bomap_hdr {
>> +		struct {
>>  			__u32 valid;
>>  			__u64 iova;
>>  			__u32 data[2];
>> -- 
>> 2.34.1
>>
  

Patch

diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h
index 6f93c915cc88..9f231d40a146 100644
--- a/include/uapi/drm/panfrost_drm.h
+++ b/include/uapi/drm/panfrost_drm.h
@@ -254,7 +254,7 @@  struct panfrost_dump_object_header {
 			__u64 nbos;
 		} reghdr;
 
-		struct pan_bomap_hdr {
+		struct {
 			__u32 valid;
 			__u64 iova;
 			__u32 data[2];