lkml.org 
[lkml]   [2013]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[65/83] drm/gma500/cdv: Unpin framebuffer on crtc disable
    3.2.47-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>

    commit 22e7c385a80d771aaf3a15ae7ccea3b0686bbe10 upstream.

    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
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
    [bwh: Backported to 3.2: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/staging/gma500/cdv_intel_display.c | 14 ++++++++++++++
    1 file changed, 14 insertions(+)

    --- a/drivers/staging/gma500/cdv_intel_display.c
    +++ b/drivers/staging/gma500/cdv_intel_display.c
    @@ -1457,6 +1457,19 @@ static void cdv_intel_crtc_destroy(struc
    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,
    @@ -1464,6 +1477,7 @@ const struct drm_crtc_helper_funcs cdv_i
    .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 = {


    \
     
     \ /
      Last update: 2013-06-17 01:01    [W:4.107 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site