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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 EA467C2D0A3 for ; Tue, 3 Nov 2020 15:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F95720780 for ; Tue, 3 Nov 2020 15:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604418192; bh=pDem3vxeuSz53RjTr1VKNk/UZPyIt0eW0Un14weZeOU=; h=Subject:To:Cc:From:Date:List-ID:From; b=GumFLTxjZxjG2lFO1adCF5UoEnyDa/ZMFlPZ5uxPc80DkZbPu8Qd+VYdvME2OmOhv tkNRrHa8wUKHnBfdyjwpyvnIMWht2+BwDm9I+IrbPCKWtvP4ehWDz9Kf+Jb0u2EklW Kro9qmbTZ2xSueEUGEgAVnp25DE5Ob5XIJXy6h78= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728220AbgKCPnK (ORCPT ); Tue, 3 Nov 2020 10:43:10 -0500 Received: from forward3-smtp.messagingengine.com ([66.111.4.237]:34855 "EHLO forward3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbgKCPnK (ORCPT ); Tue, 3 Nov 2020 10:43:10 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailforward.nyi.internal (Postfix) with ESMTP id B2F9919425C7; Tue, 3 Nov 2020 10:43:08 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 03 Nov 2020 10:43:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=4SaJxU Xc0UnNPNPGUPI/UbRFMIax6t7lNsHBvhY6ZEY=; b=qobuRHiAR2Uf6XXyF5ZfM/ i8qZWN5qFVIIEV1cu3ltGxel5mndnkYXnLEiwok0Ip/vtNfWLHoPVf73mtSd6nMD jXqelBN3jIYUBx4Z8VfsECHtNDuFcV6wTRMvvhqk5S43fYco4EUYqoAqO11MbI2t ZuEAzvRn5XlER81GkGWN3EYX+CnYYtXq0ofEfnDppVjty5Kji4yYMNf9BJ77D4+U fZwJLXexVlgX4OIm5tpjQOBWlesy9sglGGsg/GTrTDEa3vG+vLFBNJ3LfoCPASTR 7FMuR/9BinuWwuiIU3I7noDRaXDkDGB6ujGnhjImHq+ko56PfMvmY2iPdMlhdHYw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtfedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdejgedrieegnecuvehluhhsthgv rhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrd gtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 498BA328005D; Tue, 3 Nov 2020 10:43:08 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/amd/display: Fix ODM policy implementation" failed to apply to 5.9-stable tree To: Wesley.Chalmers@amd.com, Aric.Cyr@amd.com, alexander.deucher@amd.com, qingqing.zhuo@amd.com, stable@vger.kernel.org Cc: From: Date: Tue, 03 Nov 2020 16:44:02 +0100 Message-ID: <16044182424102@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 25b315817216eaac93ca880d736b359ababae61a Mon Sep 17 00:00:00 2001 From: Wesley Chalmers Date: Tue, 8 Sep 2020 16:22:25 -0400 Subject: [PATCH] drm/amd/display: Fix ODM policy implementation [WHY] Only the leftmost ODM pipe should be offset when scaling. A previous code change was intended to implement this policy, but a section of code was overlooked. Signed-off-by: Wesley Chalmers Reviewed-by: Aric Cyr Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher Cc: diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 4cea9344d8aa..e430148e47cf 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -785,14 +785,15 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx) /* * Only the leftmost ODM pipe should be offset by a nonzero distance */ - if (!pipe_ctx->prev_odm_pipe) + if (!pipe_ctx->prev_odm_pipe) { data->recout.x = stream->dst.x; - else - data->recout.x = 0; - if (stream->src.x < surf_clip.x) - data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width + if (stream->src.x < surf_clip.x) + data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width / stream->src.width; + } else + data->recout.x = 0; + data->recout.width = surf_clip.width * stream->dst.width / stream->src.width; if (data->recout.width + data->recout.x > stream->dst.x + stream->dst.width) data->recout.width = stream->dst.x + stream->dst.width - data->recout.x;