]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/omap: print error instead of WARN() if plane setup fails
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 10 Jun 2016 09:44:31 +0000 (12:44 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 2 Nov 2016 08:38:28 +0000 (10:38 +0200)
omap_plane_atomic_update() does WARN_ON() if dispc rejects the given
plane config. Change that to dev_err() to lessen the possible spam.

To fix this correctly, the plane setup needs much more work by creating
a check function for dispc setup, so that we could reliably check the
config in atomic_check, instead of only noticing the problem when
programming dispc.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/gpu/drm/omapdrm/omap_plane.c

index adab71b170174271b633af5ff18e5f857375459f..9c43cb481e62b978529897b2559f9e2ff29efbd2 100644 (file)
@@ -131,7 +131,9 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
        /* and finally, update omapdss: */
        ret = dispc_ovl_setup(omap_plane->id, &info, false,
                              omap_crtc_timings(state->crtc), false);
-       if (WARN_ON(ret)) {
+       if (ret) {
+               dev_err(plane->dev->dev, "Failed to setup plane %s\n",
+                       omap_plane->name);
                dispc_ovl_enable(omap_plane->id, false);
                return;
        }