drm/vc4: plane: Omit pixel_order from the hvs_format for hvs5 only formats

pixel_order is used for the earlier versions of the HVS, so is
redundant on the 10:10:10:2 and 10bit YUV formats that are only
supported on HVS5.
Remove the assignment from the table to avoid confusion.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20221207-rpi-hvs-crtc-misc-v1-10-1f8e0770798b@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 8b4805c..7b7bbe9 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -148,35 +148,30 @@ static const struct hvs_format {
        {
                .drm = DRM_FORMAT_P030,
                .hvs = HVS_PIXEL_FORMAT_YCBCR_10BIT,
-               .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
                .pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
                .hvs5_only = true,
        },
        {
                .drm = DRM_FORMAT_XRGB2101010,
                .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-               .pixel_order = HVS_PIXEL_ORDER_ABGR,
                .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
                .hvs5_only = true,
        },
        {
                .drm = DRM_FORMAT_ARGB2101010,
                .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-               .pixel_order = HVS_PIXEL_ORDER_ABGR,
                .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
                .hvs5_only = true,
        },
        {
                .drm = DRM_FORMAT_ABGR2101010,
                .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-               .pixel_order = HVS_PIXEL_ORDER_ARGB,
                .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
                .hvs5_only = true,
        },
        {
                .drm = DRM_FORMAT_XBGR2101010,
                .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-               .pixel_order = HVS_PIXEL_ORDER_ARGB,
                .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
                .hvs5_only = true,
        },