kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/tve200/tve200_drv.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
3
4
  * Parts of this file were based on sources as follows:
..
..
@@ -7,11 +8,6 @@
7
8
  * Copyright (C) 2007 Dave Airlie <airlied@linux.ie>
8
9
  * Copyright (C) 2011 Texas Instruments
9
10
  * Copyright (C) 2017 Eric Anholt
10
- *
11
- * This program is free software and is provided to you under the terms of the
12
- * GNU General Public License version 2 as published by the Free Software
13
- * Foundation, and any use by you of this program is subject to the terms of
14
- * such GNU licence.
15
11
  */
16
12
 
17
13
 /**
..
..
@@ -41,16 +37,17 @@
41
37
 #include <linux/slab.h>
42
38
 #include <linux/version.h>
43
39
 
44
-#include <drm/drmP.h>
45
40
 #include <drm/drm_atomic_helper.h>
46
-#include <drm/drm_crtc_helper.h>
41
+#include <drm/drm_bridge.h>
42
+#include <drm/drm_drv.h>
43
+#include <drm/drm_fb_cma_helper.h>
44
+#include <drm/drm_fb_helper.h>
47
45
 #include <drm/drm_gem_cma_helper.h>
48
46
 #include <drm/drm_gem_framebuffer_helper.h>
49
-#include <drm/drm_fb_helper.h>
50
-#include <drm/drm_fb_cma_helper.h>
51
-#include <drm/drm_panel.h>
52
47
 #include <drm/drm_of.h>
53
-#include <drm/drm_bridge.h>
48
+#include <drm/drm_panel.h>
49
+#include <drm/drm_probe_helper.h>
50
+#include <drm/drm_vblank.h>
54
51
 
55
52
 #include "tve200_drm.h"
56
53
 
..
..
@@ -83,8 +80,8 @@
83
80
 	if (ret && ret != -ENODEV)
84
81
 		return ret;
85
82
 	if (panel) {
86
-		bridge = drm_panel_bridge_add(panel,
87
-					      DRM_MODE_CONNECTOR_Unknown);
83
+		bridge = drm_panel_bridge_add_typed(panel,
84
+						    DRM_MODE_CONNECTOR_Unknown);
88
85
 		if (IS_ERR(bridge)) {
89
86
 			ret = PTR_ERR(bridge);
90
87
 			goto out_bridge;
..
..
@@ -113,7 +110,7 @@
113
110
 	}
114
111
 
115
112
 	priv->panel = panel;
116
-	priv->connector = panel->connector;
113
+	priv->connector = drm_panel_bridge_connector(bridge);
117
114
 	priv->bridge = bridge;
118
115
 
119
116
 	dev_info(dev->dev, "attached to panel %s\n",
..
..
@@ -126,12 +123,6 @@
126
123
 	}
127
124
 
128
125
 	drm_mode_config_reset(dev);
129
-
130
-	/*
131
-	 * Passing in 16 here will make the RGB656 mode the default
132
-	 * Passing in 32 will use XRGB8888 mode
133
-	 */
134
-	drm_fb_cma_fbdev_init(dev, 16, 0);
135
126
 	drm_kms_helper_poll_init(dev);
136
127
 
137
128
 	goto finish;
..
..
@@ -147,9 +138,7 @@
147
138
 DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
148
139
 
149
140
 static struct drm_driver tve200_drm_driver = {
150
-	.driver_features =
151
-		DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
152
-	.lastclose = drm_fb_helper_lastclose,
141
+	.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
153
142
 	.ioctls = NULL,
154
143
 	.fops = &drm_fops,
155
144
 	.name = "tve200",
..
..
@@ -158,19 +147,7 @@
158
147
 	.major = 1,
159
148
 	.minor = 0,
160
149
 	.patchlevel = 0,
161
-	.dumb_create = drm_gem_cma_dumb_create,
162
-	.gem_free_object_unlocked = drm_gem_cma_free_object,
163
-	.gem_vm_ops = &drm_gem_cma_vm_ops,
164
-
165
-	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
166
-	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
167
-	.gem_prime_import = drm_gem_prime_import,
168
-	.gem_prime_export = drm_gem_prime_export,
169
-	.gem_prime_get_sg_table	= drm_gem_cma_prime_get_sg_table,
170
-	.gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
171
-	.gem_prime_vmap = drm_gem_cma_prime_vmap,
172
-	.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
173
-	.gem_prime_mmap = drm_gem_cma_prime_mmap,
150
+	DRM_GEM_CMA_DRIVER_OPS,
174
151
 };
175
152
 
176
153
 static int tve200_probe(struct platform_device *pdev)
..
..
@@ -245,12 +222,18 @@
245
222
 	if (ret < 0)
246
223
 		goto clk_disable;
247
224
 
225
+	/*
226
+	 * Passing in 16 here will make the RGB565 mode the default
227
+	 * Passing in 32 will use XRGB8888 mode
228
+	 */
229
+	drm_fbdev_generic_setup(drm, 16);
230
+
248
231
 	return 0;
249
232
 
250
233
 clk_disable:
251
234
 	clk_disable_unprepare(priv->pclk);
252
235
 dev_unref:
253
-	drm_dev_unref(drm);
236
+	drm_dev_put(drm);
254
237
 	return ret;
255
238
 }
256
239
 
..
..
@@ -260,12 +243,11 @@
260
243
 	struct tve200_drm_dev_private *priv = drm->dev_private;
261
244
 
262
245
 	drm_dev_unregister(drm);
263
-	drm_fb_cma_fbdev_fini(drm);
264
246
 	if (priv->panel)
265
247
 		drm_panel_bridge_remove(priv->bridge);
266
248
 	drm_mode_config_cleanup(drm);
267
249
 	clk_disable_unprepare(priv->pclk);
268
-	drm_dev_unref(drm);
250
+	drm_dev_put(drm);
269
251
 
270
252
 	return 0;
271
253
 }