A framebuffer is pinned when it's set as pipe base, so we also need to
unpin it when it's destroyed. Some framebuffers are never used as
scanout (no mode set on them) so if the pin count is less than one, no
unpinning is needed.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=889511
Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=812113

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson at gmail.com>
---
 drivers/gpu/drm/gma500/framebuffer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/gma500/framebuffer.c 
b/drivers/gpu/drm/gma500/framebuffer.c
index 8b1b6d9..1a11b69 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -668,6 +668,11 @@ static void psb_user_framebuffer_destroy(struct 
drm_framebuffer *fb)

        /* Let DRM do its clean up */
        drm_framebuffer_cleanup(fb);
+
+       /* Unpin any psb_intel_pipe_set_base() pinning */
+       if (r->in_gart > 0)
+               psb_gtt_unpin(r);
+
        /*  We are no longer using the resource in GEM */
        drm_gem_object_unreference_unlocked(&r->gem);
        kfree(fb);
-- 
1.8.1.2

Reply via email to