diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 03698b6c806c..9b3f565fd8d7 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c | |||
@@ -383,18 +383,6 @@ size_t omap_gem_mmap_size(struct drm_gem_object *obj) | |||
383 | return size; | 383 | return size; |
384 | } | 384 | } |
385 | 385 | ||
386 | /* get tiled size, returns -EINVAL if not tiled buffer */ | ||
387 | int omap_gem_tiled_size(struct drm_gem_object *obj, uint16_t *w, uint16_t *h) | ||
388 | { | ||
389 | struct omap_gem_object *omap_obj = to_omap_bo(obj); | ||
390 | if (omap_obj->flags & OMAP_BO_TILED) { | ||
391 | *w = omap_obj->width; | ||
392 | *h = omap_obj->height; | ||
393 | return 0; | ||
394 | } | ||
395 | return -EINVAL; | ||
396 | } | ||
397 | |||
398 | /* ----------------------------------------------------------------------------- | 386 | /* ----------------------------------------------------------------------------- |
399 | * Fault Handling | 387 | * Fault Handling |
400 | */ | 388 | */ |
@@ -661,7 +649,8 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev, | |||
661 | { | 649 | { |
662 | union omap_gem_size gsize; | 650 | union omap_gem_size gsize; |
663 | 651 | ||
664 | args->pitch = align_pitch(0, args->width, args->bpp); | 652 | args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8); |
653 | |||
665 | args->size = PAGE_ALIGN(args->pitch * args->height); | 654 | args->size = PAGE_ALIGN(args->pitch * args->height); |
666 | 655 | ||
667 | gsize = (union omap_gem_size){ | 656 | gsize = (union omap_gem_size){ |