From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752812AbdFVGGn (ORCPT ); Thu, 22 Jun 2017 02:06:43 -0400 Received: from mail-eopbgr10124.outbound.protection.outlook.com ([40.107.1.124]:31552 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752171AbdFVGGj (ORCPT ); Thu, 22 Jun 2017 02:06:39 -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 , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Russell King , Dave Airlie , Gerd Hoffmann , Daniel Vetter , Jani Nikula , Sean Paul , Patrik Jakobsson , Ben Skeggs , Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, Boris Brezillon Subject: [PATCH v2 08/14] drm: gma500: remove dead code and pointless local lut storage Date: Thu, 22 Jun 2017 08:06:31 +0200 Message-Id: <1498111597-10714-9-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1498111597-10714-1-git-send-email-peda@axentia.se> References: <1498111597-10714-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: DB6P193CA0003.EURP193.PROD.OUTLOOK.COM (2603:10a6:6:29::13) To HE1PR0202MB2553.eurprd02.prod.outlook.com (2603:10a6:3:8f::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af5bf0fa-d3e6-4496-2a04-08d4b934d00f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500055)(300135000095)(300000501055)(300135300095)(22001)(300000502055)(300135100095)(300000503055)(300135400095)(201703131423075)(300000504055)(300135200095)(300000505055)(300135600095);SRVR:HE1PR0202MB2553; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2553;3:oyAg1COZc9pd17DZ03LGWntVT74uOK/bIyTafnWqIaUbrvTxXsTwfLY1lD4us6c6piYczilCFTC4yLrPNjywYwe5S02X5Vtys5wlmgwMSzhB0SdX0MYRlJZZv0TL/mAggKegFeboC7pjRbd4tCnDVg+hlzemVL7wBlY7X6VkoytPM9O2pEa0QVNBq+niB4n3KaXgPmSAUD3VjtRkPGpAQNcgmL49gEBh4JTLBI6a/4AFlT/N5mZ54Bz8HPlAxn/BM/mD17d4jJjD4efFH2KioKMFOsvDr6cfAAlz8AHf84akN1xJgDH9GADsbQsJXx50SwDA26hgrn8agdBChqW+tu2r2uKA44VpAgHjSX//gNpyJqfU3cIKKC2tLqahiQO0r8hc6KQV3KUbrkPAKX7MOzFDSapt1K01fAp/mzg41vaD9UZxPBUhmC5GWdizxbxIEoSHvSA29DBIAlGnTpy1IYYbXtr+JDs5uRJw9wiOXVljA3kH2ISTm4IHKz9VlylJkFjYLo99UsuF9Mt2TpjbitncDmFDtI72Y7+DU02Knl+OSow6oA9e/+vzr5In3biy4G1Tj+0H4Vst416oyDFdsGc5KyJ03lYud/UK4mfFyav1V3UkHx/z+IvKIm29Re0NHIq48zXQDvI34hvl81YeVA== X-MS-TrafficTypeDiagnostic: HE1PR0202MB2553: X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2553;25:zv0TiBlyK8fiGT8qBSyenUfh8YA7cTqN+PBOx+5UNeOfnc7vuK7PK94qR22wVNQVw3P2gGcsV15GZOltF64JUeAZT/NB32c0Ec18W6rIsaAGHjPR5ZcKY2M46aVxrOdaXrfYkK+Ay/loALfoFyRc+7PVoaQ54QaJqcNTERbWRWQz07Kgyac9mOuq0C+KYveNXebLQSBJEZ647A/vKkJ4hoynaNtT0dteydbNxL/iNkJmRx2khjIFU238ANFqp08ule7enLjjB1886Fq+4DuM48YLCuFcHE0y/ixCT4CwSSwNBhibBN2Uz+ir1YBxuQlkElQYs3kF2Br5bQE085vjt16yY8xMETijmU+CQblQhmx8TfDy6kqAOCG3rfqBM78M+q1SEQf+mVFEZNFlacA/m6buhQouQ9RqggKGwmWt6Gc2ySWZGrbwouz969mTbwfzVdpWj3YNJJKw13lynlRUIz3tsB+92PzZSKefi0+8YM6EN1z7cajlhemB9lACfoFfyVSl41Lppt+1KT6FUkq3IXA/5ps4Fmz7zbEpk4m2iv/mCoRjvi6LurICJUawARhZ4g6SnW0omkSgdJ++o4jmjrN5OWonJxmYIUz4MZDZinnLdqwzJ2zFcPuGldhh9zuuClZF5HaQXJ4Q+NT2RuZSGvAW4ZLDcuNRLn+uwa5LKvupxWK5H1ObKn2owu7mABBLqXRvO63i708BnUbIugm5fD7/zIy7zWpR3CWWj7N01GLZmAFfqmjZW6h4LEG34/j3O6myy2wd/e+u3AVx4TaIw2YSbNRIuwoecCgVUffQJ3qX9x2S6S7AQmrKToSxBLhVKg9/i6HII0R/lHNSMhHaMm3vXDGGO+SZ6cO49fHjUe01YDWE9BdS5yPMn7PP2BCbbp234myfctdAUJmpGeegprcSShd3EME5+LCX9GWQ1uA= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2553;31:pqJhq+P4gijIh+GjjDOeoIMEtWp7wzSqfHslPZpxnX3R8llYWVBzGmDCwdGRusNdLjQfyjNubOJSjL9JJoL9P9EQCDG2OqYixjaQbTYKDM4b6a+si9iOEtv1DjtqvZt2BMmswIsqsHxze0TJSzP4upX9vq25UiZcu+P/gZ25nZLmdEVAXDmb4VITpWKoU+354G9ahL8Tu8pln1qJ4brRuMq70FiiBIUlsJe6okBDtONJPH39hnFbBmqzn4qlAZLdSjYix9aHm5u7pMv72t7NsH/QsirZzZkjK6uvb4lokfKXM7YOVw6+s96F6s+Gv+IZgwg3prCao+xu/I0Ko8Td+rCViI2ngz+8/+SbzoCdnzeRIfTzCvZBL4cz9iKJsIXwSlbajnfiBuK31j1xz/WEf9JPP63cSViIPLiDDkwiD5PAgoT8bmIRjTwnW2IcxVKebwwtz1Cw8RzdSyeWgeKESnL07x05mHFrdu8xM9lEsSSNuhzteUNg580ClVlRYKdFkqQYd3eksq+NoAaAfiA031PqcB8iq9ttnKk6MUMW9iatYUC9ye1cCjKqh8P/2oPKJWvLJw0wVVzaYa19dNY+F+8azojCsWZHBqDajknLvr8a+/se3pXcBZRDyvcFzwVIm9krFpMPqmI3P8G/7+ueW8JbQnyj2Tp6zfpxvavaA/4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(2016111802025)(20161123560025)(20161123555025)(6043046)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:HE1PR0202MB2553;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:HE1PR0202MB2553; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2553;4:T6vgT4ijqliL1jyi23yC/0npRnbrCEEN1/Atn2vF?= =?us-ascii?Q?Ra/7vLTpguP9YUebqrucams8RGTK4npoXQZB2vZfdevMJ41QraUDmVOIrjvH?= =?us-ascii?Q?SMl1rB0vQjevTp0LBgVksf9k6SjPXiq4+/SsJ/DcdUxbNilKspFHaTwgCKur?= =?us-ascii?Q?Oed6G9YT1mJsbSTE93GelqFNJtsCUe50gif5G14MooorgHab/S4m09kkqOfv?= =?us-ascii?Q?iFw8Ij+uBX7Q4hLfiMWitKhXDWTFVeR0P03vrpYdLmc8pMyq9KIz3zrl0+eV?= =?us-ascii?Q?944qEeFjUF10wjaKe7bqt6LUbifMTR7VRRc276k0l9lpX7K7BlCBuP+3xna1?= =?us-ascii?Q?NSUqPgZlJgqrCn2nHCrcsaQNergfKeWowlkxM0ht3Oal8EpbTp8h7S48zri+?= =?us-ascii?Q?gpK2UeaEz3YiAHuewwdrLxYNUvoHAhOOxOcXwSYeUMes9WG6DlMDNfU9XtW7?= =?us-ascii?Q?6xCudVMRCeTm8qigP8woPNRQ3xL2XNV0pPO4Gxnqw/FBgTUKA69wMTnZKKZX?= =?us-ascii?Q?+cLNblTxYnk9Wu5z51JYB+PWgSWSbiEHrUlh8jmghi21s8jF5PQUUCwfP+9Q?= =?us-ascii?Q?T14AaxA6cDhsey8xXCtmjNV7QGNpwX+gd3nsRvC0FaVdNNzE88vn1B0WNlGQ?= =?us-ascii?Q?w5ljtCc5Mu5zlceHN/w5SMtlckqs3fYQWy9htaHKFGIHOR+QIPK24XlXjC/q?= =?us-ascii?Q?RWKkdBQdBkysCtSL+xXwsdj3NimCbzV40RMeQGho+6LvAKatD+Lfj1jP7n/e?= =?us-ascii?Q?potGN97cBOpcIISn8udiNCGHY7Z2BsnTsGQPTbmObT7apQGc0yg739NJtS5x?= =?us-ascii?Q?QrToXzifGNZZNgjwzWg4NJoCCtkpPYdgZAVIdRbnTDcKI5g+9o9cvnclZct+?= =?us-ascii?Q?hH2/MaB5cAc7dUXkj5kl3EjwFgF8OBfYFajNjLF5rg+IbtFYPik7nOXKRD8y?= =?us-ascii?Q?ZMj9boCLSt6p0spFmgZkCA/WOepnz9ykUyrov38wbwpZoJJkgZidcStISpI+?= =?us-ascii?Q?hZKBvD8UI4GoZhXlVq5q2H3lsmVrCL2EE8/3JcynDDulGJcbmrfsMSEXqpYi?= =?us-ascii?Q?o6kNTX9xPuaaG34FN25mzXA6IxlCX5+c95tvRBiYEw/MxH6HBKHPGQE33fwT?= =?us-ascii?Q?oB1ezKka/20hGj9vMN1Gq7x3ps5gul+2NA37tP8EpHXEI8MxENvvI1c67iT3?= =?us-ascii?Q?IyljBXE1tSL00PRB1Uzlfbn5FmZ4Btl30xtQ?= X-Forefront-PRVS: 03468CBA43 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(979002)(6009001)(39400400002)(39410400002)(39450400003)(39840400002)(7416002)(6486002)(21086003)(5660300001)(3846002)(6116002)(76176999)(36756003)(305945005)(50986999)(2906002)(50466002)(25786009)(478600001)(66066001)(42186005)(33646002)(50226002)(48376002)(2351001)(2361001)(6512007)(54906002)(53936002)(8666007)(6666003)(81166006)(6916009)(2950100002)(47776003)(6506006)(38730400002)(5003940100001)(110136004)(8676002)(86362001)(74482002)(7736002)(189998001)(4326008)(42262002)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0202MB2553;H:orc.lan;FPR:;SPF:None;MLV:ovrnspm;PTR:InfoNoRecords;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2553;23:nAxZRSMeXybPXY3+aFEw/wTht4VeA3Xhpz37Kye?= =?us-ascii?Q?zEcZ1UVbPZsHPUh64beI475eo63rG/O7avq86WSl1+Uz8hgqIUjTUhQ+ZR4O?= =?us-ascii?Q?xcIe5DYebGgy7V2LwtaH9uwJUqklfB3HqacvSuT91r0KodAymSroqSxKY1Lb?= =?us-ascii?Q?NKK6HTvjzAEwYidDvpzaelN1RF9KWeB3slDpI+FYF34MRbplVt1cfVjgJxKo?= =?us-ascii?Q?IoTELVBIs5RRruTZ+Ge0VMP0avtYgSR4B5cluFSuPIPfYg4tPRQMbTlwFETp?= =?us-ascii?Q?SPKipcrCOvE8CSbXQVYVTeuEnhRw9CueiPpb47LYQmk4lyOJZSZK847y+w4a?= =?us-ascii?Q?g52yB7yOYwtHPWvauTjjPWYTb9XGJg0i3Q85aSjS6xvcmgXN18nKBXQUHyLm?= =?us-ascii?Q?9ZCRA/C9uiz7eN1WhYUl76yzmAxZGthuSnI9kMWdaqNAae6FDt/fDVkklr0V?= =?us-ascii?Q?vBr3bz8dfMFXTuGlqzfV4b/8Awq8lZMl1SGoi4Fx8uViiVk01HmxBVrbZxSn?= =?us-ascii?Q?oEfvX5iCM3V3VZWetK8SaXF7ESSCGq0Gp2x2vOnXfkvPZo6MEY9rAKW4TlPH?= =?us-ascii?Q?A6t2UD/Jy0KumkeOvDZ2fWdYx3Fl1z2PD2Tb5P4adfGAkHhxso+NTixR/xcl?= =?us-ascii?Q?y66aQtyLnzM7h/ptpa0XCEL8PAoCvHHn4+ObzzV3tkPVxlFrjaGD9w90bfGj?= =?us-ascii?Q?cFkdEylWZpx+fECVLtKspf6Ykc4B9yXlztxjK5PdQwMnG2aCcjRIYda+eJtL?= =?us-ascii?Q?bE7pvxVn97fB42XAUZ9CW9yscbut1R6ta6TwYnj3ufjzd48vjizrPLu/loyo?= =?us-ascii?Q?1HbIu5dy7+HRwE9///O981JztabAFgIqw/wx7O2il3JHXj5ep6o66WL1PCvy?= =?us-ascii?Q?PQ6PBMUBMSn/Ljv14dEcSiAAVcc3WMLAbdVoXSpw8PQQ+M6FVU0Nz/If0nau?= =?us-ascii?Q?JvLO3iR4fpH6nIEezL1c78C2Y/q6QljlOU0q2FLBEzYqUHE0PLdaTBQeM936?= =?us-ascii?Q?5Lkd6HYF/FRg0ip3ctPu/e0yc567l0sU7Vs39V6Qsm1s4ZfYpycGscEZ32Yj?= =?us-ascii?Q?JxqNT787716HBNJGC3Y/t9zo/iUda5ylH0151F1jl8FyyANgcIAN6d64okWQ?= =?us-ascii?Q?dVDRipTGD8gH/P37p6VtMhiuRDmwDg5rjP+haUcGQ9gz7Pll9y9uv//xP+TN?= =?us-ascii?Q?dhRfhs7jKqh98qfRf66SxTTGMaEP+cOL6yj6MfDa2et/98LIbfUYVks6yjDu?= =?us-ascii?Q?7Sfr8PIYPAG/Sx2bsbms=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2553;6:d9KSlY41jFoJWl0tKg5q9RJM68reBl+iX3FC662U?= =?us-ascii?Q?0EalPo4nyKG1OoCpxFPcIiKGWvusJkZlUZpkhj1vAs1FvZ2ZtGnEaWUmZP6e?= =?us-ascii?Q?cIlslsAw4Dm6FkwVOxicsh5MhY/p+7SCoiHQoL6kq5F6hxk9C7q4y76ai36s?= =?us-ascii?Q?s8Lk+WJu169CXWkbflHe7JJmpZHFHSZHFwrK9RoJzHr9DiglERaL5tb1MY5Y?= =?us-ascii?Q?JWem2VzRYpH43F3+Q/44VkUkmhgNM/i+uzw1eUlmSY69EldGXb1NyksGN96B?= =?us-ascii?Q?R9GztO1vkyDpLjZikXhZhOO+Ng8vOBuPptCFgEgn0Ouu7BK2Ln2k2l+PiFMs?= =?us-ascii?Q?a39/8mSJo7OpY+uc/QK7kRKXLSbkOkZ3Qq2EYt0tfn7MUriXVvf6YOAW+gBl?= =?us-ascii?Q?oE9XdkdPwFSxFtZ0OJEJbJC3yfDZ0TJ1bPoB+xUMPjcGH3bwvRFsFCnozg/D?= =?us-ascii?Q?tLeUovDG9RdeGW2R5PZbUiqMd4heaCK6Z/bmHW5iqe1VzBUaF6wHTN5r3rK0?= =?us-ascii?Q?yofQbwH1aMxZ9NZ1dmDtgtSVHzY1ArRSf71tMRo9yJhkN0cOgnqlO4vJjfai?= =?us-ascii?Q?quDGuOciZxacSwKTpygu/T+9fE5mo9tpSbiKMYb329sUhzgQvuJJB3w3EkOF?= =?us-ascii?Q?96IEbCMDZrmbz2PX8yoLa4F3LHfojxYbDWJqiQj/NILQ8lQyj0rqwqBXklfo?= =?us-ascii?Q?JetEsdYaBg4oejZc1WWNW9/KRsmz9LG/2Fbr0TnVEe1LWsMwDBClGaY/80d1?= =?us-ascii?Q?E/bv+230XVhlW85mOrp7jeB+WSEhAheLI8UKIX2h9kjqI8P47522JrWHP1DQ?= =?us-ascii?Q?AcuLQerRSERxGduL1OF9+zDnLhOYYhNKoU8upMePgyKIsmWQNn0cNnVO4D+a?= =?us-ascii?Q?l4LEl6SJ/hgWwFAmL6fLOD0rLckUKAFHEGC9vzIkcaruEZ/VkvKn4D89B6o9?= =?us-ascii?Q?ZxSj5xCLkZD78JIGUwbtfn34jVcWPXK+j2HIjrAYaU4w38HBhnq8N67m+yPe?= =?us-ascii?Q?0Mw=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2553;5:0OwUh6Z0zKgNVUpgOOvbevAhKtc/c4Ts1CnyMnYcuRKoLj9ELeruvprwBSlB5DobscH90j2eZfjdQuz9jrIxCFD/N/KhSCiGzeJN8QxXjACH3XAdWXvUt6iBNA3a/bZef7e9N7mYWTL4PKeleHpXd8xh6wif8gn/rxoO/wl5QKhU3ZNOwC5eGVSuxiOgD/mHmDtWSHiIuUA6N6d/BxCZcyie1giNwRWoNnaIHpj1d7KQomewOfyktPByuDt7Zq7W65s5S64Wv805oS9BicjT24wSjxF/1gvSthaxAflXTWUgOdXVWTmTMBZUCOkQQ6RMpCJb33OXTI1kzgmi9X886BxeMWjxVDXZIGABDJ8Qii3cUdU5FlSE2E5fv5z8gN76RPxy1OR4aq6+7eYDIz3m29Kkco9RU5sa6m6cP/5fSMErY3BTUUK30NYKtlz7+Yd0iE0GgLLRNqej0dVH8THOQMdjxYlK7TVrLKLWLlKiE3l8nMmFwu+QXy5wGnddYCfR;24:83RqgYUVS7+82kNnesE3cgfw+hvwDQLA6emh9Cx+qH3++E3SvRGcjf7DjU2A2QbOTSBi6FTpaJqEBOO/ULZ+ZOLoGneMBJTy1/ppWknNziA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2553;7:5Y91z71UMP4YYJ9ndW8kcND4P462ObZctJbiTzC0WjPG4IeW/kXN2aNFkezTn5Lwe28ZM9e0iz+FK1z7g3cRyoYjUjMvkuQWFXEFKXjoyoRAH2cthsdmM08oiMADNTOoN09e/3bdAeP1lpRzKQ+EVvFHrc/pTgcyRY0wG9NG+t+FOfngSVc4pcusoOODPK4d6WMyATBkExboNEaEwYkaavC0QcxqEPWkNMyxuHMQWGLHxtKXZ6DMxsoRg7wKiCESgd5anzd1+oZ0U2jiV65kgQQQVWEGvseT3KJ9dpqYqY8H8Un6f7SNRZb4a3RkfztkqoXFmlOUq7AkwkNBy02H6+3Fim5q7Db03oODUOUo72x+wEHJWg5oNuTOdjydjhAwSnxlYlWAI5QyvjWIUSwW+ls5yVZW/6LIm3g/EN5c+uzI7H6VPxqNonTNcTKBh7nDT/Osers8opHwzJMXsX/fcF44sWkV2M/g9yv+5ickyjShu3z7LX9oegTuymtLUGca/wkgT2gRS8IvYE5W6domjDlv4H9Vo9AD58XPNdKow/RFXhTkTj6JfMnIflbxo0G2IPZP2HkOv7B1haObYwYLzgnL1+C9CAJC7Gmaq3QKGL1/nZEGJ2iW0U7hLn18hkVxoURAnmKusqPvKTzPfEbDxdNj/VGdwv9pbPVo73TzJdbPnZJzzbmjiGqo6QUZEw5LTpxgE5erlypDIvdN2dRmNaKtDCeUoEp29g+Sz9fEMGdblukfU01+KdYkRPVhMT9jA6uU0hjpGXyU6aUE+ZuoSmG1F/Kz5xujWECMPk9wOiM= X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2017 06:06:21.2166 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0202MB2553 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. 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 7da70b6..2570c7f 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 e7fd356..f3c48a2 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 7b6c849..8762efa 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 6a10215..e8e4ea1 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.1.4