projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c54b182
)
drm/radeon/r600: only assign vb after we know space is available.
author
Robert Noland
<rnoland@2hip.net>
Tue, 20 Oct 2009 18:07:38 +0000
(13:07 -0500)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 26 Oct 2009 03:28:21 +0000
(13:28 +1000)
This patch only changes this is the swap path, where it doesn't loop.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/r600_blit.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/r600_blit.c
b/drivers/gpu/drm/radeon/r600_blit.c
index
626a9ab
..
5ea4323
100644
(file)
--- a/
drivers/gpu/drm/radeon/r600_blit.c
+++ b/
drivers/gpu/drm/radeon/r600_blit.c
@@
-778,8
+778,6
@@
r600_blit_swap(struct drm_device *dev,
u64 vb_addr;
u32 *vb;
- vb = r600_nomm_get_vb_ptr(dev);
-
if ((dev_priv->blit_vb->used + 48) > dev_priv->blit_vb->total) {
r600_nomm_put_vb(dev);
@@
-788,8
+786,8
@@
r600_blit_swap(struct drm_device *dev,
return;
set_shaders(dev);
- vb = r600_nomm_get_vb_ptr(dev);
}
+ vb = r600_nomm_get_vb_ptr(dev);
sx2 = sx + w;
sy2 = sy + h;