Rev 4111 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4111 | Rev 4569 | ||
|---|---|---|---|
| Line 315... | Line 315... | ||
| 315 | connector->encoder = NULL; |
315 | connector->encoder = NULL; |
| 316 | encoder->crtc = NULL; |
316 | encoder->crtc = NULL; |
| 317 | crtc->fb = NULL; |
317 | crtc->fb = NULL; |
| 318 | crtc->x = 0; |
318 | crtc->x = 0; |
| 319 | crtc->y = 0; |
319 | crtc->y = 0; |
| - | 320 | crtc->enabled = false; |
|
| Line 320... | Line 321... | ||
| 320 | 321 | ||
| Line 321... | Line 322... | ||
| 321 | vmw_sou_del_active(dev_priv, sou); |
322 | vmw_sou_del_active(dev_priv, sou); |
| Line 375... | Line 376... | ||
| 375 | connector->encoder = NULL; |
376 | connector->encoder = NULL; |
| 376 | encoder->crtc = NULL; |
377 | encoder->crtc = NULL; |
| 377 | crtc->fb = NULL; |
378 | crtc->fb = NULL; |
| 378 | crtc->x = 0; |
379 | crtc->x = 0; |
| 379 | crtc->y = 0; |
380 | crtc->y = 0; |
| - | 381 | crtc->enabled = false; |
|
| Line 380... | Line 382... | ||
| 380 | 382 | ||
| 381 | return ret; |
383 | return ret; |
| Line 382... | Line 384... | ||
| 382 | } |
384 | } |
| Line 387... | Line 389... | ||
| 387 | encoder->crtc = crtc; |
389 | encoder->crtc = crtc; |
| 388 | crtc->mode = *mode; |
390 | crtc->mode = *mode; |
| 389 | crtc->fb = fb; |
391 | crtc->fb = fb; |
| 390 | crtc->x = set->x; |
392 | crtc->x = set->x; |
| 391 | crtc->y = set->y; |
393 | crtc->y = set->y; |
| - | 394 | crtc->enabled = true; |
|
| Line 392... | Line 395... | ||
| 392 | 395 | ||
| 393 | return 0; |
396 | return 0; |
| Line 394... | Line 397... | ||
| 394 | } |
397 | } |
| Line 508... | Line 511... | ||
| 508 | goto err_no_mem; |
511 | goto err_no_mem; |
| Line 509... | Line 512... | ||
| 509 | 512 | ||
| 510 | dev_priv->sou_priv->num_implicit = 0; |
513 | dev_priv->sou_priv->num_implicit = 0; |
| Line 511... | Line -... | ||
| 511 | dev_priv->sou_priv->implicit_fb = NULL; |
- | |
| 512 | - | ||
| 513 | // ret = drm_vblank_init(dev, VMWGFX_NUM_DISPLAY_UNITS); |
- | |
| Line 514... | Line 514... | ||
| 514 | // if (unlikely(ret != 0)) |
514 | dev_priv->sou_priv->implicit_fb = NULL; |
| 515 | // goto err_free; |
515 | |
| 516 | 516 | ||