Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e7c385 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500/cdv: Unpin framebuffer on crtc disable 

The framebuffer needs to be unpinned in the crtc->disable callback
because of previous pinning in psb_intel_pipe_set_base(). This will fix
a memory leak where the framebuffer was released but not unpinned
properly. This patch only affects Cedarview.

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


Cc: stable@vger.kernel.org
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent 820de86a

drivers/gpu/drm/gma500/cdv_intel_display.c

+14 −0
Original line number Diff line number Diff line
@@ -1750,6 +1750,19 @@ static void cdv_intel_crtc_destroy(struct drm_crtc *crtc) 
	kfree(psb_intel_crtc);

}



static void cdv_intel_crtc_disable(struct drm_crtc *crtc)

{

	struct gtt_range *gt;

	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;



	crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);



	if (crtc->fb) {

		gt = to_psb_fb(crtc->fb)->gtt;

		psb_gtt_unpin(gt);

	}

}



const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {

	.dpms = cdv_intel_crtc_dpms,

	.mode_fixup = cdv_intel_crtc_mode_fixup,
@@ -1757,6 +1770,7 @@ const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { 
	.mode_set_base = cdv_intel_pipe_set_base,

	.prepare = cdv_intel_crtc_prepare,

	.commit = cdv_intel_crtc_commit,

	.disable = cdv_intel_crtc_disable,

};



const struct drm_crtc_funcs cdv_intel_crtc_funcs = {