Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210711
b: refs/heads/master
c: fe725d4
h: refs/heads/master
i:
  210709: e58ee01
  210707: 8a9cd98
  210703: d16a8e5
v: v3
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Sep 15, 2010
1 parent 5b85a37 commit 229b165
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f90087eea44ce5fad139f086bc9d89ca37b0edc2
refs/heads/master: fe725d4f22f6bd1e7a5e7074bdf53a8fe0a954ee
5 changes: 2 additions & 3 deletions trunk/drivers/gpu/drm/radeon/r600_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1170,9 +1170,8 @@ static inline int r600_check_texture_resource(struct radeon_cs_parser *p, u32 i
/* using get ib will give us the offset into the mipmap bo */
word0 = radeon_get_ib_value(p, idx + 3) << 8;
if ((mipmap_size + word0) > radeon_bo_size(mipmap)) {
dev_warn(p->dev, "mipmap bo too small (%d %d %d %d %d %d -> %d have %ld)\n",
w0, h0, bpe, blevel, nlevels, word0, mipmap_size, radeon_bo_size(texture));
return -EINVAL;
/*dev_warn(p->dev, "mipmap bo too small (%d %d %d %d %d %d -> %d have %ld)\n",
w0, h0, bpe, blevel, nlevels, word0, mipmap_size, radeon_bo_size(texture));*/
}
return 0;
}
Expand Down

0 comments on commit 229b165

Please sign in to comment.