e_hwc_planes: enhance debug logs

Change-Id: I5efbb24e37ff17bfa27a64eae3ebe60f471f42a1

diff --git a/src/bin/e_hwc_planes.c b/src/bin/e_hwc_planes.c
index 2c03d1f..2e8e0db 100644 (file)
--- a/src/bin/e_hwc_planes.c
+++ b/src/bin/e_hwc_planes.c
@@ -294,13 +294,7 @@ static Eina_Bool
 _e_hwc_planes_change_ec(E_Plane *ep, E_Client *new_ec)
 {
    if (!e_plane_ec_set(ep, new_ec))
-     {
-        ELOGF("HWC-PLNS", "failed to set new_ec(%s) on %d",
-              NULL, new_ec,
-              new_ec ? (new_ec->icccm.name ? new_ec->icccm.name : "no name") : "NULL",
-              ep->zpos);
-        return EINA_FALSE;
-     }
+     return EINA_FALSE;
 
    if (new_ec)
      ELOGF("HWC-PLNS", "new_ec(%s) is set on %d",
@@ -579,10 +573,8 @@ e_hwc_planes_begin(E_Hwc *hwc)
                }
           }
 
-        if (mode == E_HWC_MODE_NONE)
-           ELOGF("HWC-PLNS", " Begin is not available yet ...", NULL, NULL);
-        else
-           ELOGF("HWC-PLNS", " Begin ...", NULL, NULL);
+        if (mode != E_HWC_MODE_NONE)
+          ELOGF("HWC-PLNS", " Begin ...", NULL, NULL);
      }
 
    hwc->hwc_mode = mode;

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 54553b6..cb34f99 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -2753,21 +2753,20 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec)
              plane->ec = NULL;
              plane->need_ev = EINA_TRUE;
 
-             if (plane_trace_debug)
-               ELOGF("E_PLANE", "Plane(%p) zpos(%d)   Set NULL",
-                     (ec ? ec->pixmap : NULL), ec, plane, plane->zpos);
+             ELOGF("E_PLANE", "Plane(%p) zpos(%d)   Set NULL",
+                   (ec ? ec->pixmap : NULL), ec, plane, plane->zpos);
 
              return EINA_FALSE;
           }
      }
 end:
-   plane->ec = ec;
-   plane->need_ev = EINA_TRUE;
-
-   if (plane_trace_debug)
+   if (plane->ec != ec)
      ELOGF("E_PLANE", "Plane(%p) zpos(%d)   Set ec(%p, %s)",
            (ec ? ec->pixmap : NULL), ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
 
+   plane->ec = ec;
+   plane->need_ev = EINA_TRUE;
+
    return EINA_TRUE;
 
 set_fail:

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index bc36240..7dadda0 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -1326,18 +1326,12 @@ e_plane_renderer_ec_set(E_Plane_Renderer *renderer, E_Client *ec)
           e_plane_renderer_reserved_deactivate(renderer_client->renderer);
 
         if (!e_plane_renderer_reserved_activate(renderer, ec))
-          {
-             INF("can't activate ec:%p.", ec);
-             return EINA_FALSE;
-          }
+          return EINA_FALSE;
      }
    else
      {
         if (!e_plane_renderer_activate(renderer, ec))
-          {
-             INF("can't activate ec:%p.", ec);
-             return EINA_FALSE;
-          }
+          return EINA_FALSE;
      }
 
    return EINA_TRUE;
@@ -1710,7 +1704,6 @@ e_plane_renderer_reserved_activate(E_Plane_Renderer *renderer, E_Client *ec)
            }
         else if ((renderer->state == E_PLANE_RENDERER_STATE_CANDIDATE) && (renderer->ec == ec))
            {
-              INF("ec does not have the scanout surface yet.");
               return EINA_FALSE;
            }
         else if (renderer->state == E_PLANE_RENDERER_STATE_PENDING_DEACTIVATE)
@@ -1765,8 +1758,8 @@ e_plane_renderer_reserved_activate(E_Plane_Renderer *renderer, E_Client *ec)
         if (tsq_err != TBM_SURFACE_QUEUE_ERROR_NONE)
           ERR("fail to tbm_surface_queue_notify_reset");
 
-        if (renderer_trace_debug)
-          ELOGF("E_PLANE_RENDERER", "Candidate Renderer(%p)", ec->pixmap, ec, renderer);
+        ELOGF("E_PLANE_RENDERER", "Candidate Renderer(%p) Plane(%p) ec(%p, %s)",
+              ec->pixmap, ec, renderer, renderer->plane,  ec, e_client_util_name_get(ec));
 
         renderer->state = E_PLANE_RENDERER_STATE_CANDIDATE;
         renderer->ec = ec;
@@ -1774,8 +1767,6 @@ e_plane_renderer_reserved_activate(E_Plane_Renderer *renderer, E_Client *ec)
         renderer_client->state = E_PLANE_RENDERER_CLIENT_STATE_CANDIDATED;
         renderer_client->renderer = renderer;
 
-        INF("ec does not have the scanout surface.");
-
         return EINA_FALSE;
      }
    else
@@ -1794,8 +1785,8 @@ e_plane_renderer_reserved_activate(E_Plane_Renderer *renderer, E_Client *ec)
         return EINA_FALSE;
      }
 
-   if (renderer_trace_debug)
-     ELOGF("E_PLANE_RENDERER", "Activate Renderer(%p)", ec->pixmap, ec, renderer);
+   ELOGF("E_PLANE_RENDERER", "Activate Renderer(%p) Plane(%p) ec(%p, %s)",
+         ec->pixmap, ec, renderer, renderer->plane, ec, e_client_util_name_get(ec));
 
    renderer->ec = ec;
    renderer->state = E_PLANE_RENDERER_STATE_ACTIVATE;
@@ -1830,8 +1821,8 @@ e_plane_renderer_reserved_deactivate(E_Plane_Renderer *renderer)
 
    cqueue = _e_plane_renderer_wayland_tbm_client_queue_get(ec);
 
-   if (renderer_trace_debug)
-     ELOGF("E_PLANE_RENDERER", "Deactivate Renderer(%p)", ec->pixmap, ec, renderer);
+   ELOGF("E_PLANE_RENDERER", "Deactivate Renderer(%p) Plane(%p) ec(%p, %s)",
+         ec->pixmap, ec, renderer, renderer->plane, ec, e_client_util_name_get(ec));
 
    if (cqueue)
      {