From patchwork Thu Apr 26 14:46:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Li X-Patchwork-Id: 10366147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB5B360225 for ; Thu, 26 Apr 2018 14:48:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC14E29124 for ; Thu, 26 Apr 2018 14:48:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C07A22913B; Thu, 26 Apr 2018 14:48:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6584529145 for ; Thu, 26 Apr 2018 14:48:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD5BC6E6FA; Thu, 26 Apr 2018 14:48:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0045.outbound.protection.outlook.com [104.47.34.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id ABB8F6E706 for ; Thu, 26 Apr 2018 14:48:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=26z+7DhuxFAOTigEolH2vrl/4bPNi8xNJfJGEflNIiE=; b=2T6NARtASOznkF4I0gIpTG2Rp9MpdTiVIm8RClVLbTIcVXMdF2lUbWeZAb9WlUUlANkLXgdFzbESq7j6IZeEEQKt7paji+G1X/JLnEJro9XLZDK0+QS8BX2Q8Zu48Pwwh6ael3k1gW5LVY9O+5fGlz7VDDzV15db0+WbQc410ms= Received: from DM3PR12CA0093.namprd12.prod.outlook.com (2603:10b6:0:55::13) by SN1PR12MB0765.namprd12.prod.outlook.com (2a01:111:e400:c45b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Thu, 26 Apr 2018 14:48:15 +0000 Received: from CO1NAM03FT031.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::200) by DM3PR12CA0093.outlook.office365.com (2603:10b6:0:55::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.715.18 via Frontend Transport; Thu, 26 Apr 2018 14:48:15 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; oracle.com; dkim=none (message not signed) header.d=none; oracle.com; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT031.mail.protection.outlook.com (10.152.80.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.696.11 via Frontend Transport; Thu, 26 Apr 2018 14:48:15 +0000 Received: from SATLEXDAG04.amd.com (10.181.40.9) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server (TLS) id 14.3.382.0; Thu, 26 Apr 2018 09:48:14 -0500 Received: from localhost.localdomain (10.180.168.240) by satlexdag04.amd.com (10.181.40.9) with Microsoft SMTP Server id 14.3.382.0; Thu, 26 Apr 2018 10:48:13 -0400 From: To: , Subject: [PATCH] drm/amd/display: Remove erroneous if statement in gamma set Date: Thu, 26 Apr 2018 10:46:43 -0400 Message-ID: <1524754003-11154-1-git-send-email-sunpeng.li@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20180426125417.copld3cfbebmhitf@mwanda> References: <20180426125417.copld3cfbebmhitf@mwanda> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(346002)(376002)(39380400002)(2980300002)(428003)(199004)(189003)(59450400001)(106466001)(72206003)(478600001)(68736007)(305945005)(86152003)(97736004)(2906002)(2876002)(6666003)(36756003)(476003)(126002)(47776003)(16586007)(81156014)(105586002)(316002)(186003)(110136005)(50226002)(446003)(54906003)(81166006)(8936002)(49486002)(11346002)(2616005)(486006)(77096007)(426003)(76176011)(336012)(8676002)(1857600001)(26005)(356003)(53936002)(50466002)(51416003)(86362001)(5660300001)(4326008)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0765; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT031; 1:mn7fQh1eJW67ibiovCPNblNWNgGm46DBH0yYuoaAxnGVT1CMkTXcWNDIxWFSkkAO2LHN/NsdBrHtoccVDZW+lDzfKs3D0VJKF2er4Af+BKKobhB9oWoLykOOsNsVS3hD X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:SN1PR12MB0765; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 3:unvA34mC2a6PpCJT3xv1eUMe33+SdroJXoW38MNRa4G5LPUgyzSeo1evG23qvTjsF6IMsGaOzeXjXtO4X508qxJuCWwQ9sTpGSGKp9yAL4gfopOeYPpd8Vls8Rtnf+m8vRTemJrqZH+Tp+L6DqfQP8w2mPys6gY6PdrNSChxdAa7t8DEONDKokhfAZf8YDBPd5JgW2CKZ/xycWLRkNHbxAQu8BxdGnXSVtDK0J4U2GkdjZYZNkS2gQ+Br3l25AhTnAHuHG+51Ya/4xwuhTAl4kUiVidhIzndn/kUXICQj6PzR5tvQeKip7UG5PMCdEsItYRkcNZTxYxKs+VHcsMp562Ay6Wdiy/t6M5l00+Hzf4=; 25:DJyiqLUZimrYbPN2yDFVHQTzWWSd2OVSen1/2qn36fHkb4bWfkQdjAM/9XBj4bgh01fFGyeijf/aGYJ8jiMKrAn+9KlcTBUOpBL7gf4NxX47R33NABXdVh7q44M8wGGqQTBwnnM3a71g49JfLUuKchNvfbEDDjBRcDBDyXpSjwNk8wEGefHvU+3c0WSETfbjVVOW16hmZS7T6QPASnqbkDIfPFj86kP99G2TtfLHypwA744UcKAVOMHOaIf9VeC5giXKgWqQlE2so+a/fOtWelR0kUZTvHWRkyqh142e2UpfLNr6cHKv5cvJxiWUkgmM6MVX/XnUUr/YgidB7IKqZQ== X-MS-TrafficTypeDiagnostic: SN1PR12MB0765: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 31:sS+0yktVMkzSZWoYxCab3f8W5idNbzpOEgyVskGGAkz6/gfm4sywvXpFMQNMmrmdrdSVCfGVPQZOYOFFsDf1yPLogiyelqLjhwxVrXxnSRLjqcShgEMOMW6d/FJ1PBB+c58RoNJ6vHRmhP6c/F4r+eqxsanArh8Pndewux65x/mAsSEWli7tC06otw7XXrmbzv98/MOrR/vRdW8O7QPWcj3l+4GRtBTbnRvD40o61as=; 20:eGz0RoVt5zh/J7MPS4kqGj6taqSyOqTEgISBQNdl1AfjBfFvh6s25F4qq6VS08yX4k6DONHuW/yNiqL24F5z4LL6gJmhtEGNLaUGTEFxw4uHejyzZa9FvZFSNRbpHAHLIVuNtMUuqg7jvoWqbsRTIQ+t11Zmwc3x0b/T6s7KTQ0kYOj6kaFZVXBHk9/8p6z1PmfoCB10kGljKTJn+upEnckzNTDdVR2rMY/tsoVN4ptJjrSAddp2kP/zXnOc0KGdQ43zzCPHEt3Budw6dSLsXKyiiHbivtmrhiXX5dkoz7lnnRbeBjxlH4br5X80XPyPIYjn9PdPHsxFQ4XAoy7b8bzgQsPnYOapyIqxR9gg5wUz1sLrWYOGzc6yatDbP9UWUk8slPaIFWrEE24csOaPG7aTNbfk0dRtVfvX9rlnd0WRPxKqXXaxcu0dSZdac9pvhUz6wWlO5g4JuhU4XrsmjIC9hjmKguZRpLjA8nH3vT8ySIVwL5P08WDVpx6f0ey9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93003095)(3231232)(944501410)(52105095)(3002001)(6055026)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:SN1PR12MB0765; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0765; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 4:FhKq4wWLkQy8M4E0WMKaiNlULJFj5hlxLAXBUs0HUq9xQ9WMlJCQq4PQ2CkqsU5lLkJWdz646+kbRs9QIx6VAXWp5IqMclsqjcEILPmh5xugftwdm/8gS16rBgch8IHIzB8NavgWsbevpy2DkHA4+d58fwNEmBLbKwrMa7Y/0BoAXDZoxhd54ALQQc7v/U7LkWk1O73mIXbc4g6Mbjfzh/D+oLXpfxI7E/xVTwMaomkgLvImnpIAhdxB83LbJom+2P+VdVN/3XlwNzv3X/B26X4X/5AII2HHfEX3Hs9owjRk0h4p739jjBSWae1uO0X8 X-Forefront-PRVS: 0654257CF5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0765; 23:E6G/jQo5IIlpA+FnTuLQFsHjfd1RwjLyNtOGMkQD5?= =?us-ascii?Q?szofn8Mb8PbVtcpvFO29UzoWNzFYN6O02VlRBHXl4p0IYq05ANWa0qQmwcpm?= =?us-ascii?Q?tK5kmCMhen4TUbjFADAxzESTMrfkVD79nrAt0CUm4hcZzztbKTz6judkdtiS?= =?us-ascii?Q?V0WX8fxV2mOYlRNa053mJejQMycUILxMHcBJXjB+m2oaPQE/DayXibwFAgz0?= =?us-ascii?Q?TA839qsn+eYqsqYTcv7QSl3ysiLZFTeD+TggFryHOq8qaaDlABxS8Wi0wKTF?= =?us-ascii?Q?rEMJuz+02vpGpFmiq2KFKGyEal+eocbgV0b+Zs4vBl2IRNLss2mG/uvKKpf8?= =?us-ascii?Q?JUlPJZPJovv+CtGwmMKkZ9r3dQ5R1Xj9cQhqd9cot98G9ItesWs0XW3HaDa8?= =?us-ascii?Q?TGGno/CJgarh+Lsl4rQ7oLgN1F2LxHfpatLMVOklUFk/10psUC9c1ODU3kYc?= =?us-ascii?Q?ZM+NXvH/Yee00jUHb2XSW1IMbMDjVGw9SpL/xp/3dmGR2Kxxjzo2sVgyFa3b?= =?us-ascii?Q?oS816yz2hC08AwInibjTBNiv97phZRt2c0fI3PRT94bmKQyua4o2YExW3nU8?= =?us-ascii?Q?DuC8v4izuQuYs3+zVZaLNEW3c5gvmZwnn3NoflYwQf3PWMhUJ3b2rBTNHpTN?= =?us-ascii?Q?wupR5QDLs5m8qSOSCQZkaeD/2iQkqtsXdmBZ36TGCwGHycs8EsGU8taUQcA1?= =?us-ascii?Q?zE1+RXeEFF2wSUkcskdMA2zGWlKPZkXy9lgpyyRYvi69LTzusRjI4K2AhBIs?= =?us-ascii?Q?Rd6DqDUUQYChTEe7ou1/txu3EmpX/7vKg3P6Pfth1ku4di14nUoALv/HbCDI?= =?us-ascii?Q?YnoBNuEM1ML4CxytI+jTmHLqskikL4XNGCagmRY2kL4ZBx0/mUquJQFSQICP?= =?us-ascii?Q?RK4xav21MlQKX4Ab2DyH/d/a87KbqlXfCkVEBZI+qsQHSD8yT54+ZbVrsjPi?= =?us-ascii?Q?fEEk6FAu5dFQ0koJYq13REkugtWMAYWaojBc8cdCvnsC28SlFpygwxntshZP?= =?us-ascii?Q?zmhf/WExNyPkWWDBkUpNKtMGvxRHz1L465F3BYy23fjrx+WuDYM+KuovKUgq?= =?us-ascii?Q?O9OJ8/T0Bx9TuMcEy7KAchqMm+MDIYR7tctytVDD+TCXeDRKVNoQLVfwfh9R?= =?us-ascii?Q?SJbPC3Owvy93Hcslk4xHP7vRpKJ71Vp/9yJlhyk2dT9ymvZSLOoLFqsbsHre?= =?us-ascii?Q?GzD3dp3O58S6QxXSUHBpXeKTSAPw646zPWfbgDc00wk26fBvX+NDh5u2A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: 4S9oikXCi9XcYgnK6a478bE2w5kLKUU/MQNeXgWLQddtsWzQwgDFwsGPPNGGhDKNbDMs7pS/8RSOanG+SbKwU2PaIJW8ZklxyFRhkmbfshQGIYkaPc3Frh6rYuLQw/VcJFF0n0kb2hDdUusdOovATlAB6NZPOk0RCZLPIyx2nRgZNXhmhOXve/2n+bZchTUH X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 6:hQWsNLkckoRpM1NGOa8FyReaDn2fqnj/FJEFltO9uhc/e+8NJGgkBHCU//lrYoOJB1N6SNVBLXkjunmT2ogxiZFBKICsWnimuv6BRwt5icUxPSpQnLiseLBq70W9UJsMc+AVuBBaE7c6y1VXL9DYVBqgWQzUfGx5tQwNM/vdKWLC9g741Nx758IJ2PhXMk8MNAsa/XSIJjS1IEKlvoiqmjZcMfq7EU+baAPOFtXN/rOHBxfTvqnTEGf2f6/48sG4/GZi1GMliUk2x4ay2xmK8w7I0TiQcM8ORIlKUhbMNlwXHMeiNMRQerhSb8j49evi0sNuG8SK8b3LPTtRKNtZolkqhakb07GKhw1IEIiW33BpuYM7vDdF+eyKkQFk+s+m76wwc54f1kMUrtczV11l2/Vet2SIEpC0OuHjXUHVy0pTwudszm2LpgKIxXHpI+P8cEoLJn+pxhOQBQEJr67WDw==; 5:rLC4RUfXX5oActjWD53JeUetNU4x+5cjIfQp+Wd5J/u76LQRoJrpqrUUD1Dpjg8U4S/uRlH2iDVNP38bHsT7VIcrp9UyOOzXeffgWVGC6jtSD/a04uxabf51WgH2zZxyJPhuiQOF+TRw28eHmwf+BhgizJYiH4uliXdm3q3KDM4=; 24:8AMuGwckfW4vCHT0Gotxoi02E7u++IDDzxKmxyBCOzkCIRB6eUtGK57fJteMI2fewOuNt2XqH16CDR0AtnvrlZwbDb3/RVG4pNIOQF0FYQY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 7:9+BBFggERhebgOKZQng42H6FtHyE3udGv2Dsfhm+qzFbqFpZaD8JDoT0/C+UOAO4RY0KO95XAi6C768b6DgOgM3nvJZCq9Do3Mg99nJVPz7dzmqzXwFIonmPg3G2E/DVuJnZl7FvuyfFEBRgBwdd2r5HsiDU+KsYVj6H7+6zfWdXz+XJdcSK2t+BBkKHXMT59+Pj/XeTHv17QlstoPNETCG46wExDEiy0DobfSWxPLDjzsBNDds+zbXvPgxL6OMT; 20:au5xhB9NJ3NxJxWj1Q35X7QkL3lGlhan7Nk3rYymhE2/r5h77VYzaEU9im7iL2aZGQliW0ge2IGYgDg0xqDa5jj0fIu4g8r9Im9HudEDwDG3uy+ZYMUffhALL6/O9URR9xbnQ+grhqQOlb9SW/VgmgueJTgCwV9uZgottjFkJ34SFgHjYYslANqM8axKoMRjsOPSPuQ9jMIW067sKrJW2yeL/kBu94Rp/VY4/Yh1ssvYcrhgPX5byYfjyWCuE4gQ X-MS-Office365-Filtering-Correlation-Id: f8d6a84c-ab05-495f-6bce-08d5ab84bded X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2018 14:48:15.0310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8d6a84c-ab05-495f-6bce-08d5ab84bded X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0765 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Leo \(Sunpeng\) Li" , dri-devel@lists.freedesktop.org, kbuild@01.org, kbuild-all@01.org, alexander.deucher@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Leo (Sunpeng) Li" The lines were removed as part of the original change. They may have been missed during merge. This is a fixup to: committ 265083076187e619aa9176aeb05ad630013429b4 Author: Leo (Sunpeng) Li Date: Fri Feb 2 10:18:56 2018 -0500 drm/amd/display: Hookup color management functions Reviewed-by: Harry Wentland --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- 1 file changed, 2 deletions(-) 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 b7265f6..0d4a133 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2206,11 +2206,9 @@ static int fill_plane_attributes(struct amdgpu_device *adev, dc_plane_state->in_transfer_func = input_tf; - /* In case of gamma set, update gamma value */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) || \ defined(OS_NAME_RHEL_7_3) || \ defined(OS_NAME_RHEL_7_4_5) - if (crtc_state->gamma_lut) /* * Always set input transfer function, since plane state is refreshed * every time.