.pixel_order = HVS_PIXEL_ORDER_XBGR,
},
{
-@@ -836,35 +851,6 @@ static int vc4_plane_mode_set(struct drm
+@@ -832,35 +847,6 @@ static int vc4_plane_mode_set(struct drm
return -EINVAL;
}
/* Don't waste cycles mixing with plane alpha if the set alpha
* is opaque or there is no per-pixel alpha information.
* In any case we use the alpha property value as the fixed alpha.
-@@ -872,20 +858,120 @@ static int vc4_plane_mode_set(struct drm
+@@ -868,20 +854,120 @@ static int vc4_plane_mode_set(struct drm
mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
fb->format->has_alpha;
/* Pointer Word 0/1/2: RGB / Y / Cb / Cr Pointers
-@@ -1276,6 +1362,10 @@ static bool vc4_format_mod_supported(str
+@@ -1272,6 +1358,10 @@ static bool vc4_format_mod_supported(str
default:
return false;
}