lkml.org 
[lkml]   [2018]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 42/64] drm/nouveau/drm/nouveau: Dont forget to cancel hpd_work on suspend/unload
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Lyude Paul <lyude@redhat.com>

    commit 2f7ca781fd382cf8dde73ed36dfdd93fd05b3332 upstream.

    Currently, there's nothing in nouveau that actually cancels this work
    struct. So, cancel it on suspend/unload. Otherwise, if we're unlucky
    enough hpd_work might try to keep running up until the system is
    suspended.

    Signed-off-by: Lyude Paul <lyude@redhat.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/nouveau/nouveau_display.c | 9 ++++++---
    drivers/gpu/drm/nouveau/nouveau_display.h | 2 +-
    drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
    3 files changed, 8 insertions(+), 5 deletions(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_display.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
    @@ -426,7 +426,7 @@ nouveau_display_init(struct drm_device *
    }

    void
    -nouveau_display_fini(struct drm_device *dev, bool suspend)
    +nouveau_display_fini(struct drm_device *dev, bool suspend, bool runtime)
    {
    struct nouveau_display *disp = nouveau_display(dev);
    struct nouveau_drm *drm = nouveau_drm(dev);
    @@ -451,6 +451,9 @@ nouveau_display_fini(struct drm_device *
    }
    drm_connector_list_iter_end(&conn_iter);

    + if (!runtime)
    + cancel_work_sync(&drm->hpd_work);
    +
    drm_kms_helper_poll_disable(dev);
    disp->fini(dev);
    }
    @@ -640,11 +643,11 @@ nouveau_display_suspend(struct drm_devic
    }
    }

    - nouveau_display_fini(dev, true);
    + nouveau_display_fini(dev, true, runtime);
    return 0;
    }

    - nouveau_display_fini(dev, true);
    + nouveau_display_fini(dev, true, runtime);

    list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
    struct nouveau_framebuffer *nouveau_fb;
    --- a/drivers/gpu/drm/nouveau/nouveau_display.h
    +++ b/drivers/gpu/drm/nouveau/nouveau_display.h
    @@ -64,7 +64,7 @@ nouveau_display(struct drm_device *dev)
    int nouveau_display_create(struct drm_device *dev);
    void nouveau_display_destroy(struct drm_device *dev);
    int nouveau_display_init(struct drm_device *dev);
    -void nouveau_display_fini(struct drm_device *dev, bool suspend);
    +void nouveau_display_fini(struct drm_device *dev, bool suspend, bool runtime);
    int nouveau_display_suspend(struct drm_device *dev, bool runtime);
    void nouveau_display_resume(struct drm_device *dev, bool runtime);
    int nouveau_display_vblank_enable(struct drm_device *, unsigned int);
    --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
    @@ -546,7 +546,7 @@ nouveau_drm_unload(struct drm_device *de
    nouveau_debugfs_fini(drm);

    if (dev->mode_config.num_crtc)
    - nouveau_display_fini(dev, false);
    + nouveau_display_fini(dev, false, false);
    nouveau_display_destroy(dev);

    nouveau_bios_takedown(dev);

    \
     
     \ /
      Last update: 2018-09-27 11:21    [W:4.364 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site