lkml.org 
[lkml]   [2014]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 134/168] nouveau: move the hotplug ignore to correct place.
    Date
    3.16.7-ckt3 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Dave Airlie <airlied@redhat.com>

    commit 8b62c8c6df08ca567c78afa51aa7bbc554cede06 upstream.

    Introduced in b440bde74f, however it was added to
    the wrong function in nouveau.

    https://bugzilla.kernel.org/show_bug.cgi?id=86011
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
    index 0f7addae60d7..84a8b9fb20c8 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
    @@ -595,7 +595,6 @@ int nouveau_pmops_suspend(struct device *dev)

    pci_save_state(pdev);
    pci_disable_device(pdev);
    - pci_ignore_hotplug(pdev);
    pci_set_power_state(pdev, PCI_D3hot);
    return 0;
    }
    @@ -887,6 +886,7 @@ static int nouveau_pmops_runtime_suspend(struct device *dev)
    ret = nouveau_do_suspend(drm_dev, true);
    pci_save_state(pdev);
    pci_disable_device(pdev);
    + pci_ignore_hotplug(pdev);
    pci_set_power_state(pdev, PCI_D3cold);
    drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;
    return ret;
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-12-15 16:01    [W:2.470 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site