Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp51665ybg; Mon, 8 Jun 2020 16:11:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/QWI1smeut/FNW4DcHOH7VSgtkOOkgKoUWVWY5/lT0Fgb3OW8630k2InDRO0QZ1tcHdtz X-Received: by 2002:a17:906:d043:: with SMTP id bo3mr15168382ejb.409.1591657867249; Mon, 08 Jun 2020 16:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591657867; cv=none; d=google.com; s=arc-20160816; b=xKeHHkMSiWPjTEaxP5BfZjB9U6LZCYfbCGc2fgSV0Sq2JZnho9EXG33cHmed6K25dE OudwUXVnWaJxXmClCB3WLYFmKQyPwN8U0rCh7auKluVteuReGy5OaJDx3uHUtCmSv6yd O1hELyfHQkMZD76FzLPWk611T1jSqBo28VR7FogGK7NOm4pBZWvDs5QtEK3nu7U6Spa4 Xn0uNMtT5cCfM8MK0yYBlsLsMPxGP4fZccAurET4ve6YjRMAB/WOeO5oK5wCCdedNvgQ xhiuxuKsKKfd/PqMjzvlX1p6xhvDywuMnkQ0GptXSZJ3S/Kl4yYO8nUjm1ebqvCpnLxb IDmw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VxdFhQxXyNtXOzv8phGFNzwGhK9CCENEnIzN53oKhl8=; b=Yyear7b2b+V0aic+xOAO8B5IVHFiE7GrAgEGxPXa9NFZDYTMUBykEMbqtzAuRihboB 1Iiz3TdkEVNnO1UuKfarrXD+RW+iCiq4uCWI3mEz+IeCR7YVL9CzDPSol4tbaL7A5jk1 9EQj4CvKgU5Q7m/DuPO6i30B+b5bJr/fgllImAtUf8LJdRgelZT5lqf4cUWyPNvlxgsC UX1JlI5wRfnKw3jk+ufhcASkImXnscVqv9JX9uFQNHTJXNc9WbaMW8Negj3vM/aj+1n5 1WD0YVEguBFHtdC7BtFrZ1XNXA4n42vP0wCs3+wQ4hCZfXCYeNMpsIi365UnhkaSEVfi zzsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="O1G6T/3h"; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gw6si9681515ejb.137.2020.06.08.16.10.44; Mon, 08 Jun 2020 16:11:07 -0700 (PDT) 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=@kernel.org header.s=default header.b="O1G6T/3h"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727064AbgFHXGp (ORCPT + 99 others); Mon, 8 Jun 2020 19:06:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:49614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726907AbgFHXG3 (ORCPT ); Mon, 8 Jun 2020 19:06:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 63C72207C3; Mon, 8 Jun 2020 23:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657589; bh=3oEk9mUz7kFZ8N7UDTVPNCIcRQV9ynzwPxO6yqrMMG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O1G6T/3h0cD1CgsrG2CMDTkYYVJVjhUACx6N789p9wA671H2++M7S+HTvfCazI2kF Zovdjvb7GLvVnULP/uoaJB/w4Wu1lEaMotGRGHz4EfviOp+jUWaX4mJVJgdW997M5O GfsYCKdEb4X/BH6sIZIiaqmTIcBAV594Ln4ayxgU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmytro Laktyushkin , Eric Bernstein , Rodrigo Siqueira , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.7 017/274] drm/amd/display: fix virtual signal dsc setup Date: Mon, 8 Jun 2020 19:01:50 -0400 Message-Id: <20200608230607.3361041-17-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmytro Laktyushkin [ Upstream commit d5bef51f084fccafa984b114ff74a01a64a0e2e3 ] This prevents dpcd access on virtual links. Signed-off-by: Dmytro Laktyushkin Reviewed-by: Eric Bernstein Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c index 51e0ee6e7695..6590f51caefa 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c @@ -400,7 +400,7 @@ static bool dp_set_dsc_on_rx(struct pipe_ctx *pipe_ctx, bool enable) struct dc_stream_state *stream = pipe_ctx->stream; bool result = false; - if (IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment)) + if (dc_is_virtual_signal(stream->signal) || IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment)) result = true; else result = dm_helpers_dp_write_dsc_enable(dc->ctx, stream, enable); -- 2.25.1