lkml.org 
[lkml]   [2012]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 10/11] drm/nouveau: fix suspend/resume when in headless mode
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Skeggs <bskeggs@redhat.com>

    Backport of fixes from upstream commit:
    9430738d80223a1cd791a2baa74fa170d3df1262

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/nouveau/nouveau_drv.c | 18 +++++++++++-------
    1 file changed, 11 insertions(+), 7 deletions(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_drv.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
    @@ -186,11 +186,13 @@ nouveau_pci_suspend(struct pci_dev *pdev
    if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
    return 0;

    - NV_INFO(dev, "Disabling display...\n");
    - nouveau_display_fini(dev);
    + if (dev->mode_config.num_crtc) {
    + NV_INFO(dev, "Disabling display...\n");
    + nouveau_display_fini(dev);

    - NV_INFO(dev, "Disabling fbcon...\n");
    - nouveau_fbcon_set_suspend(dev, 1);
    + NV_INFO(dev, "Disabling fbcon...\n");
    + nouveau_fbcon_set_suspend(dev, 1);
    + }

    NV_INFO(dev, "Unpinning framebuffer(s)...\n");
    list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
    @@ -363,10 +365,12 @@ nouveau_pci_resume(struct pci_dev *pdev)
    NV_ERROR(dev, "Could not pin/map cursor.\n");
    }

    - nouveau_fbcon_set_suspend(dev, 0);
    - nouveau_fbcon_zfill_all(dev);
    + if (dev->mode_config.num_crtc) {
    + nouveau_fbcon_set_suspend(dev, 0);
    + nouveau_fbcon_zfill_all(dev);

    - nouveau_display_init(dev);
    + nouveau_display_init(dev);
    + }

    /* Force CLUT to get re-loaded during modeset */
    list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {



    \
     
     \ /
      Last update: 2012-11-02 20:01    [W:4.341 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site