Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / drivers / gpu / drm / omapdrm / omap_gem.c

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 0dbd0f03f9bd36963acd2b36bd64010df6bbd95f..505dee0db973da8f13918dff36f4791adee52427 100644 (file)
--- 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)
        return size;
 }
 
-/* get tiled size, returns -EINVAL if not tiled buffer */
-int omap_gem_tiled_size(struct drm_gem_object *obj, uint16_t *w, uint16_t *h)
-{
-       struct omap_gem_object *omap_obj = to_omap_bo(obj);
-       if (omap_obj->flags & OMAP_BO_TILED) {
-               *w = omap_obj->width;
-               *h = omap_obj->height;
-               return 0;
-       }
-       return -EINVAL;
-}
-
 /* -----------------------------------------------------------------------------
  * Fault Handling
  */
@@ -661,7 +649,8 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 {
        union omap_gem_size gsize;
 
-       args->pitch = align_pitch(0, args->width, args->bpp);
+       args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
+
        args->size = PAGE_ALIGN(args->pitch * args->height);
 
        gsize = (union omap_gem_size){