Revert "drm/radeon/kms: fix typo in r600 cs checker"
authorAlex Deucher <alexdeucher@gmail.com>
Thu, 25 Nov 2010 03:26:55 +0000 (22:26 -0500)
committerDave Airlie <airlied@redhat.com>
Fri, 26 Nov 2010 00:41:42 +0000 (10:41 +1000)
This reverts commit d33ef52d9db8a36900dd53f2e32db9a521ace259.

This change seems to expose a bug in the 3D driver tiggered by
certain apps, so revert it to keep userspace working.

Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/r600_cs.c

index 9bebac1ec006845f719b04cab125da2328c4d6bf..0f90fc3482ce205df9991bcd1d7c1170abd912ca 100644 (file)
@@ -315,7 +315,7 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
                if (array_mode == V_0280A0_ARRAY_LINEAR_GENERAL) {
                        /* the initial DDX does bad things with the CB size occasionally */
                        /* it rounds up height too far for slice tile max but the BO is smaller */
-                       tmp = (height - 7) * pitch * bpe;
+                       tmp = (height - 7) * 8 * bpe;
                        if ((tmp + track->cb_color_bo_offset[i]) > radeon_bo_size(track->cb_color_bo[i])) {
                                dev_warn(p->dev, "%s offset[%d] %d %d %lu too big\n", __func__, i, track->cb_color_bo_offset[i], tmp, radeon_bo_size(track->cb_color_bo[i]));
                                return -EINVAL;