Rev 1221 | Rev 1268 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1221 | Rev 1246 | ||
|---|---|---|---|
| Line 464... | Line 464... | ||
| 464 | } |
464 | } |
| Line 465... | Line 465... | ||
| 465 | 465 | ||
| 466 | int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y, |
466 | int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y, |
| 467 | struct drm_framebuffer *old_fb) |
467 | struct drm_framebuffer *old_fb) |
| - | 468 | { |
|
| - | 469 | ENTER(); |
|
| 468 | { |
470 | |
| 469 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); |
471 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); |
| 470 | struct drm_device *dev = crtc->dev; |
472 | struct drm_device *dev = crtc->dev; |
| 471 | struct radeon_device *rdev = dev->dev_private; |
473 | struct radeon_device *rdev = dev->dev_private; |
| 472 | struct radeon_framebuffer *radeon_fb; |
474 | struct radeon_framebuffer *radeon_fb; |
| Line 485... | Line 487... | ||
| 485 | 487 | ||
| 486 | // if (radeon_gem_object_pin(obj, RADEON_GEM_DOMAIN_VRAM, &fb_location)) { |
488 | // if (radeon_gem_object_pin(obj, RADEON_GEM_DOMAIN_VRAM, &fb_location)) { |
| 487 | // return -EINVAL; |
489 | // return -EINVAL; |
| Line 488... | Line 490... | ||
| 488 | // } |
490 | // } |
| 489 | - | ||
| Line 490... | Line 491... | ||
| 490 | fb_location = 0; //rdev->mc.vram_location; |
491 | |
| 491 | 492 | fb_location = rdev->mc.vram_location; |
|
| 492 | 493 | ||
| 493 | switch (crtc->fb->bits_per_pixel) { |
494 | switch (crtc->fb->bits_per_pixel) { |
| Line 560... | Line 561... | ||
| 560 | WREG32(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, |
561 | WREG32(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, |
| 561 | AVIVO_D1MODE_INTERLEAVE_EN); |
562 | AVIVO_D1MODE_INTERLEAVE_EN); |
| 562 | else |
563 | else |
| 563 | WREG32(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, 0); |
564 | WREG32(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, 0); |
| Line 564... | Line 565... | ||
| 564 | 565 | ||
| 565 | if (old_fb && old_fb != crtc->fb) { |
566 | // if (old_fb && old_fb != crtc->fb) { |
| 566 | // radeon_fb = to_radeon_framebuffer(old_fb); |
567 | // radeon_fb = to_radeon_framebuffer(old_fb); |
| - | 568 | // radeon_gem_object_unpin(radeon_fb->obj); |
|
| - | 569 | // } |
|
| - | 570 | ||
| 567 | // radeon_gem_object_unpin(radeon_fb->obj); |
571 | LEAVE(); |
| 568 | } |
572 | |
| 569 | return 0; |
573 | return 0; |
| Line 570... | Line 574... | ||
| 570 | } |
574 | } |
| 571 | 575 | ||