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=-16.0 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 12C48C433E0 for ; Tue, 26 Jan 2021 10:32:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF55423108 for ; Tue, 26 Jan 2021 10:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404090AbhAZKcI (ORCPT ); Tue, 26 Jan 2021 05:32:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34859 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732295AbhAZBfa (ORCPT ); Mon, 25 Jan 2021 20:35:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611624841; 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=kkyBCaxpi8H1R0DNiKM+lg2FeT0gkdHb7L2bg0FqRCc=; b=Wyvxxg77XD7LwMnh9Mf6MCaIcGVpzMhehcX1qR4OqdVsaTjgZitLYFkGDWpWKdLu5oRwOY MJutnEwtjun0Qh1Jy3MrueiIDp2IgPPsIKgOrn3C2WM85ZC25DCMfNEjHiLktCYrxNFszl 2SMupxaRjyMyQ6rQYLdVhqROkoQosEI= 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-523-70sqUjxxN8GDLAei5qoH7A-1; Mon, 25 Jan 2021 19:10:42 -0500 X-MC-Unique: 70sqUjxxN8GDLAei5qoH7A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE912806674; Tue, 26 Jan 2021 00:10:40 +0000 (UTC) Received: from Whitewolf.lyude.net (ovpn-118-245.rdu2.redhat.com [10.10.118.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F29F6A050; Tue, 26 Jan 2021 00:10:39 +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 v2 2/5] drm/nouveau/kms: Don't probe eDP connectors more then once Date: Mon, 25 Jan 2021 19:10:28 -0500 Message-Id: <20210126001031.881048-3-lyude@redhat.com> In-Reply-To: <20210126001031.881048-1-lyude@redhat.com> References: <20210126001031.881048-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 14c29e68db8f..f4d16576a7da 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -556,6 +556,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.29.2