hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/gpu/drm/omapdrm/omap_drv.h
....@@ -1,18 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
34 * Author: Rob Clark <rob@ti.com>
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of the GNU General Public License version 2 as published by
7
- * the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12
- * more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along with
15
- * this program. If not, see <http://www.gnu.org/licenses/>.
165 */
176
187 #ifndef __OMAPDRM_DRV_H__
....@@ -22,12 +11,10 @@
2211 #include <linux/types.h>
2312 #include <linux/workqueue.h>
2413
25
-#include <drm/drmP.h>
26
-#include <drm/drm_crtc_helper.h>
14
+#include "dss/omapdss.h"
15
+
2716 #include <drm/drm_gem.h>
2817 #include <drm/omap_drm.h>
29
-
30
-#include "dss/omapdss.h"
3118
3219 #include "omap_connector.h"
3320 #include "omap_crtc.h"
....@@ -38,12 +25,20 @@
3825 #include "omap_irq.h"
3926 #include "omap_plane.h"
4027
41
-#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
42
-#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */
28
+#define DBG(fmt, ...) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)
29
+#define VERB(fmt, ...) if (0) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) /* verbose debug */
4330
4431 #define MODULE_NAME "omapdrm"
4532
4633 struct omap_drm_usergart;
34
+
35
+struct omap_drm_pipeline {
36
+ struct drm_crtc *crtc;
37
+ struct drm_encoder *encoder;
38
+ struct drm_connector *connector;
39
+ struct omap_dss_device *output;
40
+ unsigned int alias_id;
41
+};
4742
4843 struct omap_drm_private {
4944 struct drm_device *ddev;
....@@ -54,17 +49,12 @@
5449 struct dispc_device *dispc;
5550 const struct dispc_ops *dispc_ops;
5651
57
- unsigned int num_crtcs;
58
- struct drm_crtc *crtcs[8];
52
+ unsigned int num_pipes;
53
+ struct omap_drm_pipeline pipes[8];
54
+ struct omap_drm_pipeline *channels[8];
5955
6056 unsigned int num_planes;
6157 struct drm_plane *planes[8];
62
-
63
- unsigned int num_encoders;
64
- struct drm_encoder *encoders[8];
65
-
66
- unsigned int num_connectors;
67
- struct drm_connector *connectors[8];
6858
6959 struct drm_fb_helper *fbdev;
7060
....@@ -92,6 +82,6 @@
9282 };
9383
9484
95
-int omap_debugfs_init(struct drm_minor *minor);
85
+void omap_debugfs_init(struct drm_minor *minor);
9686
9787 #endif /* __OMAPDRM_DRV_H__ */