tizen 2.4 release

[kernel/linux-3.0.git] / drivers / gpu / drm / exynos / exynos_drm_ipp.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 8f3707d..eb6da24 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -329,9 +329,9 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data,
                pos = &config->pos;
                sz = &config->sz;
 
-               DRM_INFO("%s:prop_id[%d]ops[%s]fmt[0x%x]\n",
+               DRM_INFO("%s:prop_id[%d]ops[%s]fmt[%.4s]\n",
                        __func__, property->prop_id,
-                       i ? "dst" : "src", config->fmt);
+                       i ? "dst" : "src", (char *)&config->fmt);
 
                DRM_INFO("%s:pos[%d %d %d %d]sz[%d %d]f[%d]r[%d]\n",
                        __func__, pos->x, pos->y, pos->w, pos->h,
@@ -438,9 +438,17 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data,
        list_splice_init(&priv->event_list, &c_node->event_list);
        list_add_tail(&c_node->list, &ippdrv->cmd_list);
 
+       /*
+        * Previously, in case of WB and direct output, the ipp driver was not
+        * become dedicated. By suggestion of Inke Dae, make all ipp driver in
+        * use dedicated even in the case of M2M to avoid concurrent problem in
+        * TLB. We don't know whether there are cases which use more than 2 ipp
+        * driver at the same time. If it is not, this change solves the
+        * problems clearly without any side effect.
+        */
        /* make dedicated state without m2m */
-       if (property->cmd != IPP_CMD_M2M)
-               ippdrv->dedicated = true;
+       /* if (property->cmd != IPP_CMD_M2M) */
+       ippdrv->dedicated = true;
 
        return 0;