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 B9907C433DF for ; Thu, 20 Aug 2020 08:34:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DE6C207FB for ; Thu, 20 Aug 2020 08:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597912446; bh=Os3O6h1eMN/5IQtX5JPOAqzcb65CGxbOTWRR8qMnMHc=; h=Subject:To:Cc:From:Date:List-ID:From; b=GnPj8sbfOC3oErFq4lRe4Ty8HETtV3QnbvVj86cDKxwi2G529VGT2cEwIw9CyG48B Pd3hi9BCC8uQ/3cF968kABmr7tbzleu8ruiDK8Z6VnVVGrYDGTdK4dwm79/OcoOqzl D4S3drgpmNEc+gFmYpqiR8rpq2Xg+SnJ3D3SZR8Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725916AbgHTIeG (ORCPT ); Thu, 20 Aug 2020 04:34:06 -0400 Received: from forward2-smtp.messagingengine.com ([66.111.4.226]:52199 "EHLO forward2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726132AbgHTIeF (ORCPT ); Thu, 20 Aug 2020 04:34:05 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 60639194008D; Thu, 20 Aug 2020 04:34:04 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 20 Aug 2020 04:34:04 -0400 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=fm3; bh=urPG+3 fERiE/IKlSLSfZ8LthLQahgOMxIYW+w1jv4gg=; b=JI1LhUw/ModMb5WFQMLjwu tfGUsqc/egwHYmDNTgMHklKbhJwhGGtMdXeESlVEGUV4ByNRpL10FViK+kJM8mlK GvlIfQd9VctVe6t02/Ux+uk6Ep3zG+iDr1Vp3nUX7U5jO8aYrcdO1Dw7jAGT7alJ vGnHCPp3zB5NysG84b0gV6JxR8klo0ZAKb5CrxFLsJMKfTxTSz9oKrL3Fvk5F/Xk UztyPX33g1fKQ93yFTe04C2s7dfvI7CIYaY4yWh9Na+GpvsO+rW4C7cDuHWZR3Kn FU1+cFPq+dZe1a8x4oFdbGw7f7RiB+mZS9H+HyO2HhZqhE4v7nIa3AWgFeRUd4nQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddutddgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdekledruddtjeenucevlhhushht vghrufhiiigvpeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 006A0328005A; Thu, 20 Aug 2020 04:34:03 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/amd/display: OLED panel backlight adjust not work with" failed to apply to 5.8-stable tree To: hersenxs.wu@amd.com, Nicholas.Kazlauskas@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com Cc: From: Date: Thu, 20 Aug 2020 10:34:26 +0200 Message-ID: <159791246617317@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 5.8-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 ec11fe3705a7d434ec3493bdaddb9b6367e7366a Mon Sep 17 00:00:00 2001 From: hersen wu Date: Mon, 22 Jun 2020 13:29:16 -0400 Subject: [PATCH] drm/amd/display: OLED panel backlight adjust not work with external display connected [Why] amdgpu_dm->backlight_caps is for single eDP only. the caps are upddated for very connector. Real eDP caps will be overwritten by other external display. For OLED panel, caps->aux_support is set to 1 for OLED pnael. after external connected, caps+.aux_support is set to 0. This causes OLED backlight adjustment not work. [How] within update_conector_ext_caps, backlight caps will be updated only for eDP connector. Cc: stable@vger.kernel.org Signed-off-by: hersen wu Reviewed-by: Nicholas Kazlauskas Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 6f937e25a62c..9c283531e1a2 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2028,6 +2028,7 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) struct amdgpu_display_manager *dm; struct drm_connector *conn_base; struct amdgpu_device *adev; + struct dc_link *link = NULL; static const u8 pre_computed_values[] = { 50, 51, 52, 53, 55, 56, 57, 58, 59, 61, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 77, 79, 81, 82, 84, 86, 88, 90, 92, 94, 96, 98}; @@ -2035,6 +2036,10 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) if (!aconnector || !aconnector->dc_link) return; + link = aconnector->dc_link; + if (link->connector_signal != SIGNAL_TYPE_EDP) + return; + conn_base = &aconnector->base; adev = conn_base->dev->dev_private; dm = &adev->dm;