1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index d908321b94ce..18e07338c6e5 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -234,13 +234,8 @@ int rockchip_gem_dumb_create(struct drm_file *file_priv,
         /*
          * align to 64 bytes since Mali requires it.
          */
-        min_pitch = ALIGN(min_pitch, 64);
-
-        if (args->pitch < min_pitch)
-                args->pitch = min_pitch;
-
-        if (args->size < args->pitch * args->height)
-                args->size = args->pitch * args->height;
+        args->pitch = ALIGN(min_pitch, 64);
+        args->size = args->pitch * args->height;
 
         rk_obj = rockchip_gem_create_with_handle(file_priv, dev, args->size,
                                                  &args->handle);