drm/omap: fix issue w/ fb attached to multiple CRTCs

When the fb is detached from one CRTC/plane, paddr was set back to
zero.  But really we don't want to do this because the fb could still
be attached to other CRTC/plane(s).  This originally worked like this
to catch cases of freeing a pinned fb (but with the refcnt'ing this
should no longer be needed).  Also, there is checking in the GEM code
for freeing a pinned GEM object, so this extra level of checking is
redundant.

Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/omapdrm/omap_fb.c b/drivers/staging/omapdrm/omap_fb.c
index 446801d63007d7621da0b1227178b4b47d955206..75d2ff1bf8ad18fabf3f711c29a61e5e589b5d7e 100644 (file)
--- a/drivers/staging/omapdrm/omap_fb.c
+++ b/drivers/staging/omapdrm/omap_fb.c
@@ -253,6 +253,7 @@ int omap_framebuffer_replace(struct drm_framebuffer *a,
        int ret = 0, i, na, nb;
        struct omap_framebuffer *ofba = to_omap_framebuffer(a);
        struct omap_framebuffer *ofbb = to_omap_framebuffer(b);
+       uint32_t pinned_mask = 0;
 
        na = a ? drm_format_num_planes(a->pixel_format) : 0;
        nb = b ? drm_format_num_planes(b->pixel_format) : 0;
@@ -263,25 +264,24 @@ int omap_framebuffer_replace(struct drm_framebuffer *a,
                pa = (i < na) ? &ofba->planes[i] : NULL;
                pb = (i < nb) ? &ofbb->planes[i] : NULL;
 
-               if (pa) {
+               if (pa)
                        unpin(arg, pa->bo);
-                       pa->paddr = 0;
-               }
 
                if (pb && !ret) {
                        ret = omap_gem_get_paddr(pb->bo, &pb->paddr, true);
-                       if (!ret)
+                       if (!ret) {
                                omap_gem_dma_sync(pb->bo, DMA_TO_DEVICE);
+                               pinned_mask |= (1 << i);
+                       }
                }
        }
 
        if (ret) {
                /* something went wrong.. unpin what has been pinned */
                for (i = 0; i < nb; i++) {
-                       struct plane *pb = &ofba->planes[i];
-                       if (pb->paddr) {
+                       if (pinned_mask & (1 << i)) {
+                               struct plane *pb = &ofba->planes[i];
                                unpin(arg, pb->bo);
-                               pb->paddr = 0;
                        }
                }
        }