Merge branch 'topic/for-4.12' into for-next

[karo-tx-linux.git] / drivers / gpu / drm / sis / sis_mm.c

diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 03defda77766a9984063f8300a46415d14d32a53..1622db24cd394266bff0d00001e1f4bd271ade0a 100644 (file)
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -109,8 +109,7 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
        if (pool == AGP_TYPE) {
                retval = drm_mm_insert_node(&dev_priv->agp_mm,
                                            &item->mm_node,
-                                           mem->size, 0,
-                                           DRM_MM_SEARCH_DEFAULT);
+                                           mem->size);
                offset = item->mm_node.start;
        } else {
 #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
@@ -122,8 +121,7 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
 #else
                retval = drm_mm_insert_node(&dev_priv->vram_mm,
                                            &item->mm_node,
-                                           mem->size, 0,
-                                           DRM_MM_SEARCH_DEFAULT);
+                                           mem->size);
                offset = item->mm_node.start;
 #endif
        }