drm/sun4i: backend: Use a specific function to check if a plane is supported

Before this patch, it is assumed that a plane is supported either
through the frontend or through the backend alone. However, the DRM
interface does not allow finely reporting our hardware capabilities
and there are cases where neither are support.

In particular, some plane formats are supported by the backend and not
the frontend, so they can only be supported without scaling.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181123092515.2511-8-paul.kocialkowski@bootlin.com

diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index 735fea7ead0b59d25d4f7771b2d76c03d052b6d2..52caf561da0e0930c2846f8bca91e5a30ddf9034 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -477,6 +477,23 @@ static bool sun4i_backend_plane_uses_frontend(struct drm_plane_state *state)
        return false;
 }
 
+static bool sun4i_backend_plane_is_supported(struct drm_plane_state *state,
+                                            bool *uses_frontend)
+{
+       if (sun4i_backend_plane_uses_frontend(state)) {
+               *uses_frontend = true;
+               return true;
+       }
+
+       *uses_frontend = false;
+
+       /* Scaling is not supported without the frontend. */
+       if (sun4i_backend_plane_uses_scaler(state))
+               return false;
+
+       return true;
+}
+
 static void sun4i_backend_atomic_begin(struct sunxi_engine *engine,
                                       struct drm_crtc_state *old_state)
 {
@@ -517,14 +534,14 @@ static int sun4i_backend_atomic_check(struct sunxi_engine *engine,
                struct drm_framebuffer *fb = plane_state->fb;
                struct drm_format_name_buf format_name;
 
-               if (sun4i_backend_plane_uses_frontend(plane_state)) {
+               if (!sun4i_backend_plane_is_supported(plane_state,
+                                                     &layer_state->uses_frontend))
+                       return -EINVAL;
+
+               if (layer_state->uses_frontend) {
                        DRM_DEBUG_DRIVER("Using the frontend for plane %d\n",
                                         plane->index);
-
-                       layer_state->uses_frontend = true;
                        num_frontend_planes++;
-               } else {
-                       layer_state->uses_frontend = false;
                }
 
                DRM_DEBUG_DRIVER("Plane FB format is %s\n",