kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/omapdrm/dss/dss.h
..
..
@@ -1,21 +1,10 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Copyright (C) 2009 Nokia Corporation
3
4
  * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
4
5
  *
5
6
  * Some code and ideas taken from drivers/video/omap/ driver
6
7
  * by Imre Deak.
7
- *
8
- * This program is free software; you can redistribute it and/or modify it
9
- * under the terms of the GNU General Public License version 2 as published by
10
- * the Free Software Foundation.
11
- *
12
- * This program is distributed in the hope that it will be useful, but WITHOUT
13
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
15
- * more details.
16
- *
17
- * You should have received a copy of the GNU General Public License along with
18
- * this program.  If not, see <http://www.gnu.org/licenses/>.
19
8
  */
20
9
 
21
10
 #ifndef __OMAP2_DSS_H
..
..
@@ -238,6 +227,8 @@
238
227
 	struct regmap	*syscon_pll_ctrl;
239
228
 	u32		syscon_pll_ctrl_offset;
240
229
 
230
+	struct platform_device *drm_pdev;
231
+
241
232
 	struct clk	*parent_clk;
242
233
 	struct clk	*dss_clk;
243
234
 	unsigned long	dss_clk_rate;
..
..
@@ -267,6 +258,8 @@
267
258
 
268
259
 	struct dispc_device *dispc;
269
260
 	const struct dispc_ops *dispc_ops;
261
+	const struct dss_mgr_ops *mgr_ops;
262
+	struct omap_drm_private *mgr_ops_priv;
270
263
 };
271
264
 
272
265
 /* core */
..
..
@@ -313,8 +306,6 @@
313
306
 
314
307
 unsigned long dss_get_dispc_clk_rate(struct dss_device *dss);
315
308
 unsigned long dss_get_max_fck_rate(struct dss_device *dss);
316
-enum omap_dss_output_id dss_get_supported_outputs(struct dss_device *dss,
317
-						  enum omap_channel channel);
318
309
 int dss_dpi_select_source(struct dss_device *dss, int port,
319
310
 			  enum omap_channel channel);
320
311
 void dss_select_hdmi_venc_clk_source(struct dss_device *dss,
..
..
@@ -374,8 +365,6 @@
374
365
 
375
366
 #ifdef CONFIG_OMAP2_DSS_DSI
376
367
 
377
-void dsi_dump_clocks(struct seq_file *s);
378
-
379
368
 void dsi_irq_handler(void);
380
369
 
381
370
 #endif
..
..
@@ -417,9 +406,6 @@
417
406
 		    unsigned long pck_min, unsigned long pck_max,
418
407
 		    dispc_div_calc_func func, void *data);
419
408
 
420
-bool dispc_mgr_timings_ok(struct dispc_device *dispc,
421
-			  enum omap_channel channel,
422
-			  const struct videomode *vm);
423
409
 int dispc_calc_clock_rates(struct dispc_device *dispc,
424
410
 			   unsigned long dispc_fclk_rate,
425
411
 			   struct dispc_clock_info *cinfo);