modify sin led gpio

hc

2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e

 kernel/drivers/gpu/drm/armada/armada_fbdev.c
..
..
@@ -1,22 +1,22 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2012 Russell King
3
4
  *  Written from the i915 driver.
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License version 2 as
7
- * published by the Free Software Foundation.
8
5
  */
6
+
9
7
 #include <linux/errno.h>
10
8
 #include <linux/kernel.h>
11
9
 #include <linux/module.h>
12
10
 
13
11
 #include <drm/drm_fb_helper.h>
12
+#include <drm/drm_fourcc.h>
13
+
14
14
 #include "armada_crtc.h"
15
15
 #include "armada_drm.h"
16
16
 #include "armada_fb.h"
17
17
 #include "armada_gem.h"
18
18
 
19
-static /*const*/ struct fb_ops armada_fb_ops = {
19
+static const struct fb_ops armada_fb_ops = {
20
20
 	.owner		= THIS_MODULE,
21
21
 	DRM_FB_HELPER_DEFAULT_OPS,
22
22
 	.fb_fillrect	= drm_fb_helper_cfb_fillrect,
..
..
@@ -51,13 +51,13 @@
51
51
 
52
52
 	ret = armada_gem_linear_back(dev, obj);
53
53
 	if (ret) {
54
-		drm_gem_object_put_unlocked(&obj->obj);
54
+		drm_gem_object_put(&obj->obj);
55
55
 		return ret;
56
56
 	}
57
57
 
58
58
 	ptr = armada_gem_map_object(dev, obj);
59
59
 	if (!ptr) {
60
-		drm_gem_object_put_unlocked(&obj->obj);
60
+		drm_gem_object_put(&obj->obj);
61
61
 		return -ENOMEM;
62
62
 	}
63
63
 
..
..
@@ -67,7 +67,7 @@
67
67
 	 * A reference is now held by the framebuffer object if
68
68
 	 * successful, otherwise this drops the ref for the error path.
69
69
 	 */
70
-	drm_gem_object_put_unlocked(&obj->obj);
70
+	drm_gem_object_put(&obj->obj);
71
71
 
72
72
 	if (IS_ERR(dfb))
73
73
 		return PTR_ERR(dfb);
..
..
@@ -78,8 +78,6 @@
78
78
 		goto err_fballoc;
79
79
 	}
80
80
 
81
-	strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id));
82
-	info->par = fbh;
83
81
 	info->fbops = &armada_fb_ops;
84
82
 	info->fix.smem_start = obj->phys_addr;
85
83
 	info->fix.smem_len = obj->obj.size;
..
..
@@ -87,9 +85,7 @@
87
85
 	info->screen_base = ptr;
88
86
 	fbh->fb = &dfb->fb;
89
87
 
90
-	drm_fb_helper_fill_fix(info, dfb->fb.pitches[0],
91
-			       dfb->fb.format->depth);
92
-	drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height);
88
+	drm_fb_helper_fill_info(info, fbh, sizes);
93
89
 
94
90
 	DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n",
95
91
 		dfb->fb.width, dfb->fb.height, dfb->fb.format->cpp[0] * 8,
..
..
@@ -121,7 +117,7 @@
121
117
 
122
118
 int armada_fbdev_init(struct drm_device *dev)
123
119
 {
124
-	struct armada_private *priv = dev->dev_private;
120
+	struct armada_private *priv = drm_to_armada_dev(dev);
125
121
 	struct drm_fb_helper *fbh;
126
122
 	int ret;
127
123
 
..
..
@@ -133,16 +129,10 @@
133
129
 
134
130
 	drm_fb_helper_prepare(dev, fbh, &armada_fb_helper_funcs);
135
131
 
136
-	ret = drm_fb_helper_init(dev, fbh, 1);
132
+	ret = drm_fb_helper_init(dev, fbh);
137
133
 	if (ret) {
138
134
 		DRM_ERROR("failed to initialize drm fb helper\n");
139
135
 		goto err_fb_helper;
140
-	}
141
-
142
-	ret = drm_fb_helper_single_add_all_connectors(fbh);
143
-	if (ret) {
144
-		DRM_ERROR("failed to add fb connectors\n");
145
-		goto err_fb_setup;
146
136
 	}
147
137
 
148
138
 	ret = drm_fb_helper_initial_config(fbh, 32);
..
..
@@ -161,7 +151,7 @@
161
151
 
162
152
 void armada_fbdev_fini(struct drm_device *dev)
163
153
 {
164
-	struct armada_private *priv = dev->dev_private;
154
+	struct armada_private *priv = drm_to_armada_dev(dev);
165
155
 	struct drm_fb_helper *fbh = priv->fbdev;
166
156
 
167
157
 	if (fbh) {