Add a couple of small fixes from the AMD folks.
- max tex height is 8192 - increment src/dst by the full transfer amount MFC after: 3 days
This commit is contained in:
parent
199e206513
commit
14928dda5c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=197155
@ -1734,6 +1734,8 @@ r600_blit_copy(struct drm_device *dev,
|
|||||||
|
|
||||||
if (!src_x && !dst_x) {
|
if (!src_x && !dst_x) {
|
||||||
h = (cur_size / max_bytes);
|
h = (cur_size / max_bytes);
|
||||||
|
if (h > 8192)
|
||||||
|
h = 8192;
|
||||||
if (h == 0)
|
if (h == 0)
|
||||||
h = 1;
|
h = 1;
|
||||||
else
|
else
|
||||||
@ -1805,8 +1807,8 @@ r600_blit_copy(struct drm_device *dev,
|
|||||||
vb += 12;
|
vb += 12;
|
||||||
dev_priv->blit_vb->used += 12 * 4;
|
dev_priv->blit_vb->used += 12 * 4;
|
||||||
|
|
||||||
src_gpu_addr += cur_size;
|
src_gpu_addr += cur_size * h;
|
||||||
dst_gpu_addr += cur_size;
|
dst_gpu_addr += cur_size * h;
|
||||||
size_bytes -= cur_size * h;
|
size_bytes -= cur_size * h;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -1822,6 +1824,8 @@ r600_blit_copy(struct drm_device *dev,
|
|||||||
|
|
||||||
if (!src_x && !dst_x) {
|
if (!src_x && !dst_x) {
|
||||||
h = (cur_size / max_bytes);
|
h = (cur_size / max_bytes);
|
||||||
|
if (h > 8192)
|
||||||
|
h = 8192;
|
||||||
if (h == 0)
|
if (h == 0)
|
||||||
h = 1;
|
h = 1;
|
||||||
else
|
else
|
||||||
@ -1894,8 +1898,8 @@ r600_blit_copy(struct drm_device *dev,
|
|||||||
vb += 12;
|
vb += 12;
|
||||||
dev_priv->blit_vb->used += 12 * 4;
|
dev_priv->blit_vb->used += 12 * 4;
|
||||||
|
|
||||||
src_gpu_addr += cur_size;
|
src_gpu_addr += cur_size * h;
|
||||||
dst_gpu_addr += cur_size;
|
dst_gpu_addr += cur_size * h;
|
||||||
size_bytes -= cur_size * h;
|
size_bytes -= cur_size * h;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user