.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * Copyright (C) 2013 Red Hat |
---|
3 | 4 | * 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/>. |
---|
16 | 5 | */ |
---|
17 | 6 | |
---|
| 7 | +#include <linux/delay.h> |
---|
| 8 | + |
---|
| 9 | +#include <drm/drm_vblank.h> |
---|
18 | 10 | |
---|
19 | 11 | #include "msm_drv.h" |
---|
20 | 12 | #include "msm_gem.h" |
---|
.. | .. |
---|
27 | 19 | { |
---|
28 | 20 | struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); |
---|
29 | 21 | struct drm_device *dev = mdp4_kms->dev; |
---|
30 | | - uint32_t version, major, minor, dmap_cfg, vg_cfg; |
---|
| 22 | + u32 dmap_cfg, vg_cfg; |
---|
31 | 23 | unsigned long clk; |
---|
32 | 24 | int ret = 0; |
---|
33 | 25 | |
---|
34 | 26 | 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; |
---|
53 | 27 | |
---|
54 | 28 | if (mdp4_kms->rev > 1) { |
---|
55 | 29 | mdp4_write(mdp4_kms, REG_MDP4_CS_CONTROLLER0, 0x0707ffff); |
---|
.. | .. |
---|
96 | 70 | if (mdp4_kms->rev > 1) |
---|
97 | 71 | mdp4_write(mdp4_kms, REG_MDP4_RESET_STATUS, 1); |
---|
98 | 72 | |
---|
99 | | -out: |
---|
100 | 73 | pm_runtime_put_sync(dev->dev); |
---|
101 | 74 | |
---|
102 | 75 | return ret; |
---|
103 | 76 | } |
---|
104 | 77 | |
---|
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) |
---|
106 | 79 | { |
---|
107 | 80 | 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 | | - |
---|
112 | 81 | 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); |
---|
117 | 82 | } |
---|
118 | 83 | |
---|
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) |
---|
120 | 85 | { |
---|
121 | 86 | 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 | | - |
---|
132 | 87 | mdp4_disable(mdp4_kms); |
---|
133 | 88 | } |
---|
134 | 89 | |
---|
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) |
---|
137 | 91 | { |
---|
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 | +{ |
---|
139 | 110 | } |
---|
140 | 111 | |
---|
141 | 112 | static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate, |
---|
.. | .. |
---|
152 | 123 | } |
---|
153 | 124 | } |
---|
154 | 125 | |
---|
155 | | -static const char * const iommu_ports[] = { |
---|
156 | | - "mdp_port0_cb0", "mdp_port1_cb0", |
---|
157 | | -}; |
---|
158 | | - |
---|
159 | 126 | static void mdp4_destroy(struct msm_kms *kms) |
---|
160 | 127 | { |
---|
161 | 128 | struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); |
---|
.. | .. |
---|
163 | 130 | struct msm_gem_address_space *aspace = kms->aspace; |
---|
164 | 131 | |
---|
165 | 132 | 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); |
---|
168 | 135 | |
---|
169 | 136 | if (aspace) { |
---|
170 | | - aspace->mmu->funcs->detach(aspace->mmu, |
---|
171 | | - iommu_ports, ARRAY_SIZE(iommu_ports)); |
---|
| 137 | + aspace->mmu->funcs->detach(aspace->mmu); |
---|
172 | 138 | msm_gem_address_space_put(aspace); |
---|
173 | 139 | } |
---|
174 | 140 | |
---|
.. | .. |
---|
187 | 153 | .irq = mdp4_irq, |
---|
188 | 154 | .enable_vblank = mdp4_enable_vblank, |
---|
189 | 155 | .disable_vblank = mdp4_disable_vblank, |
---|
| 156 | + .enable_commit = mdp4_enable_commit, |
---|
| 157 | + .disable_commit = mdp4_disable_commit, |
---|
190 | 158 | .prepare_commit = mdp4_prepare_commit, |
---|
| 159 | + .flush_commit = mdp4_flush_commit, |
---|
| 160 | + .wait_flush = mdp4_wait_flush, |
---|
191 | 161 | .complete_commit = mdp4_complete_commit, |
---|
192 | | - .wait_for_crtc_commit_done = mdp4_wait_for_crtc_commit_done, |
---|
193 | 162 | .get_format = mdp_get_format, |
---|
194 | 163 | .round_pixclk = mdp4_round_pixclk, |
---|
195 | 164 | .destroy = mdp4_destroy, |
---|
.. | .. |
---|
204 | 173 | clk_disable_unprepare(mdp4_kms->clk); |
---|
205 | 174 | if (mdp4_kms->pclk) |
---|
206 | 175 | 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); |
---|
208 | 178 | if (mdp4_kms->axi_clk) |
---|
209 | 179 | clk_disable_unprepare(mdp4_kms->axi_clk); |
---|
210 | 180 | |
---|
.. | .. |
---|
218 | 188 | clk_prepare_enable(mdp4_kms->clk); |
---|
219 | 189 | if (mdp4_kms->pclk) |
---|
220 | 190 | 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); |
---|
222 | 193 | if (mdp4_kms->axi_clk) |
---|
223 | 194 | clk_prepare_enable(mdp4_kms->axi_clk); |
---|
224 | 195 | |
---|
.. | .. |
---|
249 | 220 | |
---|
250 | 221 | encoder = mdp4_lcdc_encoder_init(dev, panel_node); |
---|
251 | 222 | 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); |
---|
253 | 225 | return PTR_ERR(encoder); |
---|
254 | 226 | } |
---|
255 | 227 | |
---|
.. | .. |
---|
258 | 230 | |
---|
259 | 231 | connector = mdp4_lvds_connector_init(dev, panel_node, encoder); |
---|
260 | 232 | 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); |
---|
262 | 235 | return PTR_ERR(connector); |
---|
263 | 236 | } |
---|
264 | 237 | |
---|
.. | .. |
---|
269 | 242 | case DRM_MODE_ENCODER_TMDS: |
---|
270 | 243 | encoder = mdp4_dtv_encoder_init(dev); |
---|
271 | 244 | 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"); |
---|
273 | 246 | return PTR_ERR(encoder); |
---|
274 | 247 | } |
---|
275 | 248 | |
---|
.. | .. |
---|
280 | 253 | /* Construct bridge/connector for HDMI: */ |
---|
281 | 254 | ret = msm_hdmi_modeset_init(priv->hdmi, dev, encoder); |
---|
282 | 255 | 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); |
---|
284 | 257 | return ret; |
---|
285 | 258 | } |
---|
286 | 259 | } |
---|
.. | .. |
---|
298 | 271 | encoder = mdp4_dsi_encoder_init(dev); |
---|
299 | 272 | if (IS_ERR(encoder)) { |
---|
300 | 273 | ret = PTR_ERR(encoder); |
---|
301 | | - dev_err(dev->dev, |
---|
| 274 | + DRM_DEV_ERROR(dev->dev, |
---|
302 | 275 | "failed to construct DSI encoder: %d\n", ret); |
---|
303 | 276 | return ret; |
---|
304 | 277 | } |
---|
.. | .. |
---|
309 | 282 | |
---|
310 | 283 | ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); |
---|
311 | 284 | 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", |
---|
313 | 286 | ret); |
---|
314 | 287 | return ret; |
---|
315 | 288 | } |
---|
316 | 289 | |
---|
317 | 290 | break; |
---|
318 | 291 | default: |
---|
319 | | - dev_err(dev->dev, "Invalid or unsupported interface\n"); |
---|
| 292 | + DRM_DEV_ERROR(dev->dev, "Invalid or unsupported interface\n"); |
---|
320 | 293 | return -EINVAL; |
---|
321 | 294 | } |
---|
322 | 295 | |
---|
.. | .. |
---|
352 | 325 | for (i = 0; i < ARRAY_SIZE(vg_planes); i++) { |
---|
353 | 326 | plane = mdp4_plane_init(dev, vg_planes[i], false); |
---|
354 | 327 | if (IS_ERR(plane)) { |
---|
355 | | - dev_err(dev->dev, |
---|
| 328 | + DRM_DEV_ERROR(dev->dev, |
---|
356 | 329 | "failed to construct plane for VG%d\n", i + 1); |
---|
357 | 330 | ret = PTR_ERR(plane); |
---|
358 | 331 | goto fail; |
---|
.. | .. |
---|
363 | 336 | for (i = 0; i < ARRAY_SIZE(mdp4_crtcs); i++) { |
---|
364 | 337 | plane = mdp4_plane_init(dev, rgb_planes[i], true); |
---|
365 | 338 | if (IS_ERR(plane)) { |
---|
366 | | - dev_err(dev->dev, |
---|
| 339 | + DRM_DEV_ERROR(dev->dev, |
---|
367 | 340 | "failed to construct plane for RGB%d\n", i + 1); |
---|
368 | 341 | ret = PTR_ERR(plane); |
---|
369 | 342 | goto fail; |
---|
.. | .. |
---|
372 | 345 | crtc = mdp4_crtc_init(dev, plane, priv->num_crtcs, i, |
---|
373 | 346 | mdp4_crtcs[i]); |
---|
374 | 347 | 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", |
---|
376 | 349 | mdp4_crtc_names[i]); |
---|
377 | 350 | ret = PTR_ERR(crtc); |
---|
378 | 351 | goto fail; |
---|
.. | .. |
---|
394 | 367 | for (i = 0; i < ARRAY_SIZE(mdp4_intfs); i++) { |
---|
395 | 368 | ret = mdp4_modeset_init_intf(mdp4_kms, mdp4_intfs[i]); |
---|
396 | 369 | 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", |
---|
398 | 371 | i, ret); |
---|
399 | 372 | goto fail; |
---|
400 | 373 | } |
---|
.. | .. |
---|
406 | 379 | return ret; |
---|
407 | 380 | } |
---|
408 | 381 | |
---|
| 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 | + |
---|
409 | 398 | struct msm_kms *mdp4_kms_init(struct drm_device *dev) |
---|
410 | 399 | { |
---|
411 | 400 | struct platform_device *pdev = to_platform_device(dev->dev); |
---|
412 | 401 | struct mdp4_platform_config *config = mdp4_get_config(pdev); |
---|
| 402 | + struct msm_drm_private *priv = dev->dev_private; |
---|
413 | 403 | struct mdp4_kms *mdp4_kms; |
---|
414 | 404 | struct msm_kms *kms = NULL; |
---|
415 | 405 | struct msm_gem_address_space *aspace; |
---|
416 | 406 | int irq, ret; |
---|
| 407 | + u32 major, minor; |
---|
417 | 408 | |
---|
418 | 409 | mdp4_kms = kzalloc(sizeof(*mdp4_kms), GFP_KERNEL); |
---|
419 | 410 | if (!mdp4_kms) { |
---|
420 | | - dev_err(dev->dev, "failed to allocate kms\n"); |
---|
| 411 | + DRM_DEV_ERROR(dev->dev, "failed to allocate kms\n"); |
---|
421 | 412 | ret = -ENOMEM; |
---|
422 | 413 | goto fail; |
---|
423 | 414 | } |
---|
424 | 415 | |
---|
425 | 416 | mdp_kms_init(&mdp4_kms->base, &kms_funcs); |
---|
426 | 417 | |
---|
427 | | - kms = &mdp4_kms->base.base; |
---|
| 418 | + priv->kms = &mdp4_kms->base.base; |
---|
| 419 | + kms = priv->kms; |
---|
428 | 420 | |
---|
429 | 421 | mdp4_kms->dev = dev; |
---|
430 | 422 | |
---|
.. | .. |
---|
437 | 429 | irq = platform_get_irq(pdev, 0); |
---|
438 | 430 | if (irq < 0) { |
---|
439 | 431 | 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); |
---|
441 | 433 | goto fail; |
---|
442 | 434 | } |
---|
443 | 435 | |
---|
.. | .. |
---|
454 | 446 | if (mdp4_kms->vdd) { |
---|
455 | 447 | ret = regulator_enable(mdp4_kms->vdd); |
---|
456 | 448 | 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); |
---|
458 | 450 | goto fail; |
---|
459 | 451 | } |
---|
460 | 452 | } |
---|
461 | 453 | |
---|
462 | 454 | mdp4_kms->clk = devm_clk_get(&pdev->dev, "core_clk"); |
---|
463 | 455 | 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"); |
---|
465 | 457 | ret = PTR_ERR(mdp4_kms->clk); |
---|
466 | 458 | goto fail; |
---|
467 | 459 | } |
---|
.. | .. |
---|
470 | 462 | if (IS_ERR(mdp4_kms->pclk)) |
---|
471 | 463 | mdp4_kms->pclk = NULL; |
---|
472 | 464 | |
---|
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 | | - |
---|
481 | 465 | mdp4_kms->axi_clk = devm_clk_get(&pdev->dev, "bus_clk"); |
---|
482 | 466 | 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"); |
---|
484 | 468 | ret = PTR_ERR(mdp4_kms->axi_clk); |
---|
485 | 469 | goto fail; |
---|
486 | 470 | } |
---|
487 | 471 | |
---|
488 | 472 | 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 | + } |
---|
490 | 494 | |
---|
491 | 495 | pm_runtime_enable(dev->dev); |
---|
492 | 496 | mdp4_kms->rpm_enabled = true; |
---|
.. | .. |
---|
503 | 507 | mdelay(16); |
---|
504 | 508 | |
---|
505 | 509 | 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 | + |
---|
508 | 516 | if (IS_ERR(aspace)) { |
---|
| 517 | + if (!IS_ERR(mmu)) |
---|
| 518 | + mmu->funcs->destroy(mmu); |
---|
509 | 519 | ret = PTR_ERR(aspace); |
---|
510 | 520 | goto fail; |
---|
511 | 521 | } |
---|
512 | 522 | |
---|
513 | 523 | 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; |
---|
519 | 524 | } else { |
---|
520 | | - dev_info(dev->dev, "no iommu, fallback to phys " |
---|
| 525 | + DRM_DEV_INFO(dev->dev, "no iommu, fallback to phys " |
---|
521 | 526 | "contig buffers for scanout\n"); |
---|
522 | 527 | aspace = NULL; |
---|
523 | 528 | } |
---|
524 | 529 | |
---|
525 | 530 | ret = modeset_init(mdp4_kms); |
---|
526 | 531 | 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); |
---|
528 | 533 | goto fail; |
---|
529 | 534 | } |
---|
530 | 535 | |
---|
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); |
---|
532 | 537 | if (IS_ERR(mdp4_kms->blank_cursor_bo)) { |
---|
533 | 538 | 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); |
---|
535 | 540 | mdp4_kms->blank_cursor_bo = NULL; |
---|
536 | 541 | goto fail; |
---|
537 | 542 | } |
---|
538 | 543 | |
---|
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, |
---|
540 | 545 | &mdp4_kms->blank_cursor_iova); |
---|
541 | 546 | 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); |
---|
543 | 548 | goto fail; |
---|
544 | 549 | } |
---|
545 | 550 | |
---|
.. | .. |
---|
563 | 568 | /* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */ |
---|
564 | 569 | config.max_clk = 266667000; |
---|
565 | 570 | 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 | | - } |
---|
570 | 571 | |
---|
571 | 572 | return &config; |
---|
572 | 573 | } |
---|