drm/asahi: Do not use l10r for 12.3 DCP firmware

DCP firmware 12.3 (tested as 12.4 on a M2) does not support l10r as
buffer format. Drop 30-bit support for 12.x firmware. 12.3 based
installs are considered legacy and support for 12.4 (M2 only) was
dropped. This ensures such installs remain usable without complicating
the driver too much.

DCP complains on syslog with
> UPPipeDCP_H13P.cpp:3302: IOMFB verify_surfaces: No support for format l10r

Fixes: b6a8d6b ("drm: apple: Advertise ARGB2101010 support")
Signed-off-by: Janne Grunau <j@jannau.net>

Author: jannau

drivers/gpu/drm/apple/apple_drv.c

@@ -273,8 +273,10 @@ static int apple_probe_per_dcp(struct device *dev,
 	struct drm_plane *planes[DCP_MAX_PLANES];
 	int ret, i;
 	int immutable_zpos = 0;
+	bool supports_l10r = !dcp_fw_compat_is_12_x(dcp);
 
-	planes[0] = apple_plane_init(drm, 1U << num, DRM_PLANE_TYPE_PRIMARY);
+	planes[0] = apple_plane_init(drm, 1U << num, supports_l10r,
+				     DRM_PLANE_TYPE_PRIMARY);
 	if (IS_ERR(planes[0]))
 		return PTR_ERR(planes[0]);
 	ret = drm_plane_create_zpos_immutable_property(planes[0], immutable_zpos);
@@ -285,7 +287,8 @@ static int apple_probe_per_dcp(struct device *dev,
 
 	/* Set up our other planes */
 	for (i = 1; i < DCP_MAX_PLANES; i++) {
-		planes[i] = apple_plane_init(drm, 1U << num, DRM_PLANE_TYPE_OVERLAY);
+		planes[i] = apple_plane_init(drm, 1U << num, supports_l10r,
+					     DRM_PLANE_TYPE_OVERLAY);
 		if (IS_ERR(planes[i]))
 			return PTR_ERR(planes[i]);
 		immutable_zpos++;

drivers/gpu/drm/apple/dcp.c

@@ -501,6 +501,14 @@ void dcp_link(struct platform_device *pdev, struct apple_crtc *crtc,
 	dcp->connector = connector;
 }
 
+
+bool dcp_fw_compat_is_12_x(struct platform_device *pdev)
+{
+	struct apple_dcp *dcp = platform_get_drvdata(pdev);
+
+	return dcp->fw_compat == DCP_FIRMWARE_V_12_3;
+}
+
 int dcp_start(struct platform_device *pdev)
 {
 	struct apple_dcp *dcp = platform_get_drvdata(pdev);

drivers/gpu/drm/apple/dcp.h

@@ -34,6 +34,7 @@ void dcp_poweron(struct platform_device *pdev);
 int dcp_set_crc(struct drm_crtc *crtc, bool enabled);
 int dcp_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state);
 int dcp_get_connector_type(struct platform_device *pdev);
+bool dcp_fw_compat_is_12_x(struct platform_device *pdev);
 void dcp_link(struct platform_device *pdev, struct apple_crtc *apple,
 	      struct apple_connector *connector);
 int dcp_start(struct platform_device *pdev);

drivers/gpu/drm/apple/plane.c

@@ -394,6 +394,37 @@ static const u32 dcp_overlay_formats[] = {
 #endif
 };
 
+/*
+ * Formats for the 12.x firmware which does not support "l10r" / ARGB2101010
+ */
+static const u32 dcp_primary_formats_12_x[] = {
+	DRM_FORMAT_XRGB8888,
+	DRM_FORMAT_ARGB8888,
+	DRM_FORMAT_XBGR8888,
+	DRM_FORMAT_ABGR8888,
+	DRM_FORMAT_NV12,
+	DRM_FORMAT_NV16,
+	DRM_FORMAT_NV24,
+	DRM_FORMAT_P010,
+	DRM_FORMAT_P210,
+#if defined(DRM_FORMAT_P410)
+	DRM_FORMAT_P410,
+#endif
+};
+
+static const u32 dcp_overlay_formats_12_x[] = {
+	DRM_FORMAT_ARGB8888,
+	DRM_FORMAT_ABGR8888,
+	DRM_FORMAT_NV12,
+	DRM_FORMAT_NV16,
+	DRM_FORMAT_NV24,
+	DRM_FORMAT_P010,
+	DRM_FORMAT_P210,
+#if defined(DRM_FORMAT_P410)
+	DRM_FORMAT_P410,
+#endif
+};
+
 u64 apple_format_modifiers[] = {
 	DRM_FORMAT_MOD_LINEAR,
 	DRM_FORMAT_MOD_INVALID
@@ -405,22 +436,37 @@ struct apple_plane {
 
 struct drm_plane *apple_plane_init(struct drm_device *dev,
 				   unsigned long possible_crtcs,
+				   bool supports_l10r,
 				   enum drm_plane_type type)
 {
 	struct apple_plane *plane;
+	const u32 *fmts;
+	u32 num_fmts;
 
 	switch (type) {
 	case DRM_PLANE_TYPE_PRIMARY:
+		if (supports_l10r) {
+			fmts = dcp_primary_formats;
+			num_fmts = ARRAY_SIZE(dcp_primary_formats);
+		} else {
+			fmts = dcp_primary_formats_12_x;
+			num_fmts = ARRAY_SIZE(dcp_primary_formats_12_x);
+		}
 		plane = drmm_universal_plane_alloc(dev, struct apple_plane, base, possible_crtcs,
-				       &apple_plane_funcs,
-				       dcp_primary_formats, ARRAY_SIZE(dcp_primary_formats),
+				       &apple_plane_funcs, fmts, num_fmts,
 				       apple_format_modifiers, type, NULL);
 		break;
 	case DRM_PLANE_TYPE_OVERLAY:
 	case DRM_PLANE_TYPE_CURSOR:
+		if (supports_l10r) {
+			fmts = dcp_overlay_formats;
+			num_fmts = ARRAY_SIZE(dcp_overlay_formats);
+		} else {
+			fmts = dcp_overlay_formats_12_x;
+			num_fmts = ARRAY_SIZE(dcp_overlay_formats_12_x);
+		}
 		plane = drmm_universal_plane_alloc(dev, struct apple_plane, base, possible_crtcs,
-				       &apple_plane_funcs,
-				       dcp_overlay_formats, ARRAY_SIZE(dcp_overlay_formats),
+				       &apple_plane_funcs, fmts, num_fmts,
 				       apple_format_modifiers, type, NULL);
 		break;
 	default:

drivers/gpu/drm/apple/plane.h

@@ -24,6 +24,7 @@ struct apple_plane_state {
 
 struct drm_plane *apple_plane_init(struct drm_device *dev,
 				   unsigned long possible_crtcs,
+				   bool supports_l10r,
 				   enum drm_plane_type type);
 
 #endif /* __APPLE_PLANE_H__ */