Przeglądaj źródła

drm/radeon/r600: only assign vb after we know space is available.

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>
Robert Noland 15 lat temu
rodzic
commit
33fdb15c99
1 zmienionych plików z 1 dodań i 3 usunięć
  1. 1 3
      drivers/gpu/drm/radeon/r600_blit.c

+ 1 - 3
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;