From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753277AbdGMQ1r (ORCPT ); Thu, 13 Jul 2017 12:27:47 -0400 Received: from mail-he1eur01on0126.outbound.protection.outlook.com ([104.47.0.126]:2649 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752765AbdGMQYt (ORCPT ); Thu, 13 Jul 2017 12:24:49 -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 , Patrik Jakobsson , David Airlie , dri-devel@lists.freedesktop.org, Daniel Vetter , Jani Nikula , Sean Paul , Lionel Landwerlin , Boris Brezillon Subject: [PATCH v5 08/14] drm: gma500: remove dead code and pointless local lut storage Date: Thu, 13 Jul 2017 18:25:32 +0200 Message-Id: <20170713162538.22788-9-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: 1e7e4263-57b6-4d8e-ce31-08d4ca0ba5ae 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:U5eGJnXdYorbram0JlincHHU7Dg2kMIWbavkuojpyzs9htIcod2sPRwypGnYJAggQ5zVELTaOzeChoMJ+cf5IryrBVjNXEMhwnOEKBlzgAGKKwSHHUwgT08IAUvEir0l4XCo8J7ebcm+CZ+iqlp5PNoVuytbCOSLIt05HM44cJkupvNzFB5Azfgs9r0bVPYVE45krFpfaLxzOPeWMxcPqHrFuvoXRDJ6snPsVzx548o59PMPiRPxYgxds8QggZYYix5O89spgbqS9tUVQP5tkZROdRbzWifHGMHAItfEveLYyn65MCs5bmiiuure/CYWC0TYmnWkc1yS1IaCZFHymQYWTcN+laQCmxYjiqR9XbpFEjeNePJtxBbiao6aF/pGUj37Ok186f6+BVOcvt1f2YLMPUqRgw/mRKwlrszgIoDHeQCYRdFaJcZSai9O9A4a3dgWMTLDxA011iACgfcCMnr6oDre/mjkXX3LYhLf9PJimyNub7uplpbdISVp0STF2EuZqYqYPQtQ7BPqMT87IxXdZ5b4qaFTeqIdy067Lt/KhBdX+bq7gQbR0hxBPHvpb6DZPoUTjE2AvWeZ6/C3Ksgp+9D72bX61u2wKAGzuMLbLF62J8LGIxuTg2u7uDaKtMlNAGf6l9n/Dd1RNH6GO2E/8xzWZQcDUFyNgYBh3aHyAniPMYmpSS6EVyfcnw6I9MJ7D7Fn4MyAi49LHbC32g== X-MS-TrafficTypeDiagnostic: HE1PR0202MB2556: X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;25:hgJ4P5zORUpkrCH9eRZA6zWXKaRCeDLkR7eg4w4C5ecs3EiTZD+oELHiO0lHtaIqwEPiI3QLgA75/3j8PxirueIh4owyQ//eoZCO/61PyPCmEiLEl38gadmyFigsk5j6TOlK/Zd8tQBk+IC6Y+3yonqxTDXBNFNE+RT68xZLF44bxRYNG5cN4lFjgBhSzPzORsk8NN4W8ApyRbQTjD1HwUuc6zKvOtbAvJP+vQxNnuDA3FziM66IeSnX47WmiQQrlqAPGlRH5fd3aDt8zL7wId65xJI/ReMh6rb9mqigYI280KWMkS1KNTitT9caeRgT0hG/veXjCo5uk5wPNRRV4RHIovHy+siy5u+c+n8dHqwuadNFlXsKQTTYZGvT4Yu7puCJa82FEQ3tqM7U3e4E+WCDZkYSsEOMQElRUIqQkNDdoTBvSkQhmnhz9EP3bGt6n0O2g8Qjf2D6OzcSiIVrniFHIUOVv4Yz8QJtziaW87Ne3IjE+xETSpOSrS1Dgnop3KFyA+Lk8GicoU8onPKCOIzWhVf4glf431Zgb/bUd8POwyg7ey+s+J2fpwZthTsmIca38ifC6y3QNWqOpPSFphpU6Kz4RD/68JquGQseBwGFmz+U/zvgNVrTNH0bfZEMLtO1TPLxnpHuN8HkxLitOgTwWMTILe0QTIXFxA8mI9HHVuwCD4mwmzF4je0jq51c6Uy3/XpG60Q2t1RhDLpSFkKc+UJcDtNcAcT/jl7uJCOUDpxa2yQqWW524QMx7aTwwQ07zYDZGWR3j0UbBnr0bT3RHUABnhdJShsO96T5zSbxe0aZfiooAr81iAWtfubzxytB/jFH7c1Wn7OrLtamST9fr5Ls3ZmGiqWFxLm7HiqgQUb6/SWs3WO1nb00yR3qgAGi57mFPE/jJdLQtHpsAblv4a88Ejck3yqlrieUfaM= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;31:735dIDLpTsN+6Xexirp1EFCWeJlcdbWLsFy9dfqeA1V7tU6DJnyLEFB6cGfX1nlClz07sOImckg43a1R5omE30wTC5+8Im22nEBc4p/TVlfV2sv+Mk+LihPGzWDktn50tprJSnMTf9+P4vSySyrt9+J4996NeiHG/4pgwy56NOYbMCoGg/L7uG9G4yvtRAke6iJV/weFMNr+RXR3rpclih+UwPtYEBKQuX+ez1U9Efo3GoqYHFIA6yk6EkoLNRfU5PScJbCuVEUdmkH72k0GOJzoowb4xPVPwzVr93rKKtIbxXUCYlAaSc+ipZ8f8QW3YI0Ch6WXB2yLWvXmLVYinhfycIq09BP8YaPr8OPL7HUnRsYVwOobsk7nNZeM7svuFvjdxeYp0xaBKMcXOJmxEefi6+k8KglmOc6sfp9zhQB1Gu9iW2frVGZP6TQEmHRsbSR65mWHQ0hmEpF/SiTjjJ1vWYhzc06XXIcFaU6dqcWM7TkBsMdwfq1WkX157oZDFwewVDJ9f8fyjFx5M7K1uoAhtKpUpgaSFT0FYgtRJftaxdoWwOufecauuF+M8L4v50Cxb8+QzpSr/bzfppO+eJzrua+ylee8xcjBjjPN3IIYWFaL317TpotTHkM6boknoCU6KanXOPRfdWfPXtJ6008Rf7M39DtEHXkwX5IcKiY= 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:lLrRxI4m0RzQ+OB3WDnmfDPr6TNgTUDBeM3LYAGf?= =?us-ascii?Q?FuLzK+jPU8pC68Rkvn+zR8Cftyl3sIqvEayQN1QkiV78PtQJaZzBIFnFUdX+?= =?us-ascii?Q?AI5ipKkFpDvTsb9DFENFSxlFoInhxi4ED684DFgnBLqfgviQVR3OmOh2w8Hv?= =?us-ascii?Q?FyF4eOO9PsKX7wFCZPYcDf/Feu0FCOuefWDVHowsbP2sIVVgsyqJ4yVUCqGf?= =?us-ascii?Q?neFny7fqEoQREuQ5LpUd8O09xjbBTTUFCSiFHL5aatgsCOZeishIJsmMG19C?= =?us-ascii?Q?+iCLFmF3DZls3702hx8/E4nIlr7johtKZX5JMpwp80kW1/bU0gTxq7yy3ZPb?= =?us-ascii?Q?CJofAkRgQOlHPq/ZtTr22Lem5RVNw1Ff2zTv3iOyKqJzEGpIzm7T6CkP7dZh?= =?us-ascii?Q?1inr6wRIDrQlE5GX6clzBQ/jt/e2XZuLSvMngv27M4pfvYMeyVUraVPqYdIM?= =?us-ascii?Q?zdvQ57vAEdR/WjUTFxSu0mpM33+5va0VkCREXA8i70IgRDtVH/SIC7/GMY17?= =?us-ascii?Q?kA5O34ZekrL5eAb5zXi1ls4vbh3XDYDXxJIdsgA4AhOQQ/75SxHtEAkTJOER?= =?us-ascii?Q?Sg0j4LIZdz5k1nhzhSfOqDDpp9Mr+R8G5UfOTDBb9s1mNP6jZZ/R/dGNH/re?= =?us-ascii?Q?zHy2lABLdznfBEPDFLFR7t/WKefY7NWs2ls1LHSj2tL3hP2yIs+wif0USuYR?= =?us-ascii?Q?bjuEa0f1+LFg0oh7jdGkCbbdMVBMHUx8HxyeLRXYp+02GjQEfG2wsxSQAdpY?= =?us-ascii?Q?1Oh5n7vAxf2k2+x3ztpDphONpoihdK6yPMP9chhUcS9Y80QDinKPaL7cByh3?= =?us-ascii?Q?kf6+ox0nWCO0fQu4r24aac3WRQIH4Ddkjz62PC+8jFxnBiA1RRGKlrVNAjmZ?= =?us-ascii?Q?ycv1jWdmA8NwBfKObeHOXZ4JFWDeO+EkIvuIXsLR2cMbjZZezLsyM2SMbovu?= =?us-ascii?Q?cDvcGWTFhnVXVXeMRbLs472WQ6g4cSpSE+LPCuVApttfGpUAa6wH+Qd2FaIL?= =?us-ascii?Q?yoYfSTpQJheBBKbLe656m3vHLOJPUhovoe/SWB5x0ckWJHPHbYEvVDdtFOPM?= =?us-ascii?Q?evGzFo7XgDZPEERkvTL6RAOE/zv3IQmShZpPcQ/mAWSMsjG52fMbJyTcUbiX?= =?us-ascii?Q?Z0UIeeuKdf6ZFlH753M0GV7ohV1MEb4w6OT9uSku2gWKs/EonOOukUuoWp4D?= =?us-ascii?Q?v0vllp8PELC991K46dONM0SM00Wc6pkuO/ElFrmZxfwAoIkDQKVgUaeXpXaL?= =?us-ascii?Q?z1qjYEVlSxokTzjGZEGrcEYcRMOYNuH+q9Ep2Pj6?= 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)(74482002)(48376002)(50466002)(36756003)(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:IXUy3n44nJRmaJ1azqNEPjTDdwn1zi9RGkkqPwP?= =?us-ascii?Q?72aJiwISqUHAdUWuQ92XSWTq1Qvt1H4pDqYG1xmVoB+dd/I4WCQ23vThV7Qy?= =?us-ascii?Q?pTcCCFgqlrcdnhYdDXOYEB66QcNcKwtQ9Kg4bIaUKqlHXmGB+9JSC3MgGJiQ?= =?us-ascii?Q?MMT52SiIsnI6flxz7DNOy+N96FKG/C5A5UHYkYbix9oFEUOv+qJOC2e9v1Nw?= =?us-ascii?Q?do0hASV8KdxM20IRM+fvNbvtZ7qNOgMu5B8ACQu2InfMMrayjK3cu6jjSPmH?= =?us-ascii?Q?zyy0Cq4pFsc8qFZ2qc1kjzNzcaUM0VlKwvAuyDUywYp6c9n2+Ss0BS2+cgXA?= =?us-ascii?Q?D1du6OTXamh1R9Ji8TgxPfsaUobib6oHbXlq7CCqBK7Xh5Ti7WwuZ+r0Ecis?= =?us-ascii?Q?ZzsWD4vz5ukcfb/1IuTcVU/4Hde1UXL1xrhP/lGdMDyNAFEl0Ll1Ih+h0Yp4?= =?us-ascii?Q?KxYd7hZv5OzpdP0f0x5N6b5ljgCtb2C9NeLA8La6ZKB+2zHMd8o9U+oyiqM9?= =?us-ascii?Q?sTfWuQHro59GglfGdXuil/IdolMxnpO4sJWn7N6xYcw6D9EqqIvQ0HW+OWzP?= =?us-ascii?Q?vntkLmxW5dHlZZCjZTxNmnCdURhr+VKicX880aCR0YpE76mPwh3p18lW9Hxm?= =?us-ascii?Q?XQZGyfekbFD1zWkPHWsjpIe/tUTdSojVvNfAyc4WU+FheJ4H/dNIdAW/UfLx?= =?us-ascii?Q?qVoaDcMdqzOeSVu5ugo2OfS1hEPVZ5ShTYkB+FgE6eo6UZhY9mBMUDrSK7gs?= =?us-ascii?Q?DsIRWzsEMRqXthlTa3SQBVogosFSvY9Dz2H9YbGyJHEJXatkZ6T3+9/QRKAX?= =?us-ascii?Q?Gmynz3m2I5N+qRxjWfflIdDLQjhTmTyfzTlMaF0M1Qta498d85WHdilKIpde?= =?us-ascii?Q?+4vXBP78D6LApf9simmQVcKrz7eo+CgSk+UJEkrubAJT5+855V/mqk0BCS+C?= =?us-ascii?Q?OmHe5hxZNcgbmTvJkivSvApdXF5rlNpz+TeoErKjl2vF98Htwj3xNfO59zBS?= =?us-ascii?Q?W8ftkhGQi/b6qQbtriQUPK946JEtv92bxfvABwqZFkk0UAl7Pom7ZHl5scwo?= =?us-ascii?Q?NNwMYn01d5fKQMu7fb6ynmFpw2Oel68Vk330zsaEBO7vW7bnBX0C73CGK1lF?= =?us-ascii?Q?OsRdTQQVPQqXzxMODI3ULpI3BtVArzZlr1kGw3gflNhcxzcvK3/hLGg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2556;6:2ueGJzBIopw0M8I7snnHyHCRnUrVw+fiU7nZ+2Ua?= =?us-ascii?Q?fWDh2TmCZCvLn5TFxe80J3jqAtCy1V8qUMzcuHiMIrrjYdXclpAkk6kEWAEW?= =?us-ascii?Q?M5AcVuv7YfpBeuLP+Z8xp09tGvoRMNE5ay6ik/Af6lC/QsTQF62pNbuyfoxQ?= =?us-ascii?Q?xImc3Nsb1cKaZ+cVbe8k4BMSFdWYT+SHkzucN5EUDQYC+z+cIyZSaeEGqUYZ?= =?us-ascii?Q?xBmyyqB+BrXkx5rhCaVLCVOhPHP7b38mIN9K29yOiWpngLLkC8cYWumC0zKT?= =?us-ascii?Q?4FbeU6zFHtQBJ+VcBWuFTvKI7oFn6Wd832fwrPaIuNNK/0SMT+Vov/3u+Wyb?= =?us-ascii?Q?4NUMARZqzMv/A0VmcgWNR1Ji+cDnNEEnVVev4dp5NX1PLDFa2LYxQ54WYXAC?= =?us-ascii?Q?F6jnfNA/To0aXls24yUSsAJFr7oC4/u5/kV1q4Jg+4eyc6iyeccdVT4hT939?= =?us-ascii?Q?z/7i5zif/DhLzCmW8nNmmY17KXo+0EnboHDNkApNYalPDVgNKPmdSn7/Bo8V?= =?us-ascii?Q?+dFsItkUxkipVjDiHZZ2Vsg+hL+kteH6CdHjYescjrS53VAUzDDJKWlCszL3?= =?us-ascii?Q?lnNwFAgINLcrdXBphPWoIpCdMN1FYyxwY9hkSLICffvvYLAdyObU6REWoRPh?= =?us-ascii?Q?LdB4ApC99s111K7SI6s4/37egw+ShWLrqYJjXy6syeanxW/rfUpCgpe5VQyq?= =?us-ascii?Q?1wmvT81vyoF+ZBQ7RBtFSP8p5W69xSaw1japCa/UejRP5DPTbvkVixgjOCIv?= =?us-ascii?Q?Ws03/ng0jA8bgut9MwrFwNZPnwqSByiLpBaOfXGoW+2LgZX7e4MZTjwoErIY?= =?us-ascii?Q?c3Sb3fVAwOf5xbrDYZ77Rab4HYfzFxwEQgY0nuV/LSd7ciR+z5tv+PO9z1Ct?= =?us-ascii?Q?PgwxD8HzsGIhXGuIPCrw4/dVDDF45glsCvYqhlYNBpWn4rGjy3l6JdJmReCv?= =?us-ascii?Q?Y+bF4cqX0wPAavK+JoyltmLEUPtg27jKKNwyN5yQUx5dJx3D5s80AAtSMqL8?= =?us-ascii?Q?9+U=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;5:1hiiNMvjNvXUYxgAbrgq2eB3e/7s5H3Co8C22IMmomxhzR9QcFPNipXGnA+/YHeGNJVFbKe0MR3hWJiFj1fI3vIrBDfMyp6ZGUeUvuDceEVVgEzZ+Jpi9gUyF8oPp0Rm3R7lsQoFZk5hoZpvbv7+yQMg0hDa4tTb9QJ6GFwxnl0x/UIh6eJkT/OSdg+OJa0yPKb9Q4rlfxG/jRg12HyF3q5wV8FT2DpAQc/CawAH0LC/d27tsLrUUwPx2cnc2xjgGRDNQwQrKXIsKJVPvYDcmNqja8xP9OUcpwgPrDDmzv+3Copv3M7O4WhQawRYs2cHx2z60f0j7AVhuP2sZR79vpkVZijA+YKXBuGXQJGxb6bImgE2S4pDHIbHSvCdHnT95n4OpooSQhBwDzH11cRiKPcAL97XT2m+sXzoO+p+/Rii4vfOszSFlGaOyYiJVNVqtMfbX/AvUaVBvIizxcIxr0EfTJOL4tb8tR1/vzhtPI1U13dZiq8e1kP6J/xW4W9z;24:hu/7Kjaj6oql18dQ/XARQjvgNnuwVQAjzhf+c2H3Q3T8xqBkTGatyI7gqHRx93jSrFdajpZ+5ztU1zeojiWAmQSG80VlXygfZ5ln07ODveg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2556;7:eqZfDseki8MxWfIaRQcb2fKvlsrzarqS2IGYYAh2f4qzMaH5s7ZhskhV07d5jNdddcPAUd74gP0NIcNduQU1o7K5NRdnEJIubLW+dRvu3C+0H9MF3W3jgUTHGIwBjF70++i4yBLGuIrmBpPVyVJy0LMiVAngT+tzil++xS+s2Tnz24KMPfDbPWEL5n4ORkhEMfKkqb/tUPq5cCxpYPvHbyNQZlBeLFqUamxmsBDyZESq9mGn6Xwfw1v/1Zs+iS3jhxkJH8m111RkGxtAuaNMVXpvWyRkt90AalVqkEOrfFiE0lU8DrxvjsFBBsAuH06+WW5zAxlLZLoATaaRiRxXSxDTwK/m3ridzWWqMKXANjEjGQWsrfiuEKlj1DyozETU/i7ihpywX4ONr07Zyfh17mu/TRq89yTOTuKWU9cA/5npRRetT0CbS2k79DWjrbKqS36suZHRimodJkXGWveanCVpX1dZqXhpBQuSdQCPNS+lcyvC6xSELCeTETvVl7TVXBTWi4NCw9Bnn+aUSmgubDXQaEl2sJ3hqySdv0Aqf5MyWu7bziarSVgl9w7truA04J4gocDSTw6yVobiBWhh9u538ldFRi5cvc4IVENNUTPo/j51JV2ZSvH0p7hB/7P94Eq9Ep2dKj6R38l9zwJBvEDR7HSQls+k002/F1TCoBS4bW334LCIGQtae32OtaHpGcji+hNPBUKgb9b1Maw8fpiWgZTKJ5voH1PBmVR8X1HqBiAr1fcdMxoQnIyNURXMPv4lfpSCcbaQKCKAM+YMU169wJaTxTTVW4P6wReNp7s= X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2017 16:24:33.2355 (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 .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/gma500/framebuffer.c | 22 -------------------- drivers/gpu/drm/gma500/gma_display.c | 32 ++++++++++-------------------- drivers/gpu/drm/gma500/psb_intel_display.c | 7 +------ drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - 4 files changed, 12 insertions(+), 50 deletions(-) diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 7da70b6c83f0..2570c7f647a6 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -479,26 +479,6 @@ static struct drm_framebuffer *psb_user_framebuffer_create return psb_framebuffer_create(dev, cmd, r); } -static void psbfb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, - u16 blue, int regno) -{ - struct gma_crtc *gma_crtc = to_gma_crtc(crtc); - - gma_crtc->lut_r[regno] = red >> 8; - gma_crtc->lut_g[regno] = green >> 8; - gma_crtc->lut_b[regno] = blue >> 8; -} - -static void psbfb_gamma_get(struct drm_crtc *crtc, u16 *red, - u16 *green, u16 *blue, int regno) -{ - struct gma_crtc *gma_crtc = to_gma_crtc(crtc); - - *red = gma_crtc->lut_r[regno] << 8; - *green = gma_crtc->lut_g[regno] << 8; - *blue = gma_crtc->lut_b[regno] << 8; -} - static int psbfb_probe(struct drm_fb_helper *helper, struct drm_fb_helper_surface_size *sizes) { @@ -525,8 +505,6 @@ static int psbfb_probe(struct drm_fb_helper *helper, } static const struct drm_fb_helper_funcs psb_fb_helper_funcs = { - .gamma_set = psbfb_gamma_set, - .gamma_get = psbfb_gamma_get, .fb_probe = psbfb_probe, }; diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c index e7fd356acf2e..f3c48a2be71b 100644 --- a/drivers/gpu/drm/gma500/gma_display.c +++ b/drivers/gpu/drm/gma500/gma_display.c @@ -144,33 +144,32 @@ void gma_crtc_load_lut(struct drm_crtc *crtc) struct gma_crtc *gma_crtc = to_gma_crtc(crtc); const struct psb_offset *map = &dev_priv->regmap[gma_crtc->pipe]; int palreg = map->palette; + u16 *r, *g, *b; int i; /* The clocks have to be on to load the palette. */ if (!crtc->enabled) return; + r = crtc->gamma_store; + g = r + crtc->gamma_size; + b = g + crtc->gamma_size; + if (gma_power_begin(dev, false)) { for (i = 0; i < 256; i++) { REG_WRITE(palreg + 4 * i, - ((gma_crtc->lut_r[i] + - gma_crtc->lut_adj[i]) << 16) | - ((gma_crtc->lut_g[i] + - gma_crtc->lut_adj[i]) << 8) | - (gma_crtc->lut_b[i] + - gma_crtc->lut_adj[i])); + (((*r++ >> 8) + gma_crtc->lut_adj[i]) << 16) | + (((*g++ >> 8) + gma_crtc->lut_adj[i]) << 8) | + ((*b++ >> 8) + gma_crtc->lut_adj[i])); } gma_power_end(dev); } else { for (i = 0; i < 256; i++) { /* FIXME: Why pipe[0] and not pipe[..._crtc->pipe]? */ dev_priv->regs.pipe[0].palette[i] = - ((gma_crtc->lut_r[i] + - gma_crtc->lut_adj[i]) << 16) | - ((gma_crtc->lut_g[i] + - gma_crtc->lut_adj[i]) << 8) | - (gma_crtc->lut_b[i] + - gma_crtc->lut_adj[i]); + (((*r++ >> 8) + gma_crtc->lut_adj[i]) << 16) | + (((*g++ >> 8) + gma_crtc->lut_adj[i]) << 8) | + ((*b++ >> 8) + gma_crtc->lut_adj[i]); } } @@ -180,15 +179,6 @@ int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, u32 size, struct drm_modeset_acquire_ctx *ctx) { - struct gma_crtc *gma_crtc = to_gma_crtc(crtc); - int i; - - for (i = 0; i < size; i++) { - gma_crtc->lut_r[i] = red[i] >> 8; - gma_crtc->lut_g[i] = green[i] >> 8; - gma_crtc->lut_b[i] = blue[i] >> 8; - } - gma_crtc_load_lut(crtc); return 0; diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c index 7b6c84925098..8762efaef283 100644 --- a/drivers/gpu/drm/gma500/psb_intel_display.c +++ b/drivers/gpu/drm/gma500/psb_intel_display.c @@ -518,13 +518,8 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, gma_crtc->pipe = pipe; gma_crtc->plane = pipe; - for (i = 0; i < 256; i++) { - gma_crtc->lut_r[i] = i; - gma_crtc->lut_g[i] = i; - gma_crtc->lut_b[i] = i; - + for (i = 0; i < 256; i++) gma_crtc->lut_adj[i] = 0; - } gma_crtc->mode_dev = mode_dev; gma_crtc->cursor_addr = 0; diff --git a/drivers/gpu/drm/gma500/psb_intel_drv.h b/drivers/gpu/drm/gma500/psb_intel_drv.h index 6a10215fc42d..e8e4ea14b12b 100644 --- a/drivers/gpu/drm/gma500/psb_intel_drv.h +++ b/drivers/gpu/drm/gma500/psb_intel_drv.h @@ -172,7 +172,6 @@ struct gma_crtc { int plane; uint32_t cursor_addr; struct gtt_range *cursor_gt; - u8 lut_r[256], lut_g[256], lut_b[256]; u8 lut_adj[256]; struct psb_intel_framebuffer *fbdev_fb; /* a mode_set for fbdev users on this crtc */ -- 2.11.0