[Intel-gfx] [PATCH] drm/i915/display: fix the uint*_t types that have crept in

Souza, Jose jose.souza at intel.com
Wed Jan 13 14:13:19 UTC 2021


On Wed, 2021-01-13 at 16:11 +0200, Jani Nikula wrote:
> Always prefer the kernel types over stdint types in i915.
> 


Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> Cc: Imre Deak <imre.deak at intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c       | 2 +-
>  drivers/gpu/drm/i915/display/intel_display.h       | 2 +-
>  drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
>  drivers/gpu/drm/i915/display/intel_fbc.c           | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 0189d379a55e..fc3337854465 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -1954,7 +1954,7 @@ int intel_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane)
>  
> 
> 
> 
>  bool
>  intel_format_info_is_yuv_semiplanar(const struct drm_format_info *info,
> -				    uint64_t modifier)
> +				    u64 modifier)
>  {
>  	return info->is_yuv &&
>  	       info->num_planes == (is_ccs_modifier(modifier) ? 4 : 2);
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 7ddbc00a0f41..d6c3fa9544ef 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -643,7 +643,7 @@ void intel_display_print_error_state(struct drm_i915_error_state_buf *e,
>  
> 
> 
> 
>  bool
>  intel_format_info_is_yuv_semiplanar(const struct drm_format_info *info,
> -				    uint64_t modifier);
> +				    u64 modifier);
>  
> 
> 
> 
>  int intel_plane_compute_gtt(struct intel_plane_state *plane_state);
>  u32 intel_plane_compute_aligned_offset(int *x, int *y,
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 24792102bcf6..585bb1edea04 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -545,7 +545,7 @@ struct intel_plane_state {
>  		struct drm_framebuffer *fb;
>  
> 
> 
> 
>  		u16 alpha;
> -		uint16_t pixel_blend_mode;
> +		u16 pixel_blend_mode;
>  		unsigned int rotation;
>  		enum drm_color_encoding color_encoding;
>  		enum drm_color_range color_range;
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index 33200b5cfad0..5fd4fa4805ef 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -676,7 +676,7 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)
>  }
>  
> 
> 
> 
>  static bool tiling_is_valid(struct drm_i915_private *dev_priv,
> -			    uint64_t modifier)
> +			    u64 modifier)
>  {
>  	switch (modifier) {
>  	case DRM_FORMAT_MOD_LINEAR:



More information about the Intel-gfx mailing list