|
@@ -118,7 +118,7 @@ static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
|
|
|
size -= submit_size;
|
|
|
ret = psb_2d_wait_available(dev_priv, submit_size);
|
|
|
if (ret)
|
|
|
- break;
|
|
|
+ break;
|
|
|
|
|
|
submit_size <<= 2;
|
|
|
|
|
@@ -388,19 +388,19 @@ int psb_accel_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
|
|
|
for (i = 0; i < op->size; i++, op_ptr++) {
|
|
|
u32 r = *op_ptr & 0xF0000000;
|
|
|
/* Fill in the GTT offsets for the command buffer */
|
|
|
- if (r == PSB_2D_SRC_SURF_BH ||
|
|
|
- r == PSB_2D_DST_SURF_BH ||
|
|
|
+ if (r == PSB_2D_SRC_SURF_BH ||
|
|
|
+ r == PSB_2D_DST_SURF_BH ||
|
|
|
r == PSB_2D_MASK_SURF_BH ||
|
|
|
r == PSB_2D_PAT_SURF_BH) {
|
|
|
i++;
|
|
|
op_ptr++;
|
|
|
if (i == op->size)
|
|
|
goto bad;
|
|
|
- if (*op_ptr)
|
|
|
+ if (*op_ptr)
|
|
|
goto bad;
|
|
|
- *op_ptr = gtt->offset;
|
|
|
- continue;
|
|
|
- }
|
|
|
+ *op_ptr = gtt->offset;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
}
|
|
|
psbfb_2d_submit(dev_priv, op->cmd, op->size);
|
|
|
err = 0;
|