From patchwork Fri Feb 7 19:50:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11371079 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1FF6109A for ; Fri, 7 Feb 2020 19:51:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80C3C21741 for ; Fri, 7 Feb 2020 19:51:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gcvGazhI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80C3C21741 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B5F26FD84; Fri, 7 Feb 2020 19:51:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F3E86FD7F; Fri, 7 Feb 2020 19:51:15 +0000 (UTC) Received: by mail-qt1-x843.google.com with SMTP id d9so270015qte.12; Fri, 07 Feb 2020 11:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a/BMDiqhoEnI0+MK5kOQbygtLUupSGYKuie/3X93O2U=; b=gcvGazhIJHtvRAG65KH84s2DnIP+lIBKG2rmRvuJMwYbcPFNLqXTB7jxQvJhETtjna kbWbwFguMI5JLL2XzJGSMvfTjJixJrBKNy65rO1w4jIfTPcC5hLnQ4xQRSH01sXhJOnL gECpYe69qXq82M/feRnKHBhmtuM0fx198JWoPSA4dZLPO3mQy+l3qKuqOcT4uCUybDRh iT1MMRS2TPa67ERcuju4wh1ZHBD8gVylrEtv6crlpCLLACHj7H/R/SB/QGlY7oKgEw8i /gugSqcElvYIylVESqvwCShvKoQ57qEv76McJhntlfkPdfHvcw6aG3mVIjKD7JPHxAzj rm4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a/BMDiqhoEnI0+MK5kOQbygtLUupSGYKuie/3X93O2U=; b=eiF3iSvr4LyAAEFM/ka1AMgrvlJa7946z3dT/NIwb2PCG9mL6b36p+RACf84BD/rLR F3kS+d7OgsHC4Nsojfec32gvZbRPSPudl4qbuHqXCDfMPH8mSfpRoFL1LtjHSgYpw2H7 O/u/nSq7PuOkCQx/mInMC+9rSFmttKAM+CzppkYralGP0JHAHcwRSnYpDiJhOlyyZu2R KEmLRJQ/9mgF97FNLxcQzbnymmC3zJMFEJRCYO7uGcx7pLe3YAlXKCjciMlp+zlkm06S nAMz0+FoTCDg6poly5BhZ+rff2vtQ0Df9NbXSM9dbyrtqRC/0Ld5Jgm2Icgeqhjma2T8 +T6Q== X-Gm-Message-State: APjAAAXvlKofoetWwRCic0/GNPHL7i0NGF5chu+Zcai+zKy/K6smKNF8 BkHzR7qunWlZR8O4N7ABkuFSGfka X-Google-Smtp-Source: APXvYqx4lNwPhHjvDgbyj0a1AEG6sY5YOl5VqwwYKHkRePM2oddWriRhDYWdB1p9Y4ImixWRE1B4yg== X-Received: by 2002:ac8:1e08:: with SMTP id n8mr462183qtl.175.1581105074423; Fri, 07 Feb 2020 11:51:14 -0800 (PST) Received: from localhost.localdomain ([71.219.59.120]) by smtp.gmail.com with ESMTPSA id w16sm1752226qkj.135.2020.02.07.11.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 11:51:13 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 09/15] drm/amdgpu: don't call drm_connector_register for non-MST ports Date: Fri, 7 Feb 2020 14:50:52 -0500 Message-Id: <20200207195058.2354-10-alexander.deucher@amd.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200207195058.2354-1-alexander.deucher@amd.com> References: <20200207195058.2354-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The core does this for us now. Acked-by: Christian König Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index a62cbc8199de..ec1501e3a63a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1931,7 +1931,6 @@ amdgpu_connector_add(struct amdgpu_device *adev, connector->polled = DRM_CONNECTOR_POLL_HPD; connector->display_info.subpixel_order = subpixel_order; - drm_connector_register(connector); if (has_aux) amdgpu_atombios_dp_aux_init(amdgpu_connector); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c index e4f94863332c..3c9f2d2490a5 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c @@ -609,7 +609,6 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev, connector->display_info.subpixel_order = SubPixelHorizontalRGB; connector->interlace_allowed = false; connector->doublescan_allowed = false; - drm_connector_register(connector); /* link them */ drm_connector_attach_encoder(connector, encoder); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index bd798b6bdf0f..50137df9cdad 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5839,7 +5839,6 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, drm_connector_attach_encoder( &aconnector->base, &aencoder->base); - drm_connector_register(&aconnector->base); #if defined(CONFIG_DEBUG_FS) connector_debugfs_init(aconnector); aconnector->debugfs_dpcd_address = 0;