drm: Use userspace compatible type in fourcc_mod_code macro
diff mbox

Message ID 1442999431-28568-1-git-send-email-tvrtko.ursulin@linux.intel.com
State New
Headers show

Commit Message

Tvrtko Ursulin Sept. 23, 2015, 9:10 a.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

__u64 should be used instead of u64.

Feature originally added in:

commit e3eb3250d84ef97b766312345774367b6a310db8
Author: Rob Clark <robdclark@gmail.com>
Date:   Thu Feb 5 14:41:52 2015 +0000

    drm: add support for tiled/compressed/etc modifier in addfb2

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: stable@vger.kernel.org
---
 include/uapi/drm/drm_fourcc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ville Syrjälä Sept. 23, 2015, 11:36 a.m. UTC | #1
On Wed, Sep 23, 2015 at 10:10:31AM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> __u64 should be used instead of u64.
> 
> Feature originally added in:
> 
> commit e3eb3250d84ef97b766312345774367b6a310db8
> Author: Rob Clark <robdclark@gmail.com>
> Date:   Thu Feb 5 14:41:52 2015 +0000
> 
>     drm: add support for tiled/compressed/etc modifier in addfb2
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: stable@vger.kernel.org

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  include/uapi/drm/drm_fourcc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> index 8c5e8b91a3cb..0b69a7753558 100644
> --- a/include/uapi/drm/drm_fourcc.h
> +++ b/include/uapi/drm/drm_fourcc.h
> @@ -158,7 +158,7 @@
>  /* add more to the end as needed */
>  
>  #define fourcc_mod_code(vendor, val) \
> -	((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
> +	((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
>  
>  /*
>   * Format Modifier tokens:
> -- 
> 2.5.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula Nov. 5, 2015, 12:51 p.m. UTC | #2
On Wed, 23 Sep 2015, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, Sep 23, 2015 at 10:10:31AM +0100, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> 
>> __u64 should be used instead of u64.
>> 
>> Feature originally added in:
>> 
>> commit e3eb3250d84ef97b766312345774367b6a310db8
>> Author: Rob Clark <robdclark@gmail.com>
>> Date:   Thu Feb 5 14:41:52 2015 +0000
>> 
>>     drm: add support for tiled/compressed/etc modifier in addfb2
>> 
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Cc: Rob Clark <robdclark@gmail.com>
>> Cc: Daniel Stone <daniels@collabora.com>
>> Cc: Daniel Vetter <daniel.vetter@intel.com>
>> Cc: dri-devel@lists.freedesktop.org
>> Cc: stable@vger.kernel.org
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Pushed to our topic/drm-fixes branch, thanks for the patch and review.

BR,
Jani.

>
>> ---
>>  include/uapi/drm/drm_fourcc.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
>> index 8c5e8b91a3cb..0b69a7753558 100644
>> --- a/include/uapi/drm/drm_fourcc.h
>> +++ b/include/uapi/drm/drm_fourcc.h
>> @@ -158,7 +158,7 @@
>>  /* add more to the end as needed */
>>  
>>  #define fourcc_mod_code(vendor, val) \
>> -	((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
>> +	((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
>>  
>>  /*
>>   * Format Modifier tokens:
>> -- 
>> 2.5.1
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rob Clark Nov. 5, 2015, 9:12 p.m. UTC | #3
On Thu, Nov 5, 2015 at 7:51 AM, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Wed, 23 Sep 2015, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
>> On Wed, Sep 23, 2015 at 10:10:31AM +0100, Tvrtko Ursulin wrote:
>>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>>
>>> __u64 should be used instead of u64.
>>>
>>> Feature originally added in:
>>>
>>> commit e3eb3250d84ef97b766312345774367b6a310db8
>>> Author: Rob Clark <robdclark@gmail.com>
>>> Date:   Thu Feb 5 14:41:52 2015 +0000
>>>
>>>     drm: add support for tiled/compressed/etc modifier in addfb2
>>>
>>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>> Cc: Rob Clark <robdclark@gmail.com>
>>> Cc: Daniel Stone <daniels@collabora.com>
>>> Cc: Daniel Vetter <daniel.vetter@intel.com>
>>> Cc: dri-devel@lists.freedesktop.org
>>> Cc: stable@vger.kernel.org
>>
>> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Pushed to our topic/drm-fixes branch, thanks for the patch and review.

and I've pushed the libdrm part

BR,
-R

> BR,
> Jani.
>
>>
>>> ---
>>>  include/uapi/drm/drm_fourcc.h | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
>>> index 8c5e8b91a3cb..0b69a7753558 100644
>>> --- a/include/uapi/drm/drm_fourcc.h
>>> +++ b/include/uapi/drm/drm_fourcc.h
>>> @@ -158,7 +158,7 @@
>>>  /* add more to the end as needed */
>>>
>>>  #define fourcc_mod_code(vendor, val) \
>>> -    ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
>>> +    ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
>>>
>>>  /*
>>>   * Format Modifier tokens:
>>> --
>>> 2.5.1
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox

diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 8c5e8b91a3cb..0b69a7753558 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -158,7 +158,7 @@ 
 /* add more to the end as needed */
 
 #define fourcc_mod_code(vendor, val) \
-	((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
+	((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
 
 /*
  * Format Modifier tokens: