From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752865AbdGMQYw (ORCPT ); Thu, 13 Jul 2017 12:24:52 -0400 Received: from mail-db5eur01on0108.outbound.protection.outlook.com ([104.47.2.108]:5888 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752599AbdGMQYm (ORCPT ); Thu, 13 Jul 2017 12:24:42 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Dave Airlie , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, Daniel Vetter , Jani Nikula , Sean Paul , Lionel Landwerlin , Boris Brezillon Subject: [PATCH v5 06/14] drm: ast: remove dead code and pointless local lut storage Date: Thu, 13 Jul 2017 18:25:30 +0200 Message-Id: <20170713162538.22788-7-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170713162538.22788-1-peda@axentia.se> References: <20170713162538.22788-1-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.168.30] X-ClientProxiedBy: HE1PR09CA0048.eurprd09.prod.outlook.com (2603:10a6:7:3c::16) To HE1PR0202MB2556.eurprd02.prod.outlook.com (2603:10a6:3:90::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f046256a-083c-4458-a2b0-08d4ca0ba43f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(201703131423075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:HE1PR0202MB2556; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;3:kl4g5y+aIL586tSnLyzKFjZkMFDIce7jGKPpUdgggsUE6NBSLnjRc+O/sw9tLHMivYCXwH5PoF3FHu9JQEBqydL9cNRsNJc36QRWl4AukNpXQ8dEvtYfJaqKCt15ve4kLx8GPdBQqtOJ6gbOSK9x1y1SppjSEPWBBKPs7nGHM2h3jaX0nTBvCdkeXEE51Po3+6YJDvYhu6lhSzCR3HOSEx4rospbUdV8CfebKpPtxhHgYzhu+scfk3E3xaM9Ts4WtmLQbUUx6X+H+/FgBHmfXkopdmboJKRVJsl4OcnNnetZ3vIql6ix9VAOnMDaglCpJvKvjbzX6/Xpty2Do1tUoHNt4x+YdLqnVjKLk9shof2pQKY/4oDPllOxHbEEReL4HmOLVizN60eZ5JGz7AElD2XDdMpYFsRKHvQH8QOg/K0AcFDvqomDa966UMnKjFvtGcQlLSWcjLTzu6z4OzXcpVDOTVtjYXQ/nXo7kW0zZUyLcNqaQqvwwsMNGF0z+EIVvTb9XczzmMBx+h7bY8OJ/QnyxFsS7KIccTjWC7ExwwNvuQA3FL02ZnwpG9Kq+4aShLAxMKWHh4MqCjOSkxIzVwgFH6Lfb/8ZmHM3ETT5rr1K0fzaKhe7HcgJHksNTR/Sf2J4bHrXeJvLLfPEQwqFDCaqB7r/EluJHpoIGnxqG80qZfvggPKz7hs97XCXdFuNAOqxoXvGjpu4XvbIm+Bbgg== X-MS-TrafficTypeDiagnostic: HE1PR0202MB2556: X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;25:mzy2N7AcLG+ffV2c9q9JXEEV4ygz5zqjY1U2vV9VCGPr2L7A5eCqGZtvDiPgHABduxv04ZDsz0u9iy3+5T87AYWnTMQMMLsnXMdQCmjuLdhmyka9JUmixJjYIZRuTb/u1Yvp6Hwl0+hU6XQq/CzdU6JsZLt9ENb/sdM7t2lvhm8S28D/bsEsIbWIYGA8o3tPIQfFkW1rkAGnqL0S74trDwJQQpW2U3/c0eSJvyt+BhvP0DmNJ98PimPawzcy4vPC8EyIHjuIoQ31fzs/2hOh+Jgjdnd00ZJdRclSC+vaFl9eK7cnViFVhP/4Fjvd7QyHr7j+AL1PvMve5L6R1SQ0rB6GMUqAT4kVmaFZzjyszRQK5+nKzj60LOA9o1Ek+dAJ36dWywPrjudDsPw3iF+US8qpdGSJbAXMgaF6YF+StBWDMlxMmcc4GMuCBRri9Ct08j66Q1XKAOTh27O9rN3wElR67grEYr+y19c8iqZb6J3x5xWI0QYQ8GfVqP5LBVYYgkYZCGlmwCVRHyGQQRjwfVt/P9o7U2hAdM2NrRtCnIeFSI1wZZw4S8cnOKvK3jI7o5dy4fh+zjvKao48fOUZEDlFSnddMgTGjbIrrcRSgpaSa1UEzOiqbHRk07rIMsjDLLn7bfY46+puBtA4wJgMFlKXrYjTD7o86qoLLwT0ivQ/EQgc7jxBcCtdboWYS0BNgpv/8JhiXBoVgQ5M2FtYS36O14esD2IMR09lE61sG8eWdxf8fQIoRnbA5ZNPeLgAweaB7DxcO4yPhNeSrk2OrYFxIo7m7leTkvjlpHdFPf2o+Gx+yxNmDSNuDIQe4UsDczz+IoisKatev9fweZEEvIGAu0iNzC7+JoLQ3XLhX1OizJhsyEfMVvCQlp8LcXYp8FWuKIyvN/g2bBByfakIXiLRO59bzviIWM7Y9t5mtdo= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;31:3v72SVzslDa5Tg+fN/chMt6Ua5dq9EtpWfSiTLj6h/2TUGjkA+XAQ5NUJFNPQLYWxKIxKwcLoee7su54EpUrxtq71SRDlnWibYHQVEzfneaR+20cfAdK8ixgA+1KxtaOAQVyUhca94I7DvYI3s5CmCD/7hJMpfWhrjXtViWMGQjFXOy/W0LDrRc8zm+KqTJE7fM5u1vHgIqnVS0tUqO5A7ylUR9MXgyJgJZ+kdI4Jcz2yyd3GGGENTAtqOIWduuDW9iQddN3mUq+MUDbxAMRLCst7p8pTOPgA8Od9q2T/or+xPZTWUnyhTrGzYo2io5SzP+HYxq8r7DdI9b7lFis+PsQYGJyldsk5i9F+CLVzTa4Cgy4b5j2JtKodXYLnb35e970zIDKs5H0ZC5nwZTaCpo+BV+yVPcZPrc8HNyUPqy89iHm5FlRFk4MX62D2gDrvR6MagvvYxbY6RVr8vyJVjslx+ismJTyQfhfERUxgW199wyxXFwMfUfMXbSPU+aQ6a9TNOKQh24pPk1bObmI0M1Z32/zAole1ziOxVVSNeNiHWfCldueimYLUKssY7ePz7j506Oqzgo40Gou5ZCyBb/zkneIBJx9aNMH05FmjozFbuZGUq7Sk16NyYfEhnXAwDTPnAJentAVxXk5yxf75jMAl2PUk2obu4AWQbRnYi4= X-Exchange-Antispam-Report-Test: UriScan:(236129657087228); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(2017060910075)(5005006)(8121501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6041248)(20161123560025)(20161123558100)(20161123555025)(20161123564025)(2016111802025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6043046)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:HE1PR0202MB2556;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:HE1PR0202MB2556; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2556;4:LPUiat3n7ARcD8q13hPZt/cpxVsnKQTRo+r+OYc6?= =?us-ascii?Q?NtDOiYKfQv5IgXmAWIuglPm2X0s1gFyRzePrnkgn8r0xHMa+zlQSjWnfIbYk?= =?us-ascii?Q?x34Xhc7g/mBEr7ZcW9eJAwraBZlTKTCTNYA8J8t8ISaeQPtgkAlhwHtju0o8?= =?us-ascii?Q?cCuQB8TpHswignAWxQZPRb9yIJoSrY18I4ts+8f8JodqsGqnRXY49at8pX1F?= =?us-ascii?Q?tFGS2ylx8BdLjLaI5+Y6P+Mb9vbimpavXrrsrPMTYz7BW6SVN1KxCqMA5P4r?= =?us-ascii?Q?zbcGOy7d2sJ1j+C3d4Ohg2t1xiNObIm7l7zKhn/qoS8NVKTXgmT5ErTMV/Ah?= =?us-ascii?Q?sGr/v5EJjf0yiDtvDcFHDW5E4XGDxafBMS2WFvBmINDeFr2lv3gM72PlW91U?= =?us-ascii?Q?dJds0WCcvjXmR+MrbdfyC6Yh3zDF899AoUCOtiq/GMKslMJ+woLfj4XDos3J?= =?us-ascii?Q?0QFQlwJNvAf2A2VzXKp7vl1YBz8vYMQEODyWLWQCQUG07Zc8LyldCATwu2xZ?= =?us-ascii?Q?tBHyGl+lFXzd5d7P2nSKp9LGd2CBzO8q6TXJuGnKFIm+zNFMQdXohJXqFYq0?= =?us-ascii?Q?w4psHrdD/uTbIw/52K6oo1ZvKsP51YKGMHGGccjvkNdEWSy9Qpa0udQBNVPi?= =?us-ascii?Q?0PR8QT8gergwtgMDnOoKGY/2/wX2wDKrmmsgO3yQLg11F0huAQZtpcsM2k27?= =?us-ascii?Q?6dBwqfAi88UeTNrZGkVjHsuCZY4zW8s/+ILPGPIKv0w7FinPlN2zkAMe+tq2?= =?us-ascii?Q?6BOkJCwxefMC/6pRMMGKQsTe3wj9eWaTteiQy5xPpGp1J2evSXQTsH9aTzh2?= =?us-ascii?Q?snfFnjqKp1TZ6P8mka7tx53UB+fh+0HrCcz1HXSzBPA0FkSkoG28p5AchZp/?= =?us-ascii?Q?WAs6+aXPaLfed2UgyFzVB8z3PLOp5OW6jVhx1LHlCDZShVMJLFazeztG6K5r?= =?us-ascii?Q?DsObYuZRnQkZHCkWFURAqeqIQiEALtfPJI3jTvuSnzc3Iz9sY5XIH8Qg3Ixt?= =?us-ascii?Q?JtpzcOOYThMSYNWsY0M9XRtCXpdO/8tMsJ/OynVtBggNqfxlNKWYApIH+Y1N?= =?us-ascii?Q?Dza+IRg8wjIb6cxy5WQ7SXktgg8FMOhY7Z9DuBLWPyevxN+8J25HQSSIbUoe?= =?us-ascii?Q?mFxBLozL616Y5vofm9DwdXiyY050iOdHMZqEIRrwQVnF5LJLxl2Pqw2UTCmJ?= =?us-ascii?Q?bv7IB7bjgZCE9E4KcLtnrY1oP4sTphQLfBdAVMvC/Ch/S9FF+BO2GSEitoJq?= =?us-ascii?Q?8YN53eB0UU8N6iDEs0NpwEHniVEHi8fe6DQD2Lrz?= X-Forefront-PRVS: 0367A50BB1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(7370300001)(4630300001)(6009001)(39830400002)(39400400002)(39410400002)(39450400003)(54906002)(8676002)(81166006)(5003940100001)(50226002)(6512007)(6506006)(38730400002)(110136004)(7350300001)(53936002)(6486002)(7736002)(189998001)(5660300001)(305945005)(4326008)(25786009)(2361001)(2351001)(33646002)(3846002)(6116002)(7416002)(74482002)(48376002)(50466002)(36756003)(575784001)(86362001)(76176999)(50986999)(1076002)(42186005)(2950100002)(6916009)(478600001)(66066001)(47776003)(2906002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0202MB2556;H:orc.pedanet;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2556;23:hfOIhfFWD0zxzldomdCIFX/aGPdaPejaCGkY+S+?= =?us-ascii?Q?6aUWhABqzIg1eAj7GiCBftj7oTkeYIM6772g1/cSI8ieV/jRVx4GrK77Wzzk?= =?us-ascii?Q?bIVhiNU/Yeqw67M+LKbzsYLZQEG2zkoOeXRvy2SS4j1ET+uxDZ6N/g0k03pf?= =?us-ascii?Q?oygzKQYrSkGncBMJTUzD4fe93YyDEAJNp9+KQQP5vP0rAi7EGRqMIh4qUZJq?= =?us-ascii?Q?jGXqXe+CpMFNSjSfcz8poyyBRSm7xyyd+G38eJny3GCrD6QV2WrFesxhIIws?= =?us-ascii?Q?HqJSLbjS6SIXVVPn5aLsqH9VkS33ArvEymNSwEcomveTP2QyEXSktBK/kYK5?= =?us-ascii?Q?c5t/xaT+4nfP/pUaJRGofJiQ8+a9SxFQ2pm5Gsz9sMusJGAroKFB63io3HGd?= =?us-ascii?Q?3jOJY/oHnEQ+bXaDvkdDQ7pDU03AbtZ3aGbU4cDc/40u5eSOWWRaLA6a/fp7?= =?us-ascii?Q?Ejhi502lEbLNxFIOuJ484piX9HmvHokyiwkYzyrSGcNF45WS0poZBuqs9u7T?= =?us-ascii?Q?a+SgwtOjnez7JSZVJzh4Pgq8XWi0avYUipqUmZw8O4RRIk/NxznFWx6Ucj6E?= =?us-ascii?Q?MqPrKj9oC4QKYXaPLz+yi9xzyfOeNbQvCeMmw4PNnsfmiboR00IAF5B5B66h?= =?us-ascii?Q?+QEdX/5VG9BNomUEofwONhO7rn+goAndF1xOgjQf/6XhixN7259dFI4lllUX?= =?us-ascii?Q?bvkapS+U1q79SeTNuEfW9EXmuEwNN5q8+Xz7gq3peR0RNBDpPG4nMcuLx0xl?= =?us-ascii?Q?yUTHlkeK0yXLcJW3jmy5Bb9JCmdtMSKuNSg4QQjIkh7aLvz5yxdHCSSM94aR?= =?us-ascii?Q?DNs4eaZC7ylv4owj8EhxbAK0pJ2XepGk36SfLkmnustVa6Dp39V3ikpbUVHa?= =?us-ascii?Q?X3OFvv8rYW56I7ZSEfQIPpZXuj/qqaRPPIdkeDGp27QRhLPDhwa9kw43c1dv?= =?us-ascii?Q?C4YBW/GRLLo2uqYf4Ok5w+JpkQB0OWQZVmnEvoNIeWcZ3pBPrwPvtGvy+nPO?= =?us-ascii?Q?wkQHi3TWKcKlshIKDT0lkOnK0c+/y6h6TZI7uFeURybjD1AdTUDNPQWqXjWH?= =?us-ascii?Q?kOgdxN55bUJ0RfjCEppubnKxWPcNhzeF5RDVlxtYhJ/R0IPGtrlt87/TTDor?= =?us-ascii?Q?MDV6ulSVE1w+adjXpr/vsQNKDjHiEuaPtt7UkMaBt+xdJdqRYrXRhLW5HKPn?= =?us-ascii?Q?HhpbbtqP3LrVD56ZeKgJMcJh9Ee6OaJbfuYBs?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2556;6:0BElQqgqk+gDdLFTJs6XGV+AZbTkZANiJ+OPhGeW?= =?us-ascii?Q?uK6XEi2OHXSYr5OJdgcdmqtCxz2CTNrXfsaqv2dmUNYzmsAPMFvJizr5kHin?= =?us-ascii?Q?HZuP9pCGkhHV3LkNh+VApPWJ9eg0pv03wSWL7vow6PSimd3jd/sPtxOA3su7?= =?us-ascii?Q?zCbUXgSSqmN7gEW8ES0bUGpkoptGiJpF/CJUh2Lm4Y0jX1OGTetb5J730YVH?= =?us-ascii?Q?1NCoroUb5jhl4n7/SIHG2Ov4WzFv2j2cJM4H+E1GikEZtiNf4famTEfGzczq?= =?us-ascii?Q?rdyL6xzzsqEvZb2MatQFQ9tafJebDLbu/c+7Txtxz/MG12FgJWxGabKPoR0F?= =?us-ascii?Q?7LSJAFB8Kf0ZijLSwXZqJkStV8EN37z2M5DBjj8nJEAqhoqd9GACbZF2M3Fl?= =?us-ascii?Q?6tcwgr/EnAbebCBB3dS+rsYTUWqkGzeAe/XEj/VDH48+5tDxbnk9yBGcaMw+?= =?us-ascii?Q?6G2qVgQZQcoV2bwZZ/xb5uge9tdK6N7/QrQ/wmhnhHENjdJCR48FsPKQ5Cri?= =?us-ascii?Q?OWryN6ihnRv03mLmipwvE3NjGEdgYbGtivZMn6bfD0e0RgBhv670ywJfgV3Q?= =?us-ascii?Q?CvFZ5Goi0M5boAJeRw0jNODD7HNJ88p/oOl+Ujd8dgYxk1luOqzNPYYtr1Tq?= =?us-ascii?Q?egZ1IkMTvXyCMUPZEzpzYi+ukSp524qHn0dCQRnuLpi9+nVsegOZQV35/uPP?= =?us-ascii?Q?7s8ktbw5s1FQYA0OawbU1HmT6AbcF6/lTlX84/ynWmyYgXSEAdU8BlSAq1ik?= =?us-ascii?Q?bNIjsN6GlKYLyiLDthCFjxPb15ioF7fEwD6XpiUR/FfXSoILRkKBqg9XwU5i?= =?us-ascii?Q?Ccce8obSP/eIUynUMEA4El+ZSzg9IvrNs/lNLxz0A0HN2RdOqf/Y9xPqS+x0?= =?us-ascii?Q?g4kOEdulMF3mrTbFscQ7iIzLcJLiltInZ5fXvuzQ/OPvIx9GtzEwfBPE+Exw?= =?us-ascii?Q?BmA1U9k9Wk+Cex5HIGPz8dVlzbuYUJS5yhtoiy/NyVURCsr6q99BfVO1K3Ug?= =?us-ascii?Q?6qk=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;5:MI0aYsZQQOLb9yrOhCIZFm0nX/ElA+pBn5FraTuNNS5rGvz2dU6kGR0ZXCHuba7hka1BKbiqENJiwAVVZNfLft6luNjfQPaRDGuxF68c6qfsQoZT1f/BpTVNSdbLb/IJdbkBHHGbn9/QKAt+AwyhhgMyMAPKbFXaD+xQUnP0vSB/TAE0zN/Ju94i3CgLn2D0QfwrQ6ZztK1X0MJh78u//W7Q3L2yuOVlDe94v6d+TETTyp6ptOfaxsCNf/ieCiYdIg4ReKm95wmES4ZORU2cdzUVe5Q6w+2JvGwHxO8sky4xPlKcZOJAgnVLt3JWW/nROY6GhAAgLjFQmpuKXikjliVua47BaLeLDcK/+FxzomcHCzMJ/nRGepQF0bHB6AdnZYYVO+UM/Wmsshp9uhKVsBDUp71jg3QvaEU5MpLK1Mo/qIAsYgmpt2aMooAi5swV1XimV/eAkrpWm9prxsCRwyUofcgy2czRKTwlRXInrdPsEG9i8nUbfsI3fILsIQNz;24:QYudIgbuAA9v3520HpuhtD4Iy1oxNWz0ZdnKmlApjZPhDacMoPTN7+il8HvhlTVlhzr5whKD6cN0w6cvDd84nPdpsr0uMt9xc+D/1q2VQuY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;7:79XnFRmDtx4gjuGUAVmp5106ril0Na1c2ZWjUmJUQJPQfCZxb6KCmmN6f0gmBIdjHqJO4Bg9Sj9IcO9KsfaqUARWaLqrAV9KVQsmBM71SQP/LdA4lK98kXZRCwXvCwjFD+IK6ZIaunsbmlYydPVtwqENVf88QGZY3wbDV+oAmUnwiGoW34Fz8lwFmT4/OPWt65yqWzUACKxTcl5RDAIH6F4Bv875RcwKPLueRvuE6LDqla7jY4QrvF/IWdkAKUxlcYR2Z5k6hG2tmoRiYcus2kO5mFmc3BzV2+lJcaXFszKpUkjohyOo1voxE2Yl01fnui46LnyfFSKx66MYhS4OtDYh2jwzzPEaDE0PJ8lpcRhAgd55xkupBST+7zriY0iEDNOVtuVXoAMpfHd95uihPpiY/KGviOV8JWh3ZjMev+fyqA2REFLEbrvBcwyI3ZsvVOhJUpBcpyzeC2YGMR3oyagzldt8O4JOGqAgaBcTYV0Oe1vnlfbnwduPenxlzmncOggYU71lUKlHDofxWbGk3iX05cdl5vnFK1r8mrTFzvwFh7ZTEhyygv45/PITSeqOpriqW0epBqBe4nhFQ/KDkRm8SuzJJRS4jIUCW6UuPJPODcnG85kp8/MIJGUmMYlVwQ98FKkSYMUHZ5+1L1SNNuPAhzTI3Gh5fb5+4yxHbl/wRirNDz3lFrGPSmShzbLHcu4Tydhyyx6ODkvIRs7bfcIgvUNFPD0HUCqWGl7ksa0YY3RQK/+rOk/Fg2YpzTQll682L8QY/YzQBR7C+hXJKsBThsJFByRtc/kkUxQ0RL8= X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2017 16:24:30.7823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0202MB2556 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The redundant fb helpers .load_lut, .gamma_set and .gamma_get are no longer used. Remove the dead code and hook up the crtc .gamma_set to use the crtc gamma_store directly instead of duplicating that info locally. Acked-by: Daniel Vetter Signed-off-by: Peter Rosin --- drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_fb.c | 20 -------------------- drivers/gpu/drm/ast/ast_mode.c | 26 ++++++-------------------- 3 files changed, 6 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 8880f0b62e9c..569a1484d523 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -245,7 +245,6 @@ struct ast_connector { struct ast_crtc { struct drm_crtc base; - u8 lut_r[256], lut_g[256], lut_b[256]; struct drm_gem_object *cursor_bo; uint64_t cursor_addr; int cursor_width, cursor_height; diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c index 4ad4acd0ccab..dbabcaca6835 100644 --- a/drivers/gpu/drm/ast/ast_fb.c +++ b/drivers/gpu/drm/ast/ast_fb.c @@ -255,27 +255,7 @@ static int astfb_create(struct drm_fb_helper *helper, return ret; } -static void ast_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, - u16 blue, int regno) -{ - struct ast_crtc *ast_crtc = to_ast_crtc(crtc); - ast_crtc->lut_r[regno] = red >> 8; - ast_crtc->lut_g[regno] = green >> 8; - ast_crtc->lut_b[regno] = blue >> 8; -} - -static void ast_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, int regno) -{ - struct ast_crtc *ast_crtc = to_ast_crtc(crtc); - *red = ast_crtc->lut_r[regno] << 8; - *green = ast_crtc->lut_g[regno] << 8; - *blue = ast_crtc->lut_b[regno] << 8; -} - static const struct drm_fb_helper_funcs ast_fb_helper_funcs = { - .gamma_set = ast_fb_gamma_set, - .gamma_get = ast_fb_gamma_get, .fb_probe = astfb_create, }; diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index aaef0a652f10..724c16bb6a62 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -63,15 +63,18 @@ static inline void ast_load_palette_index(struct ast_private *ast, static void ast_crtc_load_lut(struct drm_crtc *crtc) { struct ast_private *ast = crtc->dev->dev_private; - struct ast_crtc *ast_crtc = to_ast_crtc(crtc); + u16 *r, *g, *b; int i; if (!crtc->enabled) return; + r = crtc->gamma_store; + g = r + crtc->gamma_size; + b = g + crtc->gamma_size; + for (i = 0; i < 256; i++) - ast_load_palette_index(ast, i, ast_crtc->lut_r[i], - ast_crtc->lut_g[i], ast_crtc->lut_b[i]); + ast_load_palette_index(ast, i, *r++ >> 8, *g++ >> 8, *b++ >> 8); } static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mode *mode, @@ -633,7 +636,6 @@ static const struct drm_crtc_helper_funcs ast_crtc_helper_funcs = { .mode_set = ast_crtc_mode_set, .mode_set_base = ast_crtc_mode_set_base, .disable = ast_crtc_disable, - .load_lut = ast_crtc_load_lut, .prepare = ast_crtc_prepare, .commit = ast_crtc_commit, @@ -648,15 +650,6 @@ static int ast_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, uint32_t size, struct drm_modeset_acquire_ctx *ctx) { - struct ast_crtc *ast_crtc = to_ast_crtc(crtc); - int i; - - /* userspace palettes are always correct as is */ - for (i = 0; i < size; i++) { - ast_crtc->lut_r[i] = red[i] >> 8; - ast_crtc->lut_g[i] = green[i] >> 8; - ast_crtc->lut_b[i] = blue[i] >> 8; - } ast_crtc_load_lut(crtc); return 0; @@ -681,7 +674,6 @@ static const struct drm_crtc_funcs ast_crtc_funcs = { static int ast_crtc_init(struct drm_device *dev) { struct ast_crtc *crtc; - int i; crtc = kzalloc(sizeof(struct ast_crtc), GFP_KERNEL); if (!crtc) @@ -690,12 +682,6 @@ static int ast_crtc_init(struct drm_device *dev) drm_crtc_init(dev, &crtc->base, &ast_crtc_funcs); drm_mode_crtc_set_gamma_size(&crtc->base, 256); drm_crtc_helper_add(&crtc->base, &ast_crtc_helper_funcs); - - for (i = 0; i < 256; i++) { - crtc->lut_r[i] = i; - crtc->lut_g[i] = i; - crtc->lut_b[i] = i; - } return 0; } -- 2.11.0