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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS 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 3F5E0C43381 for ; Sun, 24 Feb 2019 13:57:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0673A20663 for ; Sun, 24 Feb 2019 13:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551016623; bh=NbyU1s6tZNu0nuadljElMGSMZf/eogMvgYsyDeqaRuI=; h=Subject:To:Cc:From:Date:List-ID:From; b=moLCLcVvr683uk7ONVsppxei8VK2geo7fR0eZhamFoWzucBPsXX93zXKLQn8uYRgO oXmc2cuTXgo2pOVJclgGGC0v76m2eZGW7VLzHQCXEKqt0fwZDrSZyOxD1aQ06YUHBd AmeCCeRSnZQlBORhgXzFOq+eheklEep8lp6H0P3E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728187AbfBXN5C (ORCPT ); Sun, 24 Feb 2019 08:57:02 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56577 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727594AbfBXN5C (ORCPT ); Sun, 24 Feb 2019 08:57:02 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 6B78020A8B; Sun, 24 Feb 2019 08:57:01 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 24 Feb 2019 08:57:01 -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=fm2; bh=LWhnq8 D+9cbQg55Auqlrpt1O2bZazIyeysiiXzceI24=; b=Tri5N39Krqn3cb9zpZLCQQ Cn00L1VKEexymBOacnmMLn/FovpFwjQbVywErEsfWO4fMKjLUM71iB/3VZJoxpLD WZbAoLZOZWcyal6KINOI2Pm4qQ2Ec4uKbPeQ3EzgG/hotu1x5L19uU9zWoYDYmYt 9wXPoZSKkvctTcjYOnqgIaa4yudvHD/yWRAIhztkkGp5qdD/DrwhMDJvu36wxuqH Sd/We/40Wowwf5ZHu1CHzsJmHvlftNtfvk0lke7izf+HTK3y/w7ScGeUxjofMiZr RpfDIhSXhZLbua1J+vTj0e2mkmsjgl6cUWExFiWDWaDSUrkpOo3DQrTUIYXbTZAw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrudeggdehleculddtuddrgedtledrtddtmd cutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 6C80810310; Sun, 24 Feb 2019 08:57:00 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/amd/display: fix optimize_bandwidth func pointer for" failed to apply to 4.20-stable tree To: Bhawanpreet.Lakha@amd.com, Charlene.Liu@amd.com, alexander.deucher@amd.com, sunpeng.li@amd.com Cc: From: Date: Sun, 24 Feb 2019 14:56:58 +0100 Message-ID: <155101661832153@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.20-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 9f7ddbea2bb826a2147309f735726a8b09950944 Mon Sep 17 00:00:00 2001 From: Bhawanpreet Lakha Date: Tue, 5 Feb 2019 13:55:20 -0500 Subject: [PATCH] drm/amd/display: fix optimize_bandwidth func pointer for dce80 [Why] optimize_bandwidth was using dce100_prepare_bandwidth this is incorrect [How] change it to dce100_optimize_bandwidth Signed-off-by: Bhawanpreet Lakha Reviewed-by: Charlene Liu Acked-by: Leo Li Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h index acd418515346..a6b80fdaa666 100644 --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h @@ -37,6 +37,10 @@ void dce100_prepare_bandwidth( struct dc *dc, struct dc_state *context); +void dce100_optimize_bandwidth( + struct dc *dc, + struct dc_state *context); + bool dce100_enable_display_power_gating(struct dc *dc, uint8_t controller_id, struct dc_bios *dcb, enum pipe_gating_control power_gating); diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c index a60a90e68d91..c4543178ba20 100644 --- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c @@ -77,6 +77,6 @@ void dce80_hw_sequencer_construct(struct dc *dc) dc->hwss.enable_display_power_gating = dce100_enable_display_power_gating; dc->hwss.pipe_control_lock = dce_pipe_control_lock; dc->hwss.prepare_bandwidth = dce100_prepare_bandwidth; - dc->hwss.optimize_bandwidth = dce100_prepare_bandwidth; + dc->hwss.optimize_bandwidth = dce100_optimize_bandwidth; }