summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i915/intel_regions.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-06-03 20:59:31 -0700
committerEric Anholt <eric@anholt.net>2013-11-07 19:08:09 -0800
commitbf6591e948d95b73c5b8d10fa448ec87e9572b8e (patch)
treee11e022f27a3c8bd016dd8c377a373818ac9db4f /src/mesa/drivers/dri/i915/intel_regions.c
parent888533dcd6fe30fc0729ef4ae8fa495c69dcc629 (diff)
dri/intel: Add explicit size parameter to intel_region_alloc_for_fd
Instead of assuming that the size will be height * pitch, have the caller pass in the size explicitly. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_regions.c')
-rw-r--r--src/mesa/drivers/dri/i915/intel_regions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c
index 44f7030c712..9f5b89e80c2 100644
--- a/src/mesa/drivers/dri/i915/intel_regions.c
+++ b/src/mesa/drivers/dri/i915/intel_regions.c
@@ -209,6 +209,7 @@ struct intel_region *
intel_region_alloc_for_fd(struct intel_screen *screen,
GLuint cpp,
GLuint width, GLuint height, GLuint pitch,
+ GLuint size,
int fd, const char *name)
{
struct intel_region *region;
@@ -216,8 +217,7 @@ intel_region_alloc_for_fd(struct intel_screen *screen,
int ret;
uint32_t bit_6_swizzle, tiling;
- buffer = drm_intel_bo_gem_create_from_prime(screen->bufmgr,
- fd, height * pitch);
+ buffer = drm_intel_bo_gem_create_from_prime(screen->bufmgr, fd, size);
if (buffer == NULL)
return NULL;
ret = drm_intel_bo_get_tiling(buffer, &tiling, &bit_6_swizzle);