diff options
Diffstat (limited to 'sys/dev/pci/drm/radeon')
| -rw-r--r-- | sys/dev/pci/drm/radeon/evergreen.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r100.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r200.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/rv770.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/si.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/pci/drm/radeon/evergreen.c b/sys/dev/pci/drm/radeon/evergreen.c index 92678cf0e4b..e49eb39cf8b 100644 --- a/sys/dev/pci/drm/radeon/evergreen.c +++ b/sys/dev/pci/drm/radeon/evergreen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evergreen.c,v 1.17 2015/04/06 06:12:25 jsg Exp $ */ +/* $OpenBSD: evergreen.c,v 1.18 2015/04/06 14:10:59 jsg Exp $ */ /* * Copyright 2010 Advanced Micro Devices, Inc. * @@ -3487,7 +3487,7 @@ int evergreen_copy_dma(struct radeon_device *rdev, } size_in_dw = (num_gpu_pages << RADEON_GPU_PAGE_SHIFT) / 4; - num_loops = howmany(size_in_dw, 0xfffff); + num_loops = DIV_ROUND_UP(size_in_dw, 0xfffff); r = radeon_ring_lock(rdev, ring, num_loops * 5 + 11); if (r) { DRM_ERROR("radeon: moving bo (%d).\n", r); diff --git a/sys/dev/pci/drm/radeon/r100.c b/sys/dev/pci/drm/radeon/r100.c index 98277e43a39..1c4fe9ea7b4 100644 --- a/sys/dev/pci/drm/radeon/r100.c +++ b/sys/dev/pci/drm/radeon/r100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r100.c,v 1.14 2015/04/06 07:38:49 jsg Exp $ */ +/* $OpenBSD: r100.c,v 1.15 2015/04/06 14:10:59 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -894,7 +894,7 @@ int r100_copy_blit(struct radeon_device *rdev, /* radeon pitch is /64 */ pitch = stride_bytes / 64; stride_pixels = stride_bytes / 4; - num_loops = howmany(num_gpu_pages, 8191); + num_loops = DIV_ROUND_UP(num_gpu_pages, 8191); /* Ask for enough room for blit + flush + fence */ ndw = 64 + (10 * num_loops); diff --git a/sys/dev/pci/drm/radeon/r200.c b/sys/dev/pci/drm/radeon/r200.c index 93088350aba..7b0d3d74342 100644 --- a/sys/dev/pci/drm/radeon/r200.c +++ b/sys/dev/pci/drm/radeon/r200.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r200.c,v 1.2 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: r200.c,v 1.3 2015/04/06 14:10:59 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -95,7 +95,7 @@ int r200_copy_dma(struct radeon_device *rdev, /* radeon pitch is /64 */ size = num_gpu_pages << RADEON_GPU_PAGE_SHIFT; - num_loops = howmany(size, 0x1FFFFF); + num_loops = DIV_ROUND_UP(size, 0x1FFFFF); r = radeon_ring_lock(rdev, ring, num_loops * 4 + 64); if (r) { DRM_ERROR("radeon: moving bo (%d).\n", r); diff --git a/sys/dev/pci/drm/radeon/r600.c b/sys/dev/pci/drm/radeon/r600.c index d1a66165634..2463c10996a 100644 --- a/sys/dev/pci/drm/radeon/r600.c +++ b/sys/dev/pci/drm/radeon/r600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r600.c,v 1.18 2015/04/06 12:25:10 jsg Exp $ */ +/* $OpenBSD: r600.c,v 1.19 2015/04/06 14:10:59 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -2684,7 +2684,7 @@ int r600_copy_dma(struct radeon_device *rdev, } size_in_dw = (num_gpu_pages << RADEON_GPU_PAGE_SHIFT) / 4; - num_loops = howmany(size_in_dw, 0xFFFE); + num_loops = DIV_ROUND_UP(size_in_dw, 0xFFFE); r = radeon_ring_lock(rdev, ring, num_loops * 4 + 8); if (r) { DRM_ERROR("radeon: moving bo (%d).\n", r); diff --git a/sys/dev/pci/drm/radeon/rv770.c b/sys/dev/pci/drm/radeon/rv770.c index e8b20a14551..d7ce0e6078c 100644 --- a/sys/dev/pci/drm/radeon/rv770.c +++ b/sys/dev/pci/drm/radeon/rv770.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rv770.c,v 1.5 2014/02/09 12:33:44 jsg Exp $ */ +/* $OpenBSD: rv770.c,v 1.6 2015/04/06 14:10:59 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -917,7 +917,7 @@ int rv770_copy_dma(struct radeon_device *rdev, } size_in_dw = (num_gpu_pages << RADEON_GPU_PAGE_SHIFT) / 4; - num_loops = howmany(size_in_dw, 0xFFFF); + num_loops = DIV_ROUND_UP(size_in_dw, 0xFFFF); r = radeon_ring_lock(rdev, ring, num_loops * 5 + 8); if (r) { DRM_ERROR("radeon: moving bo (%d).\n", r); diff --git a/sys/dev/pci/drm/radeon/si.c b/sys/dev/pci/drm/radeon/si.c index 45d65ea2982..7eaee5ae1b7 100644 --- a/sys/dev/pci/drm/radeon/si.c +++ b/sys/dev/pci/drm/radeon/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.21 2015/04/06 07:38:49 jsg Exp $ */ +/* $OpenBSD: si.c,v 1.22 2015/04/06 14:10:59 jsg Exp $ */ /* * Copyright 2011 Advanced Micro Devices, Inc. * @@ -4054,7 +4054,7 @@ int si_copy_dma(struct radeon_device *rdev, } size_in_bytes = (num_gpu_pages << RADEON_GPU_PAGE_SHIFT); - num_loops = howmany(size_in_bytes, 0xfffff); + num_loops = DIV_ROUND_UP(size_in_bytes, 0xfffff); r = radeon_ring_lock(rdev, ring, num_loops * 5 + 11); if (r) { DRM_ERROR("radeon: moving bo (%d).\n", r); |