drm/radeon/kms: fix cs parser tex bit 11 check

The problem boils down to the order when the bit11
of the texture size is or'ed to the original width.
In the end each mipmap level has the same width or
height because of that 11 bit is ored to the scaled
down lod with and thus blows up the size again to the
full size or more due to the power of two rounding
afterwards.

The attached patch changes this order so that the
texture sizes are computed correct. Also the on error
the yet missing inputs to the size computation are
printed which helped me to find out where it really breaks.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

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)
 static inline void r100_cs_track_texture_print(struct r100_cs_track_texture *t)
 {
         DRM_ERROR("pitch                      %d\n", t->pitch);
+        DRM_ERROR("use_pitch                  %d\n", t->use_pitch);
         DRM_ERROR("width                      %d\n", t->width);
+        DRM_ERROR("width_11                   %d\n", t->width_11);
         DRM_ERROR("height                     %d\n", t->height);
+        DRM_ERROR("height_11                  %d\n", t->height_11);
         DRM_ERROR("num levels                 %d\n", t->num_levels);
         DRM_ERROR("depth                      %d\n", t->txdepth);
         DRM_ERROR("bpp                        %d\n", t->cpp);
@@ -2609,15 +2612,17 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev,
                                 else
                                         w = track->textures[u].pitch / (1 << i);
                         } else {
-                                w = track->textures[u].width / (1 << i);
+                                w = track->textures[u].width;
                                 if (rdev->family >= CHIP_RV515)
                                         w |= track->textures[u].width_11;
+                                w = w / (1 << i);
                                 if (track->textures[u].roundup_w)
                                         w = roundup_pow_of_two(w);
                         }
-                        h = track->textures[u].height / (1 << i);
+                        h = track->textures[u].height;
                         if (rdev->family >= CHIP_RV515)
                                 h |= track->textures[u].height_11;
+                        h = h / (1 << i);
                         if (track->textures[u].roundup_h)
                                 h = roundup_pow_of_two(h);
                         size += w * h;