Rev 1268 | Rev 1321 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1268 | Rev 1275 | ||
---|---|---|---|
Line 451... | Line 451... | ||
451 | (crtc->fb->bits_per_pixel * 8)); |
451 | (crtc->fb->bits_per_pixel * 8)); |
452 | crtc_pitch |= crtc_pitch << 16; |
452 | crtc_pitch |= crtc_pitch << 16; |
Line 453... | Line 453... | ||
453 | 453 | ||
454 | // radeon_object_get_tiling_flags(obj->driver_private, |
454 | // radeon_object_get_tiling_flags(obj->driver_private, |
- | 455 | // &tiling_flags, NULL); |
|
- | 456 | tiling_flags = 0; |
|
455 | // &tiling_flags, NULL); |
457 | |
456 | if (tiling_flags & RADEON_TILING_MICRO) |
458 | if (tiling_flags & RADEON_TILING_MICRO) |
Line 457... | Line 459... | ||
457 | DRM_ERROR("trying to scanout microtiled buffer\n"); |
459 | DRM_ERROR("trying to scanout microtiled buffer\n"); |
458 | 460 | ||
Line 528... | Line 530... | ||
528 | } |
530 | } |
529 | WREG32(RADEON_CRTC_OFFSET_CNTL + radeon_crtc->crtc_offset, crtc_offset_cntl); |
531 | WREG32(RADEON_CRTC_OFFSET_CNTL + radeon_crtc->crtc_offset, crtc_offset_cntl); |
530 | WREG32(RADEON_CRTC_OFFSET + radeon_crtc->crtc_offset, crtc_offset); |
532 | WREG32(RADEON_CRTC_OFFSET + radeon_crtc->crtc_offset, crtc_offset); |
531 | WREG32(RADEON_CRTC_PITCH + radeon_crtc->crtc_offset, crtc_pitch); |
533 | WREG32(RADEON_CRTC_PITCH + radeon_crtc->crtc_offset, crtc_pitch); |
Line 532... | Line 534... | ||
532 | 534 | ||
533 | if (old_fb && old_fb != crtc->fb) { |
535 | // if (old_fb && old_fb != crtc->fb) { |
534 | radeon_fb = to_radeon_framebuffer(old_fb); |
536 | // radeon_fb = to_radeon_framebuffer(old_fb); |
535 | // radeon_gem_object_unpin(radeon_fb->obj); |
537 | // radeon_gem_object_unpin(radeon_fb->obj); |
Line 536... | Line 538... | ||
536 | } |
538 | // } |
537 | 539 | ||
Line 538... | Line 540... | ||
538 | /* Bytes per pixel may have changed */ |
540 | /* Bytes per pixel may have changed */ |