From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03331C433FE for ; Thu, 10 Dec 2020 01:24:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC1AD23BC7 for ; Thu, 10 Dec 2020 01:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732368AbgLJBYF (ORCPT ); Wed, 9 Dec 2020 20:24:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39889 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731911AbgLJBXg (ORCPT ); Wed, 9 Dec 2020 20:23:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607563326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IysoRLmJPqeuS4OflbOZFgvU5bQirvKea7Gqiyv0Nqc=; b=aW8u9m8AgWKYpi8CUWuudeFpg46mCN2hxwK5u9zkCc7CI8OHFCQAx9aJc5o8lUdaeuLXf/ heNl/QLokvNb4mLJVRnUhjNlOEdhoj6vt6ynFuUobVhs3j3hUrAyy++CeDHB1ghEJS5/8K uqlEqI/LivrN6ZEBWSajkK93otb6bvo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-fzoR1iqWMKmyqwstQTYuqg-1; Wed, 09 Dec 2020 20:22:03 -0500 X-MC-Unique: fzoR1iqWMKmyqwstQTYuqg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91001612A9; Thu, 10 Dec 2020 01:22:01 +0000 (UTC) Received: from Whitewolf.redhat.com (ovpn-113-246.rdu2.redhat.com [10.10.113.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FDA0100AE2F; Thu, 10 Dec 2020 01:22:00 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Jani Nikula , Dave Airlie , greg.depoire@gmail.com, Ben Skeggs , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [RFC 2/5] drm/nouveau/kms: Don't probe eDP connectors more then once Date: Wed, 9 Dec 2020 20:21:40 -0500 Message-Id: <20201210012143.729402-3-lyude@redhat.com> In-Reply-To: <20201210012143.729402-1-lyude@redhat.com> References: <20201210012143.729402-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org eDP doesn't do hotplugging, so there's no reason for us to reprobe it (unless a connection status change is being forced, of course). Signed-off-by: Lyude Paul Cc: Jani Nikula Cc: Dave Airlie Cc: greg.depoire@gmail.com --- drivers/gpu/drm/nouveau/nouveau_connector.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 8b4b3688c7ae..398fee9b7ae9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -554,6 +554,12 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) int ret; enum drm_connector_status conn_status = connector_status_disconnected; + /* eDP doesn't do hotplugging, never probe more then once */ + if (nv_connector->type == DCB_CONNECTOR_eDP && + connector->force == DRM_FORCE_UNSPECIFIED && + connector->status != connector_status_unknown) + return connector->status; + /* Outputs are only polled while runtime active, so resuming the * device here is unnecessary (and would deadlock upon runtime suspend * because it waits for polling to finish). We do however, want to -- 2.28.0