From 74dfa17e01e7cb6b8f529cc119fa60dfa96b4346 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Tue, 9 Apr 2013 15:26:00 +0300 Subject: [PATCH] --- yaml --- r: 371375 b: refs/heads/master c: b03e14fd4b9f91d0c6be864bf62c75933fa26cac h: refs/heads/master i: 371373: 67ed20a2cc3ce6c67f87cb8a491cc3c472901c9e 371371: e4d032c0018db74c3d93a42855a392d079642253 371367: 959a29db5c0fbb733cfaa808e4469507de5b4c2d 371359: 84a6f0cf66bf445bbb770121b2d7749bb4434dd6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/omapdrm/omap_plane.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3ed2fb67d19c..d3a5231808e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bddabbe174cfb6f944baaf13ed5b93c6ee89ec3d +refs/heads/master: b03e14fd4b9f91d0c6be864bf62c75933fa26cac diff --git a/trunk/drivers/gpu/drm/omapdrm/omap_plane.c b/trunk/drivers/gpu/drm/omapdrm/omap_plane.c index 2882cda6ea19..8d225d7ff4e3 100644 --- a/trunk/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/trunk/drivers/gpu/drm/omapdrm/omap_plane.c @@ -247,6 +247,12 @@ static int omap_plane_update(struct drm_plane *plane, { struct omap_plane *omap_plane = to_omap_plane(plane); omap_plane->enabled = true; + + if (plane->fb) + drm_framebuffer_unreference(plane->fb); + + drm_framebuffer_reference(fb); + return omap_plane_mode_set(plane, crtc, fb, crtc_x, crtc_y, crtc_w, crtc_h, src_x, src_y, src_w, src_h,