drm/sun4i: backend: Refine the logic behind using the frontend

Checking that scaling is in use is not sufficient as a condition to
decide to use the frontend.

Since not all layer formats are supported by the frontend, we need to
check for that support first. Then, the frontend must only be enabled
if the backend doesn't support the format or that scaling is required.

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-7-paul.kocialkowski@bootlin.com

diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index 7dd24eb03f8911c01dead6508d21d1d37820a64d..735fea7ead0b59d25d4f7771b2d76c03d052b6d2 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -449,16 +449,32 @@ static bool sun4i_backend_plane_uses_frontend(struct drm_plane_state *state)
 {
        struct sun4i_layer *layer = plane_to_sun4i_layer(state->plane);
        struct sun4i_backend *backend = layer->backend;
+       uint32_t format = state->fb->format->format;
 
        if (IS_ERR(backend->frontend))
                return false;
 
+       if (!sun4i_frontend_format_is_supported(format))
+               return false;
+
+       if (!sun4i_backend_format_is_supported(format))
+               return true;
+
        /*
         * TODO: The backend alone allows 2x and 4x integer scaling, including
         * support for an alpha component (which the frontend doesn't support).
-        * Use the backend directly instead of the frontend in this case.
+        * Use the backend directly instead of the frontend in this case, with
+        * another test to return false.
+        */
+
+       if (sun4i_backend_plane_uses_scaler(state))
+               return true;
+
+       /*
+        * Here the format is supported by both the frontend and the backend
+        * and no frontend scaling is required, so use the backend directly.
         */
-       return sun4i_backend_plane_uses_scaler(state);
+       return false;
 }
 
 static void sun4i_backend_atomic_begin(struct sunxi_engine *engine,