From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752590AbdGDKhA (ORCPT ); Tue, 4 Jul 2017 06:37:00 -0400 Received: from mail-he1eur01on0125.outbound.protection.outlook.com ([104.47.0.125]:18689 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752512AbdGDKgs (ORCPT ); Tue, 4 Jul 2017 06:36:48 -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 , dri-devel@lists.freedesktop.org, Daniel Vetter , Jani Nikula , Sean Paul , Boris Brezillon Subject: [PATCH v3 08/16] drm: ast: remove dead code and pointless local lut storage Date: Tue, 4 Jul 2017 12:37:04 +0200 Message-Id: <1499164632-5582-9-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1499164632-5582-1-git-send-email-peda@axentia.se> References: <1499164632-5582-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: AM5PR0201CA0002.eurprd02.prod.outlook.com (2603:10a6:203:3d::12) To HE1PR0202MB2555.eurprd02.prod.outlook.com (2603:10a6:3:90::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa8c1c27-3e91-486a-7e34-08d4c2c886b8 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:HE1PR0202MB2555; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2555;3:NApXCd66QrLsq4LEovR0Tsxjql9GTTz///uBe0n/U03TegxNCPUBDDEtTVNFh9KUwEWKX6rTUtJHTG9/Dv0CzxGLJ3ytgIltVCvcHA1iwJTUuudC9RjXXWuruaWOUJXfJFOa2SRSXcHGfU9pJZnWLHZ4PbTKMZxBU/ONgsTW4mH5T0XppQ8XbcOdmAV1uIpPa9iuPcuXnsFkix3DNIpq/E8BKjbEpXa+2CeC3JFwLsQDtVlvnLIH+NE4qYDtsKRalF3QaRogI24M7JMsrDh6TxXARRvtZZcU86+TN/itZt+W05FqVJC2cIv8eZt+i82V9vbmWSI7qmvdFCJrEgu4oVS9FLDoJOkComPHo0H7989f/a5+uHKIk3mJuh0ZC91ikWiM3kofGycIBRMPKGbkVWoSXgola8y1sWCAkHBxRXwyqp5bZ3U+GlGx5VM9F+1xV7QsztoRXf20oLTd54iDb9nvVE7RD3K20IxLMsZ9fG1bkKOMd7x3+iptsq/cn+e0ST2ybSwrfjOvB9+dyEZfiz1xcPQV8eQHTRdGv6kufAnBijFhKPJ+ZzJHdCgM7BBbmlDE29ruGbBKbGsHscsmcBg14x0ERQYwYeEgG4aiwSVW+nmht8YEb0U50VbVUXSQm3JLJS9EJ/3bxd4HfGtpJRE4qu6WfPXR9qeQ0oP01qDKGpTRE6pCaIVY5QWkXk4Fk7O89mBJKKCNWB+k7Ehdsg== X-MS-TrafficTypeDiagnostic: HE1PR0202MB2555: X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2555;25:bpnChvbxXE+3TBwNnIKTxglHa0RvSHSrLQaNPSjwH6SGGyEy575MJ1CHCmMDCn45S1wf6FvefjHNpfTNZ1V/+qyOg8O1+Wdi694aMrRqk8o7KyLxM9gqY9xXg4BOzgsSKeYW9UCcxWRaPJbWiF4m0sEMFaIjxzlor9yE7Ga7ByJ6o7RuhIRNa5RdNaSm6wEcwQfFvADf256HmvWBCpUif55J2HAN7eXhVt43CfBNQrc6G8/u4v0VxLwDc9W5PpBFEFfLwmK6zUIr65YqrLFC6VUH56zi62uNZjFKUfdu6DDS94WlNCVTf1+JVqA57MkD2j7WGw+mWpGGkZ0TCFsF7hHGX8auBfRG129iJug2KsWK4pteVCbEIBz7jqWKX0sLLShaA7FK2jOcm1tidDyNVLo8rq6JfFYOI4NeOexzTK4ImOvQtPbTcFt+lIlTnp2AIuKR6KPtmu+sT31BMbrctUVN2t5YmUt0kIjIPXvb+vwMmjOj63eIGtacHSA0OGSPIjAZgNP7ifXSReUd6JfxruBklgGC8k2ipvmJx4JuELSiDtad7dWHucoMJSC6fugh+m8xQ9YjScrXDwPDHNOyujke3D+byvLsMiYXd2QP4cqlRSU/ZkNtJPdK5vb3rtYgx6hdP6KchBNyUvwPeC+5iNge9Bkmb8EK8qAREFvHjynJNWjwrbFiRxONbnL8Ieyy827BRYFZ2FKrpXUT0+x2S3vmTgqnIMFrER+a7VIUSn4Py4iq0pjvbNdJTPjpq61KymqBjFNIVJc3LcSOblrWeF/uuYldw+wtWqdoKfAuEE1ME3Qz1Ezf877RMuj5+r1h6d/t7OE054ddTGAX2KgSEed4YAAZ/z3njMbihCAWJQbGWaDUVzS0VAVuXlL1gG7Fjwe7kcKVIJZCtX6s18vsDxw/NEkWtv4TF1adNcNFWew= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2555;31:Cpdpin9mwxAvhACsF6ie7eF74AF5pKk96XddZTEyi4chKi8epysGGAvcOcgI+M8gbBHKazoW23/6pY7yabX1W0bqGf3Wyyvyxho/SZAEOgAU0N8xhfL8/EtZyWukYyx8CGR7o42FOncHdmz6KSUlGJtenWZsTYAmiAnaWuvvRFdhSb9yJpH9AHdDGr6Zf1JZc7Ax3c8AgUO5+1UXfzoRm2OYyLZEpxXOV8SmleRgz3DfV/udtTJY12QsWELLdB1TbjP9tXYIRYESmdhhQ9hp5o8MKPgSLfsfNZEmQjY5jD36C+b1NgAYe25nbMwZfzamMsdqQsbl/eaBAesXW/2G3kmc8hM+IjwiVSBOvpAy8JVcJyOJHRYcohISk8CVUXlobQNtTbV0iQv1KhAkb5WmvZDmFwZds5gUj4GBW9vojmd68xidizyfvCmdl0S3ica+owk7fXnW/s+2naBChOCQHvhbsR3qF0BnH8H7XydV39uMhw5T1BFYPbWR0xVUA3SpvJltRZxxlwV4nNFL2vOaEeLwdphdIyDDczXkLOKlqu7Rhop9MGxVNjOAL+fi5fE3sqZEX4gzfo5qot11NMj6ReNPeGjctXPJJzoQedocCTZD/lN9kFJqdGASRIwq/K6EYAHR09F2EJ4q9/i/o56lpuomVIFay+Sthsa3n56GZN8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(6041248)(2016111802025)(20161123558100)(20161123562025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6043046)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:HE1PR0202MB2555;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:HE1PR0202MB2555; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2555;4:Jf/r1IFY1bgi72u2G4CJnkekuSRP1JDrSXKL7n+B?= =?us-ascii?Q?Ou5LVf2Tpw+GL7ym04aa1Rc2TrXsljHoOw4jbxmO3O50ltrA4zS1uhkXhd/8?= =?us-ascii?Q?x47oiP28ebDeR/zhzL3WZm6C6fOFpMU881CW58HMeo0iAkICIiKRvi2icpKY?= =?us-ascii?Q?TwgCdAvgKwRbuZkyz8Tb/men6dGfpOXRg9ACVPEeDVcJIf0QvPBP1L0xDjea?= =?us-ascii?Q?qLIqqMFcPWtxMIwSGkrsxbI1aPCEfSGIZfRzqs2MyTPiq27hYhwrX1VLZsbf?= =?us-ascii?Q?jevkUtGsnE1PGwr2AZ3Y8H/cvkgZxCrInEeBuMhS33ey7+AB9XelFWgbAzM3?= =?us-ascii?Q?DUvvP2IMHiU8ZYCH87xBlIUETwIH4NEkL2vzmYh6Qc2liQPb8iPldefhADYK?= =?us-ascii?Q?vL0/ED0v0Yen3gOindyLTftmqMi87vODAGFFWEmD6fsc5Qm4/SCDu1kjWoh3?= =?us-ascii?Q?D3T/YQ1ZZnILW13LkadrGaH8XVQF9WGMqrYrRMyizrA6+hoAAca2MBqzEVnF?= =?us-ascii?Q?6kypgasOFI5S+/ABkGSJgmsUJy2Ry/Tw66OfQoRzHgwsiIMnH8FclBP3ghBD?= =?us-ascii?Q?nZ3YgtliSKDNg8S++AqyXeJA32oNRVSt3a3IObnhjx/wrlQlnqaNaOIcesIj?= =?us-ascii?Q?XguLQ9gzNb3Yyeg3fvDX5Ya/XV/rEo0UKoz2lDBwEvPWS0RTYpURa/DX63Ib?= =?us-ascii?Q?GlYc6qkgla3gekVvyz0GSiSicOKn4xLSGvV6BuDAeik9IS1M5e+VbwnG7DpT?= =?us-ascii?Q?qq5OFUE3UdiEV0xV6CDbPaJ3r/a0fCLQ+PMAv7YrkyjzmhqQVptd9WW8WWxs?= =?us-ascii?Q?+SFBSf52oEQYNvAU9Xr1yR33Eeg05KKeRxFnsr/uKRjZham2u7LIvVfxcR87?= =?us-ascii?Q?abA5uYgd3bybkFmcxH+IF1MexdIWLHI02avlPZEQNecIQUPg2hZW+JEDuO7F?= =?us-ascii?Q?3FBO24gAFkP5199jDNityg83bd65yzgCW98BvEYhYzEsGwjrRU9/oHhlTxTM?= =?us-ascii?Q?0/J09mmHl3YDCtY5ia2w8xunt9ig2ziXS+eJT0vAhjGE5Bn28GVcI44wQvq4?= =?us-ascii?Q?iLijb9dE+QaS2R2Ubuah7h7YUw/fPTy/Uf02GPXsuoRNSv5B2UmLDm0/BENq?= =?us-ascii?Q?XJeUuwxw45vdjAGV9293B00kuCL4QQHy1aW7LveMok8sFAxcbgM8Ljh+/O+X?= =?us-ascii?Q?u0O7NGiw5tb1VwqF99GuW2cLMIsIa9LZ2KrPnuPrbzEH+tQj0qxSkQV6TL2l?= =?us-ascii?Q?VjHwWmP1U1RSmUanCbU=3D?= X-Forefront-PRVS: 0358535363 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39450400003)(8676002)(81166006)(7736002)(47776003)(189998001)(3846002)(36756003)(305945005)(50466002)(6116002)(50226002)(53936002)(86362001)(575784001)(33646002)(66066001)(2906002)(478600001)(42186005)(2361001)(74482002)(2351001)(38730400002)(110136004)(4326008)(25786009)(6506006)(6512007)(54906002)(5003940100001)(6486002)(6916009)(5660300001)(6666003)(2950100002)(50986999)(76176999)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0202MB2555;H:orc.lan;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2555;23:B+hvrCLw2jnVHKKQDgoZIuo2bp2LHArAgbTCaHl?= =?us-ascii?Q?8Vl6x/s7iqxmiikvf642Ix1cUEStSSXt/nOqI3EK+uEpL/hD6sKU4h5iQEP0?= =?us-ascii?Q?g3xNw7/2pKEXG3ruXE7iFYCzTzEzh27xfJ36yuVW1j6WmgEZNeU8mi2t97GM?= =?us-ascii?Q?e0EwtMU3BATlbg30JFOkRvr6votndwUWWRQm9LfdHM7HomJ+mdn66oH8dk/Q?= =?us-ascii?Q?7Y02xE8c7Zs3vnCa9QqIyehhcUgxGMA3qbsdeIgtmsUlWzhcALGUQRxfbf+d?= =?us-ascii?Q?vxvDSC1ICXH3atDyN9H33k9Ku3hulDe7ryX2hQw4p+I0D4UBCTJf9st0Qh4k?= =?us-ascii?Q?Uf7gX0q4XET/Edc5qpw2zGZ6/R28xZCbyz+4erkL7drr/nmAz/1nKTuptK4U?= =?us-ascii?Q?THc86IXeFzmgb3SN6r9m+pTKj0+mK1FxHwgh9BPWmh2RkxeZaKiheYXlkKL7?= =?us-ascii?Q?caFgt+W2Olm0ANmcPuSmlP4JqVaetMSPfHipeusPRO2C7mge011uRQeiCLPa?= =?us-ascii?Q?lkAi41ov0TA8oTnW3PEv7tkmEq2CNONIB9phvUqrw4TbjCCIHTvHQd4TgTZi?= =?us-ascii?Q?lJk7C8PwCy9cNKcSL+Au3vPU/jNn6o3aNJKUsHZT68YMEEQTsVj4UvU2YTUE?= =?us-ascii?Q?l8DYH3TjU0sEhI07QWvWlCnS4BlSyO5irItCIJuDEHUG6zS+P7xaGSyZhofH?= =?us-ascii?Q?D7/diKBzHLkldHPtA7rIAvmARSAV6yxhRQ16TNNhRxXiBvjh0Qoli4CtDpYF?= =?us-ascii?Q?7QoU4IgUhH1NmCdMoKKYHW5WhFB+5FqBtlC//KQg2DBIHxvLBrgUhebsxB2y?= =?us-ascii?Q?00YNrhTHHd74Jb1VGol7lQdzPhWSgl0KxhpUl6WKnOdLYLyaypbHk1ayP2M4?= =?us-ascii?Q?CMWm2LZRHNpbWjg9AeeR4oHEK543Z94IDUEeYL4pcXq69WINgO9/5taRGgE3?= =?us-ascii?Q?/RSxHuPh71ljsCU5POqcUUz9OM1UwGrjOK8PKRQ3iU/4MHNM/fHt00ZkOLjq?= =?us-ascii?Q?AW1181Wm3tP6jJEevPEN/Jv1STdye7gDaejyGYbgQbH9pGHeohjKeFoQESke?= =?us-ascii?Q?SBWXUmBMGEVK8uwOgwZFlF1tudAaltTStW/knUg+ABCsEOf0a2Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0202MB2555;6:trVgerO9LkXcQtkWdN0aGJ/8TNJZ0rc9gMlv1qOc?= =?us-ascii?Q?cJfpiKQtDb/P7ts+BfbpvArPrr030xlz8imHt7+U6j6SdZwXy935IqoDqrpO?= =?us-ascii?Q?rYTMunYgy+eKB/MSeWlJbhDzFF95DTP2VKu5ZkylDMI0POqSsvskbOObHQvv?= =?us-ascii?Q?o8qqWzwgFYziIljQ7aZv/gMalCY7nRUROKwK4nWm1jKESd8Km03ZfZT9zUPO?= =?us-ascii?Q?lj7LBrg0BZ+2ZkSzZeFNDPUAVHYJdUjPA/iT1gkjmHyYh7tF0SM60osj7cLv?= =?us-ascii?Q?cxWKU79rvKuiOfIOddDgEQb2bB9KhXLDl3mibOUR20B+klzjHGQAQkyqQ2p7?= =?us-ascii?Q?i4zZl8/fz2h3E7bdXtd4XYUI4jx4+aEKSiYhvXSL9wruRoLy03z8cxf9Ji5q?= =?us-ascii?Q?IAnLt7fY3I+Bggotvldw8G9S3Cpm95d9rAi6GPnyMpzDFZwMDVreedDDX2P2?= =?us-ascii?Q?9OEPLENMGBuHYO7ahgbdOqCA/UBjm+E6coT6gdKaiqCwG9vLp0zIdBiYSY9k?= =?us-ascii?Q?2PrwI1fX41EfyvcH57G946g4txNqTbMtGNlg2kPue1v1x5VIMd2eUNZlKgIs?= =?us-ascii?Q?ngtCKva5bQqpXKpHC6YJ4PB0IWI5MPg+uncjIcDlaIMMSj25AWgNGDy9Do16?= =?us-ascii?Q?bP8qwFBiZrnvmgcVN4+py9YpyEs0Ag+jioPeMcDexE6xC1wcbpCR8KSkxIFR?= =?us-ascii?Q?1gi4xOq2f3VlDDGX+00f2dmrzDpObMtgQ9LxXrBw0eBVWsFqDOVo74WfKy/W?= =?us-ascii?Q?AamUM4rPXdyJZOtW9SfBs74LFmaTXE3OWEzl/DUyLhDTARZYWSHlGap9D20E?= =?us-ascii?Q?Xopz8XgowRSdNXvemKxoGAZYbcbPiXG38zid2o3DtsdHZil3suqZHTIbYYyG?= =?us-ascii?Q?x90656mMMQbTY8A9g2eX76iurFgJp4YI3Dddgx6Hl9mr5PFxqyMoOg8QI+4H?= =?us-ascii?Q?gVxt/Xpgrr8/DsyTIm2PKjdX9mJR2/EXwruFeyC8ccX2ycqV6uqP7QiXelL2?= =?us-ascii?Q?gqI=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2555;5:Fok6YKvOvboCrj4jmartfdL/T/cK40znhKI2FRH7BeaCvEeQKePXuyHk1tn8x4R9Vu/Qk/mZO5bPT+AwP1H5+U5jZQq6hAImO1CdvdEpVhTsozO3YLrOp6kGzjH2skHGewZ1tO2jujfRIgyXQKtVAiidwXYTZBfKYT33VponeUxVHGEfvt2Bi4/lcnRF6rV9MF301+DaLgDN+r/+XG3pGucbXBYX9HzGkLUCBpwFQKU6bk55gvcehVKG6elQa81iIQaSkMNm6QOuWOAplctTr9pQwz/toqzlYc9tjwScDLasq2oxcC/0dxMBgz/RbeiSOkAVGupclvpioClUscB8q18ObTeWhJGFgoaASlmpjwAbseLVwQ5Ej3KdPCGvfsdpL059BznMSE1+r5aCFT9ZtjSeEBDNQp4ErgoalIJ8zkIho4BoaCdo58jPCEKxErithVUlACrgWUBRiHQX76fh6hwMq4o86dGb6RURfF8AX5MK3MtS3mEnfJDFUaOQCUvF;24:hpX6n2QIPYVx62iBgd90L2eX/CkP8z707Vqjtpz2RHTP034Mi5H8ismuwwGIKfMUR2h+QKmb2vxLy+sWO3xzxrVVCq3Unbyb10LqMCkc5Bg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;HE1PR0202MB2555;7:iNxD/asImL7THpLgf4RFC6/WyVLGaXoB8RTfCdZo4KEjQF7vap7gN1Ex4WCPBjslZEJwEwmTphIgFnzj0CIrM5Q6K53wml79qZbHVEg/STKHL5ZdXGYS2rlmv17yQQ0FrPd8hYRPWehr570Pcu/YtZFuq0T5rDKF0sIu0jT0Vb6ym5BX+erHJewOZ8LfR0SMKp9Z5v6J56alO4J9oIwJ8SlTwiS18KkSDGTXJLgZ/GlGlSu7FiwatlolKNGtXacKkXNd8Vxv5Oy4Bkl7tyW36WLGhuPaJwIJ7ST3eLQTI0b4Q/TW5hx+n/ocX4UBEsibvXIWhKxpBHnYAsvialOElS8BFqKkcEvDpmHwrkSIMoJolvcC2TP7unbXaspmSEqQbSosJ71ORp2m1JNVXFVxIQgqLuVB4r4tolbyEOg7EVgOLuIWeNS5dX6pSJ9i9NZLqYRx1rJebHYIiSFcMNvwZFMNE8Wutqu9hst8wHfrxpMoKCe8Q92oERO4RuoA3kueEj4DxZqjGVW6unLI2Az+gWJtlhfldMys0m3V7G3YjqtmO+gnkT7ZDNUGKizhTo4RfFtEQ5D/10xtv3jjPpbSASL3DfuIEyBKyQYmPTGgBMAnNbUfZoTstf30u80CDTZy/8TYmP77YR7m54Bj5iLi0A0DyKTICRZk2uADLhxnPTDM04juOyxoSBwNzZb6nBZIc/XAl2Q2oBDyci9Pqmh25ApA8yOeJd1FL2k3dE+lT5uo07UHwv6R7UCceFWdnYfYjKFWCeVKYS/qNekuzZuG3cbVN42yhZn1uh3NZrrBjbU= X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 10:36:26.4786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0202MB2555 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. 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 8880f0b..569a148 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 4ad4acd..dbabcac 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 6f0335b..e686072 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_crtc_state *state) { - 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.1.4