Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4651578pxj; Wed, 12 May 2021 10:05:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbqSn3kMhuN255AxNU8rD0kV2dTsZXoDw4wAzwFDUHt9h8X55OrMv677m/t8QOaVGHdDPe X-Received: by 2002:a9d:7f1a:: with SMTP id j26mr31010953otq.244.1620839133572; Wed, 12 May 2021 10:05:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620839133; cv=none; d=google.com; s=arc-20160816; b=RnYEbfvuEnwFvDwUWqG/XYMCZA/5A+N4r8ZQgQ1uXgdtSiLBYD2hfCNKiwgHwyWVba fNHC36IRbjhusgAMx3Gjc1FyntEkYp4IpwyU/6+vh8/UPFI2QWJ+rYhcQXiMx7iz1dPk h8eHcWE4RAnu1uwgwBB5cEIaogYNShvFqoeIbrel1ezYiqIvNgAIQRP46ZHLD3/PsQXI RLHKtlXM43LKJUgj4MTbtQOLhFjwz4AtqkOUIfVs0/GHfscrxnCJh9cUZ3UgqsZY+3GV tIGSSHgShFDhm3NhmB0sPD5nxmLeZAVanFRnZjxjQtpZfHR69ej48vpLSGcSuve5uFFH JSqg== 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=IOJI7haOTmLJG+W5XJYIPVhUJHNaIoZ9CqEdK1/qtpc=; b=quTxBg4BLbGeZp1ICDVob8d6pSdBwcD6NTwO+zUg44/6/YyEKr92sm7mrdOEZtrc/V b3EXAcx2qLysI5etCj4S6ZWsj5w9pVbVCvFja7Ais/aTb396qc8gzTPLjeoHI8fQILtQ eNwel+P8BFBm7C8AfMW6zy6QpMmHMsyzptXmHN9q51lgBVv03P46fHTT/QjpI6PPQxIT vNr5qrF5Ez7jOO3cYbnL5ofoitWRR8f9s31Zl1VPOHTcDzRhCsyxP8TVcvmNgAhgBhNv +V93jv4Mv7UK83mWnAVP6bDnFvSszscDOM1AhYMq+zxd+dTR4DGCJhCxIOYMSzPiqZds T2aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lttqmn75; 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 h14si382676otk.232.2021.05.12.10.05.19; Wed, 12 May 2021 10:05:33 -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=@linuxfoundation.org header.s=korg header.b=lttqmn75; 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 S1343891AbhELRAD (ORCPT + 99 others); Wed, 12 May 2021 13:00:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:35710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237902AbhELP4w (ORCPT ); Wed, 12 May 2021 11:56:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 708DF6144A; Wed, 12 May 2021 15:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620833328; bh=FRkQPcqugX+6ff7elCcjNy1RfpURRUKUKdRS8baywzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lttqmn75OUyr0tSX41GQor+8/8f4shqGPzE/ETjJwZwfLIfIOM211hNaoO/+vWfL9 90AqzMYYzUh3pO2OvOb1ypDcCRwC8oehya1d7BR6LxFYxnJ8gSEvCIPry+AOvh6851 cXGvl2H43ysmN85mgHrVIas7RsEODOXXnD4rZfMU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harry Wentland , nicholas.kazlauskas@amd.com, amd-gfx@lists.freedesktop.org, alexander.deucher@amd.com, Roman.Li@amd.com, hersenxs.wu@amd.com, danny.wang@amd.com, =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5.11 071/601] drm/amd/display: Reject non-zero src_y and src_x for video planes Date: Wed, 12 May 2021 16:42:28 +0200 Message-Id: <20210512144830.163388620@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@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: Harry Wentland commit d89f6048bdcb6a56abb396c584747d5eeae650db upstream. [Why] This hasn't been well tested and leads to complete system hangs on DCN1 based systems, possibly others. The system hang can be reproduced by gesturing the video on the YouTube Android app on ChromeOS into full screen. [How] Reject atomic commits with non-zero drm_plane_state.src_x or src_y values. v2: - Add code comment describing the reason we're rejecting non-zero src_x and src_y - Drop gerrit Change-Id - Add stable CC - Based on amd-staging-drm-next v3: removed trailing whitespace Signed-off-by: Harry Wentland Cc: stable@vger.kernel.org Cc: nicholas.kazlauskas@amd.com Cc: amd-gfx@lists.freedesktop.org Cc: alexander.deucher@amd.com Cc: Roman.Li@amd.com Cc: hersenxs.wu@amd.com Cc: danny.wang@amd.com Reviewed-by: Nicholas Kazlauskas Acked-by: Christian König Reviewed-by: Hersen Wu 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3740,6 +3740,23 @@ static int fill_dc_scaling_info(const st scaling_info->src_rect.x = state->src_x >> 16; scaling_info->src_rect.y = state->src_y >> 16; + /* + * For reasons we don't (yet) fully understand a non-zero + * src_y coordinate into an NV12 buffer can cause a + * system hang. To avoid hangs (and maybe be overly cautious) + * let's reject both non-zero src_x and src_y. + * + * We currently know of only one use-case to reproduce a + * scenario with non-zero src_x and src_y for NV12, which + * is to gesture the YouTube Android app into full screen + * on ChromeOS. + */ + if (state->fb && + state->fb->format->format == DRM_FORMAT_NV12 && + (scaling_info->src_rect.x != 0 || + scaling_info->src_rect.y != 0)) + return -EINVAL; + scaling_info->src_rect.width = state->src_w >> 16; if (scaling_info->src_rect.width == 0) return -EINVAL;