On Wed, 2021-12-01 at 17:25 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Rename the YUV byte order bits to be a bit more consistent.
Why rename bits not used? Would be better already nuke it.
Anyways up to you.
Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 8 ++++----
> drivers/gpu/drm/i915/i915_reg.h | 14 +++++++-------
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 845b99844ec6..9ff24a0e79b4 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -672,13 +672,13 @@ static u32 skl_plane_ctl_format(u32 pixel_format)
> case DRM_FORMAT_XYUV8888:
> return PLANE_CTL_FORMAT_XYUV;
> case DRM_FORMAT_YUYV:
> - return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
> + return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_ORDER_YUYV;
> case DRM_FORMAT_YVYU:
> - return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YVYU;
> + return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_ORDER_YVYU;
> case DRM_FORMAT_UYVY:
> - return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_UYVY;
> + return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_ORDER_UYVY;
> case DRM_FORMAT_VYUY:
> - return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_VYUY;
> + return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_ORDER_VYUY;
> case DRM_FORMAT_NV12:
> return PLANE_CTL_FORMAT_NV12;
> case DRM_FORMAT_P010:
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 3c0471f20e53..02d8db03c0bf 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6966,7 +6966,7 @@ enum {
> #define DVS_SOURCE_KEY (1 << 22)
> #define DVS_RGB_ORDER_XBGR (1 << 20)
> #define DVS_YUV_FORMAT_BT709 (1 << 18)
> -#define DVS_YUV_BYTE_ORDER_MASK (3 << 16)
> +#define DVS_YUV_ORDER_MASK (3 << 16)
> #define DVS_YUV_ORDER_YUYV (0 << 16)
> #define DVS_YUV_ORDER_UYVY (1 << 16)
> #define DVS_YUV_ORDER_YVYU (2 << 16)
> @@ -7045,7 +7045,7 @@ enum {
> #define SPRITE_RGB_ORDER_RGBX (1 << 20) /* only for 888 and 161616 */
> #define SPRITE_YUV_TO_RGB_CSC_DISABLE (1 << 19)
> #define SPRITE_YUV_TO_RGB_CSC_FORMAT_BT709 (1 << 18) /* 0 is BT601 */
> -#define SPRITE_YUV_BYTE_ORDER_MASK (3 << 16)
> +#define SPRITE_YUV_ORDER_MASK (3 << 16)
> #define SPRITE_YUV_ORDER_YUYV (0 << 16)
> #define SPRITE_YUV_ORDER_UYVY (1 << 16)
> #define SPRITE_YUV_ORDER_YVYU (2 << 16)
> @@ -7130,7 +7130,7 @@ enum {
> #define SP_ALPHA_PREMULTIPLY (1 << 23) /* CHV pipe B */
> #define SP_SOURCE_KEY (1 << 22)
> #define SP_YUV_FORMAT_BT709 (1 << 18)
> -#define SP_YUV_BYTE_ORDER_MASK (3 << 16)
> +#define SP_YUV_ORDER_MASK (3 << 16)
> #define SP_YUV_ORDER_YUYV (0 << 16)
> #define SP_YUV_ORDER_UYVY (1 << 16)
> #define SP_YUV_ORDER_YVYU (2 << 16)
> @@ -7271,10 +7271,10 @@ enum {
> #define PLANE_CTL_YUV420_Y_PLANE (1 << 19)
> #define PLANE_CTL_YUV_TO_RGB_CSC_FORMAT_BT709 (1 << 18)
> #define PLANE_CTL_YUV422_ORDER_MASK (0x3 << 16)
> -#define PLANE_CTL_YUV422_YUYV (0 << 16)
> -#define PLANE_CTL_YUV422_UYVY (1 << 16)
> -#define PLANE_CTL_YUV422_YVYU (2 << 16)
> -#define PLANE_CTL_YUV422_VYUY (3 << 16)
> +#define PLANE_CTL_YUV422_ORDER_YUYV (0 << 16)
> +#define PLANE_CTL_YUV422_ORDER_UYVY (1 << 16)
> +#define PLANE_CTL_YUV422_ORDER_YVYU (2 << 16)
> +#define PLANE_CTL_YUV422_ORDER_VYUY (3 << 16)
> #define PLANE_CTL_RENDER_DECOMPRESSION_ENABLE (1 << 15)
> #define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14)
> #define PLANE_CTL_CLEAR_COLOR_DISABLE (1 << 13) /* TGL+ */
