Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1775976imm; Thu, 27 Sep 2018 02:16:03 -0700 (PDT) X-Google-Smtp-Source: ACcGV60he9OceLkPAeLuT45JpCZmM8FeHfdjiqQWLUYh3Z44mz3ZL3g3pxezy+XfEReBMZzC2UVz X-Received: by 2002:a17:902:622:: with SMTP id 31-v6mr2602606plg.43.1538039763182; Thu, 27 Sep 2018 02:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538039763; cv=none; d=google.com; s=arc-20160816; b=kSSPMG09tnuA4Dn7EcsOCf0tO1ID13ol91YUVwPQY9YPAZ2zLOoFlHvVfqjWOvfEmE xlD6d6JTpaDd71utBYoq1w+l/KybUr346UcVXdO0hL4dCTug4xqzENHR07b5W2LBkgcr U5hIPtio7MHsKjL5OghUOoRQkpxLVleynzE099N7mGWAMtt5V6RcdQO9NQrhCzBq58JV 0TGw2lk6/1PpNTEtDTuujqXOoP6BSnC4ewdBm2jowXFpyDCVVovd/8406lFVQm+qfVQV qtJVGdbxxRuBeVkLpYMnN57l8YR3TjrZ3chPYJSpZv42p3eKf4hb3xFaEDeLxy76Poss huag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=nPHtpV2de82I6h8uAVtOJBkcbsCcQppvge+MUJ/z08E=; b=LtY6Nnks6kN9luzHBWiEJmO+KmVjJHkIYns4SZ7osKToYYptZAILp7x7YLbl+DlR5F KbPQZIGX7ZsslkWdvdzHG+pIbPAmKSEqvM932BwyIyP9TWETs/ID9oRIumqncukDJbKb ntabHZDog3SyF1IpyGjJqwxgtZ6F+ABUo2Y0tbx39LG0JX5rg7DvnQnPFRAnqBIlMngq 9rgpD4IySITr4Fjrjzo2X/rZvgR5gw3C/L3187AtocQnR06Q3lmIfPhVhgdd9DQwJ4tT tf9A5V+3mbu/bA+VVRGumHX5NdHCGuCJEBLg+kPhAt7s9HukSfmv3MmjuMVviwyapM35 S5FA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba10-v6si1401833plb.8.2018.09.27.02.15.48; Thu, 27 Sep 2018 02:16:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728689AbeI0PcM (ORCPT + 99 others); Thu, 27 Sep 2018 11:32:12 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55556 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728669AbeI0PcL (ORCPT ); Thu, 27 Sep 2018 11:32:11 -0400 Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id D9AAC111D; Thu, 27 Sep 2018 09:14:54 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lyude Paul , Karol Herbst , Daniel Vetter , Lukas Wunner , Ben Skeggs Subject: [PATCH 4.18 64/88] drm/nouveau: Remove duplicate poll_enable() in pmops_runtime_suspend() Date: Thu, 27 Sep 2018 11:03:45 +0200 Message-Id: <20180927090308.501518597@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927090300.631426620@linuxfoundation.org> References: <20180927090300.631426620@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul commit 611ce855420a6e8b9ff47af5f47431d52c7709f8 upstream. Since actual hotplug notifications don't get disabled until nouveau_display_fini() is called, all this will do is cause any hotplugs that happen between this drm_kms_helper_poll_disable() call and the actual hotplug disablement to potentially be dropped if ACPI isn't around to help us. Signed-off-by: Lyude Paul Acked-by: Karol Herbst Acked-by: Daniel Vetter Cc: stable@vger.kernel.org Cc: Lukas Wunner Signed-off-by: Ben Skeggs Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -835,7 +835,6 @@ nouveau_pmops_runtime_suspend(struct dev return -EBUSY; } - drm_kms_helper_poll_disable(drm_dev); nouveau_switcheroo_optimus_dsm(); ret = nouveau_do_suspend(drm_dev, true); pci_save_state(pdev);