Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp405705pxu; Tue, 1 Dec 2020 14:26:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9hkg6xfrKLWIYEsvqrv6xQnV9ehtlT8h8coPU1cx00e4DIrmx9gXv8GCSuMjRggC2Z8dS X-Received: by 2002:aa7:c058:: with SMTP id k24mr5411169edo.263.1606861606416; Tue, 01 Dec 2020 14:26:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606861606; cv=none; d=google.com; s=arc-20160816; b=V0JAPhLaRXlHLNrc36HpilIt/1eUHgATAOTVZhdbYkpOypYVgAlpJhBOI5IYEAK7Zp YutvY/JJzVPncba11XwgiizqcQ6Ihp7uzoRELMiu0L5EUE/Oe5lfWC0JfxfyNkRebiWu G7dPhuxM7CD3h5lFaHUYUG+0wKEIWaa8DdtQ6zAw1stIIRPNtXCM9ImNYEtz44mRV74n zw3rdywSJ4x3jykCmTgOV7nSh/g2zSxI18TaJEV8mgpWHCthDLwVojBz/vUH7j8lg2RJ eleyvPcLtQ54N9G6QPaipHu5cgH10ba48jn45KtlImm3mUqviw4UbADIogWcx9oK26hK gL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O/C0sW2CVahLvNTeJXN7W/IXYstS4hKdE5WiXucG9Ms=; b=eCcXEI5O8xxIDweeGfEIf/A7T6MZbsh9In2O85kdiOynIjoG4zAw2lCtgIAaXOcSUE EyRcT3uxOznQrjzjca1aseYbP4QApIofhKiIyGSRJuFn6v38egiBPOoHn5kkhtC2Vho/ QBnFT6lCyoFXx4Qm/T11fNSgDHbLbnrfB6Ew7U6I+FwimqqWlQ3e6QtS5l7bZVZH5O1A 0gRsd+ggy/2xYfO4SY/NYbFOLoLHcAqYye2j5ewiCwHfnKRN72qWelMFkZRUf0TxUL4T +dpMn2MImFReEc3JdE/1ZPTK1rbwXt4SPl5MKyhVSyrDSMAZxR8iq3cXnt5qWbQxs/Hi D1bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v+MwggBj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n2si908729edi.362.2020.12.01.14.26.24; Tue, 01 Dec 2020 14:26:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v+MwggBj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389606AbgLAJJ5 (ORCPT + 99 others); Tue, 1 Dec 2020 04:09:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:45844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389371AbgLAJJC (ORCPT ); Tue, 1 Dec 2020 04:09:02 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1079B20656; Tue, 1 Dec 2020 09:08:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606813727; bh=WC8LMLgXIAprLJz4JRRJm5TZQF2svPgBg6+PvfDxZqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v+MwggBjGSdAj4HUhMyrkePMOqSxKBIGTecWI2d2POcvniQ6z/bCcdRA8KUDGpLXd kxS3znl3643Xk4r4na1Bf+W39MO8k6gEaYN0Q1Z5BZfXFt710cCavnNZOMl3gW1yTq BpvSn8a/21N4dJeAB+4njSXYJhZc5lgrtaaa45zw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Deucher , Rodrigo Siqueira Subject: [PATCH 5.9 038/152] drm/amd/display: Avoid HDCP initialization in devices without output Date: Tue, 1 Dec 2020 09:52:33 +0100 Message-Id: <20201201084716.854050941@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201201084711.707195422@linuxfoundation.org> References: <20201201084711.707195422@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rodrigo Siqueira commit d661155bfca329851a27bb5120fab027db43bd23 upstream. The HDCP feature requires at least one connector attached to the device; however, some GPUs do not have a physical output, making the HDCP initialization irrelevant. This patch disables HDCP initialization when the graphic card does not have output. Acked-by: Alex Deucher Signed-off-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -960,7 +960,7 @@ static int amdgpu_dm_init(struct amdgpu_ amdgpu_dm_init_color_mod(); #ifdef CONFIG_DRM_AMD_DC_HDCP - if (adev->asic_type >= CHIP_RAVEN) { + if (adev->dm.dc->caps.max_links > 0 && adev->asic_type >= CHIP_RAVEN) { adev->dm.hdcp_workqueue = hdcp_create_workqueue(adev, &init_params.cp_psp, adev->dm.dc); if (!adev->dm.hdcp_workqueue)