aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index c22adff179a9..ed5e983d21e9 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2548,8 +2548,11 @@ void r100_bandwidth_update(struct radeon_device *rdev)
2548static inline void r100_cs_track_texture_print(struct r100_cs_track_texture *t) 2548static inline void r100_cs_track_texture_print(struct r100_cs_track_texture *t)
2549{ 2549{
2550 DRM_ERROR("pitch %d\n", t->pitch); 2550 DRM_ERROR("pitch %d\n", t->pitch);
2551 DRM_ERROR("use_pitch %d\n", t->use_pitch);
2551 DRM_ERROR("width %d\n", t->width); 2552 DRM_ERROR("width %d\n", t->width);
2553 DRM_ERROR("width_11 %d\n", t->width_11);
2552 DRM_ERROR("height %d\n", t->height); 2554 DRM_ERROR("height %d\n", t->height);
2555 DRM_ERROR("height_11 %d\n", t->height_11);
2553 DRM_ERROR("num levels %d\n", t->num_levels); 2556 DRM_ERROR("num levels %d\n", t->num_levels);
2554 DRM_ERROR("depth %d\n", t->txdepth); 2557 DRM_ERROR("depth %d\n", t->txdepth);
2555 DRM_ERROR("bpp %d\n", t->cpp); 2558 DRM_ERROR("bpp %d\n", t->cpp);
@@ -2609,15 +2612,17 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev,
2609 else 2612 else
2610 w = track->textures[u].pitch / (1 << i); 2613 w = track->textures[u].pitch / (1 << i);
2611 } else { 2614 } else {
2612 w = track->textures[u].width / (1 << i); 2615 w = track->textures[u].width;
2613 if (rdev->family >= CHIP_RV515) 2616 if (rdev->family >= CHIP_RV515)
2614 w |= track->textures[u].width_11; 2617 w |= track->textures[u].width_11;
2618 w = w / (1 << i);
2615 if (track->textures[u].roundup_w) 2619 if (track->textures[u].roundup_w)
2616 w = roundup_pow_of_two(w); 2620 w = roundup_pow_of_two(w);
2617 } 2621 }
2618 h = track->textures[u].height / (1 << i); 2622 h = track->textures[u].height;
2619 if (rdev->family >= CHIP_RV515) 2623 if (rdev->family >= CHIP_RV515)
2620 h |= track->textures[u].height_11; 2624 h |= track->textures[u].height_11;
2625 h = h / (1 << i);
2621 if (track->textures[u].roundup_h) 2626 if (track->textures[u].roundup_h)
2622 h = roundup_pow_of_two(h); 2627 h = roundup_pow_of_two(h);
2623 size += w * h; 2628 size += w * h;