forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
....@@ -1,20 +1,12 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Copyright (C) 2013 Red Hat
34  * Author: Rob Clark <robdclark@gmail.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 
7
+#include <linux/delay.h>
8
+
9
+#include <drm/drm_vblank.h>
1810 
1911 #include "msm_drv.h"
2012 #include "msm_gem.h"
....@@ -27,29 +19,11 @@
2719 {
2820 	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
2921 	struct drm_device *dev = mdp4_kms->dev;
30
-	uint32_t version, major, minor, dmap_cfg, vg_cfg;
22
+	u32 dmap_cfg, vg_cfg;
3123 	unsigned long clk;
3224 	int ret = 0;
3325 
3426 	pm_runtime_get_sync(dev->dev);
35
-
36
-	mdp4_enable(mdp4_kms);
37
-	version = mdp4_read(mdp4_kms, REG_MDP4_VERSION);
38
-	mdp4_disable(mdp4_kms);
39
-
40
-	major = FIELD(version, MDP4_VERSION_MAJOR);
41
-	minor = FIELD(version, MDP4_VERSION_MINOR);
42
-
43
-	DBG("found MDP4 version v%d.%d", major, minor);
44
-
45
-	if (major != 4) {
46
-		dev_err(dev->dev, "unexpected MDP version: v%d.%d\n",
47
-				major, minor);
48
-		ret = -ENXIO;
49
-		goto out;
50
-	}
51
-
52
-	mdp4_kms->rev = minor;
5327 
5428 	if (mdp4_kms->rev > 1) {
5529 		mdp4_write(mdp4_kms, REG_MDP4_CS_CONTROLLER0, 0x0707ffff);
....@@ -96,46 +70,43 @@
9670 	if (mdp4_kms->rev > 1)
9771 		mdp4_write(mdp4_kms, REG_MDP4_RESET_STATUS, 1);
9872 
99
-out:
10073 	pm_runtime_put_sync(dev->dev);
10174 
10275 	return ret;
10376 }
10477 
105
-static void mdp4_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state)
78
+static void mdp4_enable_commit(struct msm_kms *kms)
10679 {
10780 	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
108
-	int i;
109
-	struct drm_crtc *crtc;
110
-	struct drm_crtc_state *crtc_state;
111
-
11281 	mdp4_enable(mdp4_kms);
113
-
114
-	/* see 119ecb7fd */
115
-	for_each_new_crtc_in_state(state, crtc, crtc_state, i)
116
-		drm_crtc_vblank_get(crtc);
11782 }
11883 
119
-static void mdp4_complete_commit(struct msm_kms *kms, struct drm_atomic_state *state)
84
+static void mdp4_disable_commit(struct msm_kms *kms)
12085 {
12186 	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
122
-	int i;
123
-	struct drm_crtc *crtc;
124
-	struct drm_crtc_state *crtc_state;
125
-
126
-	drm_atomic_helper_wait_for_vblanks(mdp4_kms->dev, state);
127
-
128
-	/* see 119ecb7fd */
129
-	for_each_new_crtc_in_state(state, crtc, crtc_state, i)
130
-		drm_crtc_vblank_put(crtc);
131
-
13287 	mdp4_disable(mdp4_kms);
13388 }
13489 
135
-static void mdp4_wait_for_crtc_commit_done(struct msm_kms *kms,
136
-						struct drm_crtc *crtc)
90
+static void mdp4_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state)
13791 {
138
-	mdp4_crtc_wait_for_commit_done(crtc);
92
+}
93
+
94
+static void mdp4_flush_commit(struct msm_kms *kms, unsigned crtc_mask)
95
+{
96
+	/* TODO */
97
+}
98
+
99
+static void mdp4_wait_flush(struct msm_kms *kms, unsigned crtc_mask)
100
+{
101
+	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
102
+	struct drm_crtc *crtc;
103
+
104
+	for_each_crtc_mask(mdp4_kms->dev, crtc, crtc_mask)
105
+		mdp4_crtc_wait_for_commit_done(crtc);
106
+}
107
+
108
+static void mdp4_complete_commit(struct msm_kms *kms, unsigned crtc_mask)
109
+{
139110 }
140111 
141112 static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate,
....@@ -152,10 +123,6 @@
152123 	}
153124 }
154125 
155
-static const char * const iommu_ports[] = {
156
-	"mdp_port0_cb0", "mdp_port1_cb0",
157
-};
158
-
159126 static void mdp4_destroy(struct msm_kms *kms)
160127 {
161128 	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
....@@ -163,12 +130,11 @@
163130 	struct msm_gem_address_space *aspace = kms->aspace;
164131 
165132 	if (mdp4_kms->blank_cursor_iova)
166
-		msm_gem_put_iova(mdp4_kms->blank_cursor_bo, kms->aspace);
167
-	drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo);
133
+		msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->aspace);
134
+	drm_gem_object_put(mdp4_kms->blank_cursor_bo);
168135 
169136 	if (aspace) {
170
-		aspace->mmu->funcs->detach(aspace->mmu,
171
-				iommu_ports, ARRAY_SIZE(iommu_ports));
137
+		aspace->mmu->funcs->detach(aspace->mmu);
172138 		msm_gem_address_space_put(aspace);
173139 	}
174140 
....@@ -187,9 +153,12 @@
187153 		.irq             = mdp4_irq,
188154 		.enable_vblank   = mdp4_enable_vblank,
189155 		.disable_vblank  = mdp4_disable_vblank,
156
+		.enable_commit   = mdp4_enable_commit,
157
+		.disable_commit  = mdp4_disable_commit,
190158 		.prepare_commit  = mdp4_prepare_commit,
159
+		.flush_commit    = mdp4_flush_commit,
160
+		.wait_flush      = mdp4_wait_flush,
191161 		.complete_commit = mdp4_complete_commit,
192
-		.wait_for_crtc_commit_done = mdp4_wait_for_crtc_commit_done,
193162 		.get_format      = mdp_get_format,
194163 		.round_pixclk    = mdp4_round_pixclk,
195164 		.destroy         = mdp4_destroy,
....@@ -204,7 +173,8 @@
204173 	clk_disable_unprepare(mdp4_kms->clk);
205174 	if (mdp4_kms->pclk)
206175 		clk_disable_unprepare(mdp4_kms->pclk);
207
-	clk_disable_unprepare(mdp4_kms->lut_clk);
176
+	if (mdp4_kms->lut_clk)
177
+		clk_disable_unprepare(mdp4_kms->lut_clk);
208178 	if (mdp4_kms->axi_clk)
209179 		clk_disable_unprepare(mdp4_kms->axi_clk);
210180 
....@@ -218,7 +188,8 @@
218188 	clk_prepare_enable(mdp4_kms->clk);
219189 	if (mdp4_kms->pclk)
220190 		clk_prepare_enable(mdp4_kms->pclk);
221
-	clk_prepare_enable(mdp4_kms->lut_clk);
191
+	if (mdp4_kms->lut_clk)
192
+		clk_prepare_enable(mdp4_kms->lut_clk);
222193 	if (mdp4_kms->axi_clk)
223194 		clk_prepare_enable(mdp4_kms->axi_clk);
224195 
....@@ -249,7 +220,8 @@
249220 
250221 		encoder = mdp4_lcdc_encoder_init(dev, panel_node);
251222 		if (IS_ERR(encoder)) {
252
-			dev_err(dev->dev, "failed to construct LCDC encoder\n");
223
+			DRM_DEV_ERROR(dev->dev, "failed to construct LCDC encoder\n");
224
+			of_node_put(panel_node);
253225 			return PTR_ERR(encoder);
254226 		}
255227 
....@@ -258,7 +230,8 @@
258230 
259231 		connector = mdp4_lvds_connector_init(dev, panel_node, encoder);
260232 		if (IS_ERR(connector)) {
261
-			dev_err(dev->dev, "failed to initialize LVDS connector\n");
233
+			DRM_DEV_ERROR(dev->dev, "failed to initialize LVDS connector\n");
234
+			of_node_put(panel_node);
262235 			return PTR_ERR(connector);
263236 		}
264237 
....@@ -269,7 +242,7 @@
269242 	case DRM_MODE_ENCODER_TMDS:
270243 		encoder = mdp4_dtv_encoder_init(dev);
271244 		if (IS_ERR(encoder)) {
272
-			dev_err(dev->dev, "failed to construct DTV encoder\n");
245
+			DRM_DEV_ERROR(dev->dev, "failed to construct DTV encoder\n");
273246 			return PTR_ERR(encoder);
274247 		}
275248 
....@@ -280,7 +253,7 @@
280253 			/* Construct bridge/connector for HDMI: */
281254 			ret = msm_hdmi_modeset_init(priv->hdmi, dev, encoder);
282255 			if (ret) {
283
-				dev_err(dev->dev, "failed to initialize HDMI: %d\n", ret);
256
+				DRM_DEV_ERROR(dev->dev, "failed to initialize HDMI: %d\n", ret);
284257 				return ret;
285258 			}
286259 		}
....@@ -298,7 +271,7 @@
298271 		encoder = mdp4_dsi_encoder_init(dev);
299272 		if (IS_ERR(encoder)) {
300273 			ret = PTR_ERR(encoder);
301
-			dev_err(dev->dev,
274
+			DRM_DEV_ERROR(dev->dev,
302275 				"failed to construct DSI encoder: %d\n", ret);
303276 			return ret;
304277 		}
....@@ -309,14 +282,14 @@
309282 
310283 		ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder);
311284 		if (ret) {
312
-			dev_err(dev->dev, "failed to initialize DSI: %d\n",
285
+			DRM_DEV_ERROR(dev->dev, "failed to initialize DSI: %d\n",
313286 				ret);
314287 			return ret;
315288 		}
316289 
317290 		break;
318291 	default:
319
-		dev_err(dev->dev, "Invalid or unsupported interface\n");
292
+		DRM_DEV_ERROR(dev->dev, "Invalid or unsupported interface\n");
320293 		return -EINVAL;
321294 	}
322295 
....@@ -352,7 +325,7 @@
352325 	for (i = 0; i < ARRAY_SIZE(vg_planes); i++) {
353326 		plane = mdp4_plane_init(dev, vg_planes[i], false);
354327 		if (IS_ERR(plane)) {
355
-			dev_err(dev->dev,
328
+			DRM_DEV_ERROR(dev->dev,
356329 				"failed to construct plane for VG%d\n", i + 1);
357330 			ret = PTR_ERR(plane);
358331 			goto fail;
....@@ -363,7 +336,7 @@
363336 	for (i = 0; i < ARRAY_SIZE(mdp4_crtcs); i++) {
364337 		plane = mdp4_plane_init(dev, rgb_planes[i], true);
365338 		if (IS_ERR(plane)) {
366
-			dev_err(dev->dev,
339
+			DRM_DEV_ERROR(dev->dev,
367340 				"failed to construct plane for RGB%d\n", i + 1);
368341 			ret = PTR_ERR(plane);
369342 			goto fail;
....@@ -372,7 +345,7 @@
372345 		crtc  = mdp4_crtc_init(dev, plane, priv->num_crtcs, i,
373346 				mdp4_crtcs[i]);
374347 		if (IS_ERR(crtc)) {
375
-			dev_err(dev->dev, "failed to construct crtc for %s\n",
348
+			DRM_DEV_ERROR(dev->dev, "failed to construct crtc for %s\n",
376349 				mdp4_crtc_names[i]);
377350 			ret = PTR_ERR(crtc);
378351 			goto fail;
....@@ -394,7 +367,7 @@
394367 	for (i = 0; i < ARRAY_SIZE(mdp4_intfs); i++) {
395368 		ret = mdp4_modeset_init_intf(mdp4_kms, mdp4_intfs[i]);
396369 		if (ret) {
397
-			dev_err(dev->dev, "failed to initialize intf: %d, %d\n",
370
+			DRM_DEV_ERROR(dev->dev, "failed to initialize intf: %d, %d\n",
398371 				i, ret);
399372 			goto fail;
400373 		}
....@@ -406,25 +379,44 @@
406379 	return ret;
407380 }
408381 
382
+static void read_mdp_hw_revision(struct mdp4_kms *mdp4_kms,
383
+				 u32 *major, u32 *minor)
384
+{
385
+	struct drm_device *dev = mdp4_kms->dev;
386
+	u32 version;
387
+
388
+	mdp4_enable(mdp4_kms);
389
+	version = mdp4_read(mdp4_kms, REG_MDP4_VERSION);
390
+	mdp4_disable(mdp4_kms);
391
+
392
+	*major = FIELD(version, MDP4_VERSION_MAJOR);
393
+	*minor = FIELD(version, MDP4_VERSION_MINOR);
394
+
395
+	DRM_DEV_INFO(dev->dev, "MDP4 version v%d.%d", *major, *minor);
396
+}
397
+
409398 struct msm_kms *mdp4_kms_init(struct drm_device *dev)
410399 {
411400 	struct platform_device *pdev = to_platform_device(dev->dev);
412401 	struct mdp4_platform_config *config = mdp4_get_config(pdev);
402
+	struct msm_drm_private *priv = dev->dev_private;
413403 	struct mdp4_kms *mdp4_kms;
414404 	struct msm_kms *kms = NULL;
415405 	struct msm_gem_address_space *aspace;
416406 	int irq, ret;
407
+	u32 major, minor;
417408 
418409 	mdp4_kms = kzalloc(sizeof(*mdp4_kms), GFP_KERNEL);
419410 	if (!mdp4_kms) {
420
-		dev_err(dev->dev, "failed to allocate kms\n");
411
+		DRM_DEV_ERROR(dev->dev, "failed to allocate kms\n");
421412 		ret = -ENOMEM;
422413 		goto fail;
423414 	}
424415 
425416 	mdp_kms_init(&mdp4_kms->base, &kms_funcs);
426417 
427
-	kms = &mdp4_kms->base.base;
418
+	priv->kms = &mdp4_kms->base.base;
419
+	kms = priv->kms;
428420 
429421 	mdp4_kms->dev = dev;
430422 
....@@ -437,7 +429,7 @@
437429 	irq = platform_get_irq(pdev, 0);
438430 	if (irq < 0) {
439431 		ret = irq;
440
-		dev_err(dev->dev, "failed to get irq: %d\n", ret);
432
+		DRM_DEV_ERROR(dev->dev, "failed to get irq: %d\n", ret);
441433 		goto fail;
442434 	}
443435 
....@@ -454,14 +446,14 @@
454446 	if (mdp4_kms->vdd) {
455447 		ret = regulator_enable(mdp4_kms->vdd);
456448 		if (ret) {
457
-			dev_err(dev->dev, "failed to enable regulator vdd: %d\n", ret);
449
+			DRM_DEV_ERROR(dev->dev, "failed to enable regulator vdd: %d\n", ret);
458450 			goto fail;
459451 		}
460452 	}
461453 
462454 	mdp4_kms->clk = devm_clk_get(&pdev->dev, "core_clk");
463455 	if (IS_ERR(mdp4_kms->clk)) {
464
-		dev_err(dev->dev, "failed to get core_clk\n");
456
+		DRM_DEV_ERROR(dev->dev, "failed to get core_clk\n");
465457 		ret = PTR_ERR(mdp4_kms->clk);
466458 		goto fail;
467459 	}
....@@ -470,23 +462,35 @@
470462 	if (IS_ERR(mdp4_kms->pclk))
471463 		mdp4_kms->pclk = NULL;
472464 
473
-	// XXX if (rev >= MDP_REV_42) { ???
474
-	mdp4_kms->lut_clk = devm_clk_get(&pdev->dev, "lut_clk");
475
-	if (IS_ERR(mdp4_kms->lut_clk)) {
476
-		dev_err(dev->dev, "failed to get lut_clk\n");
477
-		ret = PTR_ERR(mdp4_kms->lut_clk);
478
-		goto fail;
479
-	}
480
-
481465 	mdp4_kms->axi_clk = devm_clk_get(&pdev->dev, "bus_clk");
482466 	if (IS_ERR(mdp4_kms->axi_clk)) {
483
-		dev_err(dev->dev, "failed to get axi_clk\n");
467
+		DRM_DEV_ERROR(dev->dev, "failed to get axi_clk\n");
484468 		ret = PTR_ERR(mdp4_kms->axi_clk);
485469 		goto fail;
486470 	}
487471 
488472 	clk_set_rate(mdp4_kms->clk, config->max_clk);
489
-	clk_set_rate(mdp4_kms->lut_clk, config->max_clk);
473
+
474
+	read_mdp_hw_revision(mdp4_kms, &major, &minor);
475
+
476
+	if (major != 4) {
477
+		DRM_DEV_ERROR(dev->dev, "unexpected MDP version: v%d.%d\n",
478
+			      major, minor);
479
+		ret = -ENXIO;
480
+		goto fail;
481
+	}
482
+
483
+	mdp4_kms->rev = minor;
484
+
485
+	if (mdp4_kms->rev >= 2) {
486
+		mdp4_kms->lut_clk = devm_clk_get(&pdev->dev, "lut_clk");
487
+		if (IS_ERR(mdp4_kms->lut_clk)) {
488
+			DRM_DEV_ERROR(dev->dev, "failed to get lut_clk\n");
489
+			ret = PTR_ERR(mdp4_kms->lut_clk);
490
+			goto fail;
491
+		}
492
+		clk_set_rate(mdp4_kms->lut_clk, config->max_clk);
493
+	}
490494 
491495 	pm_runtime_enable(dev->dev);
492496 	mdp4_kms->rpm_enabled = true;
....@@ -503,43 +507,44 @@
503507 	mdelay(16);
504508 
505509 	if (config->iommu) {
506
-		aspace = msm_gem_address_space_create(&pdev->dev,
507
-				config->iommu, "mdp4");
510
+		struct msm_mmu *mmu = msm_iommu_new(&pdev->dev,
511
+			config->iommu);
512
+
513
+		aspace  = msm_gem_address_space_create(mmu,
514
+			"mdp4", 0x1000, 0x100000000 - 0x1000);
515
+
508516 		if (IS_ERR(aspace)) {
517
+			if (!IS_ERR(mmu))
518
+				mmu->funcs->destroy(mmu);
509519 			ret = PTR_ERR(aspace);
510520 			goto fail;
511521 		}
512522 
513523 		kms->aspace = aspace;
514
-
515
-		ret = aspace->mmu->funcs->attach(aspace->mmu, iommu_ports,
516
-				ARRAY_SIZE(iommu_ports));
517
-		if (ret)
518
-			goto fail;
519524 	} else {
520
-		dev_info(dev->dev, "no iommu, fallback to phys "
525
+		DRM_DEV_INFO(dev->dev, "no iommu, fallback to phys "
521526 				"contig buffers for scanout\n");
522527 		aspace = NULL;
523528 	}
524529 
525530 	ret = modeset_init(mdp4_kms);
526531 	if (ret) {
527
-		dev_err(dev->dev, "modeset_init failed: %d\n", ret);
532
+		DRM_DEV_ERROR(dev->dev, "modeset_init failed: %d\n", ret);
528533 		goto fail;
529534 	}
530535 
531
-	mdp4_kms->blank_cursor_bo = msm_gem_new(dev, SZ_16K, MSM_BO_WC);
536
+	mdp4_kms->blank_cursor_bo = msm_gem_new(dev, SZ_16K, MSM_BO_WC | MSM_BO_SCANOUT);
532537 	if (IS_ERR(mdp4_kms->blank_cursor_bo)) {
533538 		ret = PTR_ERR(mdp4_kms->blank_cursor_bo);
534
-		dev_err(dev->dev, "could not allocate blank-cursor bo: %d\n", ret);
539
+		DRM_DEV_ERROR(dev->dev, "could not allocate blank-cursor bo: %d\n", ret);
535540 		mdp4_kms->blank_cursor_bo = NULL;
536541 		goto fail;
537542 	}
538543 
539
-	ret = msm_gem_get_iova(mdp4_kms->blank_cursor_bo, kms->aspace,
544
+	ret = msm_gem_get_and_pin_iova(mdp4_kms->blank_cursor_bo, kms->aspace,
540545 			&mdp4_kms->blank_cursor_iova);
541546 	if (ret) {
542
-		dev_err(dev->dev, "could not pin blank-cursor bo: %d\n", ret);
547
+		DRM_DEV_ERROR(dev->dev, "could not pin blank-cursor bo: %d\n", ret);
543548 		goto fail;
544549 	}
545550 
....@@ -563,10 +568,6 @@
563568 	/* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */
564569 	config.max_clk = 266667000;
565570 	config.iommu = iommu_domain_alloc(&platform_bus_type);
566
-	if (config.iommu) {
567
-		config.iommu->geometry.aperture_start = 0x1000;
568
-		config.iommu->geometry.aperture_end = 0xffffffff;
569
-	}
570571 
571572 	return &config;
572573 }