diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-11-24 22:26:55 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-11-26 10:41:42 +1000 |
| commit | a235e4c9302509ac5956bbbffa22eb5ed9fcdc54 (patch) | |
| tree | c5e049b75abc945131df8828778af2fd0f49f8df /drivers/gpu/drm/radeon | |
| parent | f24d86f1a49505cdea56728b853a5d0a3f8e3d11 (diff) | |
| download | talos-op-linux-a235e4c9302509ac5956bbbffa22eb5ed9fcdc54.tar.gz talos-op-linux-a235e4c9302509ac5956bbbffa22eb5ed9fcdc54.zip | |
Revert "drm/radeon/kms: fix typo in r600 cs checker"
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>
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 9bebac1ec006..0f90fc3482ce 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -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; |
