drm/via: Embed via_mm in via_dri1
authorSam Ravnborg <sam@ravnborg.org>
Wed, 13 Jul 2022 17:01:53 +0000 (19:01 +0200)
committerSam Ravnborg <sam@ravnborg.org>
Sat, 16 Jul 2022 07:26:15 +0000 (09:26 +0200)
All functions was made static as there are no external users.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Kevin Brace <kevinbrace@bracecomputerlab.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220713170202.1798216-5-sam@ravnborg.org
drivers/gpu/drm/via/Makefile
drivers/gpu/drm/via/via_dri1.c
drivers/gpu/drm/via/via_drv.h
drivers/gpu/drm/via/via_mm.c [deleted file]

index be12cbf..daadc0d 100644 (file)
@@ -3,6 +3,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-via-y    := via_irq.o via_dri1.o via_mm.o via_verifier.o via_video.o via_dmablit.o
+via-y    := via_irq.o via_dri1.o via_verifier.o via_video.o via_dmablit.o
 
 obj-$(CONFIG_DRM_VIA)  +=via.o
index 2fa2235..3ebe176 100644 (file)
@@ -2,6 +2,7 @@
  * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
  * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. All Rights Reserved.
+ * Copyright 2006 Tungsten Graphics Inc., Bismarck, ND., USA.
  * Copyright 2004 Digeo, Inc., Palo Alto, CA, U.S.A. All Rights Reserved.
  * Copyright 2004 The Unichrome project. All Rights Reserved.
   *
        dev_priv->dma_low += 8;                 \
 } while (0)
 
+#define VIA_MM_ALIGN_SHIFT 4
+#define VIA_MM_ALIGN_MASK ((1 << VIA_MM_ALIGN_SHIFT) - 1)
+
+struct via_memblock {
+       struct drm_mm_node mm_node;
+       struct list_head owner_list;
+};
+
+static int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
+{
+       drm_via_agp_t *agp = data;
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+
+       mutex_lock(&dev->struct_mutex);
+       drm_mm_init(&dev_priv->agp_mm, 0, agp->size >> VIA_MM_ALIGN_SHIFT);
+
+       dev_priv->agp_initialized = 1;
+       dev_priv->agp_offset = agp->offset;
+       mutex_unlock(&dev->struct_mutex);
+
+       DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
+       return 0;
+}
+
+static int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
+{
+       drm_via_fb_t *fb = data;
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+
+       mutex_lock(&dev->struct_mutex);
+       drm_mm_init(&dev_priv->vram_mm, 0, fb->size >> VIA_MM_ALIGN_SHIFT);
+
+       dev_priv->vram_initialized = 1;
+       dev_priv->vram_offset = fb->offset;
+
+       mutex_unlock(&dev->struct_mutex);
+       DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
+
+       return 0;
+
+}
+
+static int via_final_context(struct drm_device *dev, int context)
+{
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+
+       via_release_futex(dev_priv, context);
+
+       /* Linux specific until context tracking code gets ported to BSD */
+       /* Last context, perform cleanup */
+       if (list_is_singular(&dev->ctxlist)) {
+               DRM_DEBUG("Last Context\n");
+               drm_legacy_irq_uninstall(dev);
+               via_cleanup_futex(dev_priv);
+               via_do_cleanup_map(dev);
+       }
+       return 1;
+}
+
+static void via_lastclose(struct drm_device *dev)
+{
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+
+       if (!dev_priv)
+               return;
+
+       mutex_lock(&dev->struct_mutex);
+       if (dev_priv->vram_initialized) {
+               drm_mm_takedown(&dev_priv->vram_mm);
+               dev_priv->vram_initialized = 0;
+       }
+       if (dev_priv->agp_initialized) {
+               drm_mm_takedown(&dev_priv->agp_mm);
+               dev_priv->agp_initialized = 0;
+       }
+       mutex_unlock(&dev->struct_mutex);
+}
+
+static int via_mem_alloc(struct drm_device *dev, void *data,
+                 struct drm_file *file)
+{
+       drm_via_mem_t *mem = data;
+       int retval = 0, user_key;
+       struct via_memblock *item;
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+       struct via_file_private *file_priv = file->driver_priv;
+       unsigned long tmpSize;
+
+       if (mem->type > VIA_MEM_AGP) {
+               DRM_ERROR("Unknown memory type allocation\n");
+               return -EINVAL;
+       }
+       mutex_lock(&dev->struct_mutex);
+       if (0 == ((mem->type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
+                     dev_priv->agp_initialized)) {
+               mutex_unlock(&dev->struct_mutex);
+               DRM_ERROR
+                   ("Attempt to allocate from uninitialized memory manager.\n");
+               return -EINVAL;
+       }
+
+       item = kzalloc(sizeof(*item), GFP_KERNEL);
+       if (!item) {
+               retval = -ENOMEM;
+               goto fail_alloc;
+       }
+
+       tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
+       if (mem->type == VIA_MEM_AGP)
+               retval = drm_mm_insert_node(&dev_priv->agp_mm,
+                                           &item->mm_node,
+                                           tmpSize);
+       else
+               retval = drm_mm_insert_node(&dev_priv->vram_mm,
+                                           &item->mm_node,
+                                           tmpSize);
+       if (retval)
+               goto fail_alloc;
+
+       retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
+       if (retval < 0)
+               goto fail_idr;
+       user_key = retval;
+
+       list_add(&item->owner_list, &file_priv->obj_list);
+       mutex_unlock(&dev->struct_mutex);
+
+       mem->offset = ((mem->type == VIA_MEM_VIDEO) ?
+                     dev_priv->vram_offset : dev_priv->agp_offset) +
+           ((item->mm_node.start) << VIA_MM_ALIGN_SHIFT);
+       mem->index = user_key;
+
+       return 0;
+
+fail_idr:
+       drm_mm_remove_node(&item->mm_node);
+fail_alloc:
+       kfree(item);
+       mutex_unlock(&dev->struct_mutex);
+
+       mem->offset = 0;
+       mem->size = 0;
+       mem->index = 0;
+       DRM_DEBUG("Video memory allocation failed\n");
+
+       return retval;
+}
+
+static int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
+{
+       drm_via_private_t *dev_priv = dev->dev_private;
+       drm_via_mem_t *mem = data;
+       struct via_memblock *obj;
+
+       mutex_lock(&dev->struct_mutex);
+       obj = idr_find(&dev_priv->object_idr, mem->index);
+       if (obj == NULL) {
+               mutex_unlock(&dev->struct_mutex);
+               return -EINVAL;
+       }
+
+       idr_remove(&dev_priv->object_idr, mem->index);
+       list_del(&obj->owner_list);
+       drm_mm_remove_node(&obj->mm_node);
+       kfree(obj);
+       mutex_unlock(&dev->struct_mutex);
+
+       DRM_DEBUG("free = 0x%lx\n", mem->index);
+
+       return 0;
+}
+
+
+static void via_reclaim_buffers_locked(struct drm_device *dev,
+                               struct drm_file *file)
+{
+       struct via_file_private *file_priv = file->driver_priv;
+       struct via_memblock *entry, *next;
+
+       if (!(dev->master && file->master->lock.hw_lock))
+               return;
+
+       drm_legacy_idlelock_take(&file->master->lock);
+
+       mutex_lock(&dev->struct_mutex);
+       if (list_empty(&file_priv->obj_list)) {
+               mutex_unlock(&dev->struct_mutex);
+               drm_legacy_idlelock_release(&file->master->lock);
+
+               return;
+       }
+
+       via_driver_dma_quiescent(dev);
+
+       list_for_each_entry_safe(entry, next, &file_priv->obj_list,
+                                owner_list) {
+               list_del(&entry->owner_list);
+               drm_mm_remove_node(&entry->mm_node);
+               kfree(entry);
+       }
+       mutex_unlock(&dev->struct_mutex);
+
+       drm_legacy_idlelock_release(&file->master->lock);
+
+       return;
+}
+
 static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)
 {
        drm_via_private_t *dev_priv = dev->dev_private;
index 4eaad17..c1a5fdf 100644 (file)
@@ -183,17 +183,12 @@ do {                                                              \
        remove_wait_queue(&(queue), &entry);                    \
 } while (0)
 
-extern int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern int via_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_dma_blit_sync(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv);
 
 extern int via_init_context(struct drm_device *dev, int context);
-extern int via_final_context(struct drm_device *dev, int context);
 
 extern int via_do_cleanup_map(struct drm_device *dev);
 extern u32 via_get_vblank_counter(struct drm_device *dev, unsigned int pipe);
@@ -212,10 +207,6 @@ extern void via_init_futex(drm_via_private_t *dev_priv);
 extern void via_cleanup_futex(drm_via_private_t *dev_priv);
 extern void via_release_futex(drm_via_private_t *dev_priv, int context);
 
-extern void via_reclaim_buffers_locked(struct drm_device *dev,
-                                      struct drm_file *file_priv);
-extern void via_lastclose(struct drm_device *dev);
-
 extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);
 extern void via_init_dmablit(struct drm_device *dev);
 
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
deleted file mode 100644 (file)
index c9afa1a..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright 2006 Tungsten Graphics Inc., Bismarck, ND., USA.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-/*
- * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
- */
-
-#include <linux/slab.h>
-
-#include <drm/drm_device.h>
-#include <drm/drm_file.h>
-#include <drm/via_drm.h>
-
-#include "via_drv.h"
-
-#define VIA_MM_ALIGN_SHIFT 4
-#define VIA_MM_ALIGN_MASK ((1 << VIA_MM_ALIGN_SHIFT) - 1)
-
-struct via_memblock {
-       struct drm_mm_node mm_node;
-       struct list_head owner_list;
-};
-
-int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-       drm_via_agp_t *agp = data;
-       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-
-       mutex_lock(&dev->struct_mutex);
-       drm_mm_init(&dev_priv->agp_mm, 0, agp->size >> VIA_MM_ALIGN_SHIFT);
-
-       dev_priv->agp_initialized = 1;
-       dev_priv->agp_offset = agp->offset;
-       mutex_unlock(&dev->struct_mutex);
-
-       DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
-       return 0;
-}
-
-int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-       drm_via_fb_t *fb = data;
-       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-
-       mutex_lock(&dev->struct_mutex);
-       drm_mm_init(&dev_priv->vram_mm, 0, fb->size >> VIA_MM_ALIGN_SHIFT);
-
-       dev_priv->vram_initialized = 1;
-       dev_priv->vram_offset = fb->offset;
-
-       mutex_unlock(&dev->struct_mutex);
-       DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
-
-       return 0;
-
-}
-
-int via_final_context(struct drm_device *dev, int context)
-{
-       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-
-       via_release_futex(dev_priv, context);
-
-       /* Linux specific until context tracking code gets ported to BSD */
-       /* Last context, perform cleanup */
-       if (list_is_singular(&dev->ctxlist)) {
-               DRM_DEBUG("Last Context\n");
-               drm_legacy_irq_uninstall(dev);
-               via_cleanup_futex(dev_priv);
-               via_do_cleanup_map(dev);
-       }
-       return 1;
-}
-
-void via_lastclose(struct drm_device *dev)
-{
-       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-
-       if (!dev_priv)
-               return;
-
-       mutex_lock(&dev->struct_mutex);
-       if (dev_priv->vram_initialized) {
-               drm_mm_takedown(&dev_priv->vram_mm);
-               dev_priv->vram_initialized = 0;
-       }
-       if (dev_priv->agp_initialized) {
-               drm_mm_takedown(&dev_priv->agp_mm);
-               dev_priv->agp_initialized = 0;
-       }
-       mutex_unlock(&dev->struct_mutex);
-}
-
-int via_mem_alloc(struct drm_device *dev, void *data,
-                 struct drm_file *file)
-{
-       drm_via_mem_t *mem = data;
-       int retval = 0, user_key;
-       struct via_memblock *item;
-       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-       struct via_file_private *file_priv = file->driver_priv;
-       unsigned long tmpSize;
-
-       if (mem->type > VIA_MEM_AGP) {
-               DRM_ERROR("Unknown memory type allocation\n");
-               return -EINVAL;
-       }
-       mutex_lock(&dev->struct_mutex);
-       if (0 == ((mem->type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
-                     dev_priv->agp_initialized)) {
-               mutex_unlock(&dev->struct_mutex);
-               DRM_ERROR
-                   ("Attempt to allocate from uninitialized memory manager.\n");
-               return -EINVAL;
-       }
-
-       item = kzalloc(sizeof(*item), GFP_KERNEL);
-       if (!item) {
-               retval = -ENOMEM;
-               goto fail_alloc;
-       }
-
-       tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
-       if (mem->type == VIA_MEM_AGP)
-               retval = drm_mm_insert_node(&dev_priv->agp_mm,
-                                           &item->mm_node,
-                                           tmpSize);
-       else
-               retval = drm_mm_insert_node(&dev_priv->vram_mm,
-                                           &item->mm_node,
-                                           tmpSize);
-       if (retval)
-               goto fail_alloc;
-
-       retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
-       if (retval < 0)
-               goto fail_idr;
-       user_key = retval;
-
-       list_add(&item->owner_list, &file_priv->obj_list);
-       mutex_unlock(&dev->struct_mutex);
-
-       mem->offset = ((mem->type == VIA_MEM_VIDEO) ?
-                     dev_priv->vram_offset : dev_priv->agp_offset) +
-           ((item->mm_node.start) << VIA_MM_ALIGN_SHIFT);
-       mem->index = user_key;
-
-       return 0;
-
-fail_idr:
-       drm_mm_remove_node(&item->mm_node);
-fail_alloc:
-       kfree(item);
-       mutex_unlock(&dev->struct_mutex);
-
-       mem->offset = 0;
-       mem->size = 0;
-       mem->index = 0;
-       DRM_DEBUG("Video memory allocation failed\n");
-
-       return retval;
-}
-
-int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-       drm_via_private_t *dev_priv = dev->dev_private;
-       drm_via_mem_t *mem = data;
-       struct via_memblock *obj;
-
-       mutex_lock(&dev->struct_mutex);
-       obj = idr_find(&dev_priv->object_idr, mem->index);
-       if (obj == NULL) {
-               mutex_unlock(&dev->struct_mutex);
-               return -EINVAL;
-       }
-
-       idr_remove(&dev_priv->object_idr, mem->index);
-       list_del(&obj->owner_list);
-       drm_mm_remove_node(&obj->mm_node);
-       kfree(obj);
-       mutex_unlock(&dev->struct_mutex);
-
-       DRM_DEBUG("free = 0x%lx\n", mem->index);
-
-       return 0;
-}
-
-
-void via_reclaim_buffers_locked(struct drm_device *dev,
-                               struct drm_file *file)
-{
-       struct via_file_private *file_priv = file->driver_priv;
-       struct via_memblock *entry, *next;
-
-       if (!(dev->master && file->master->lock.hw_lock))
-               return;
-
-       drm_legacy_idlelock_take(&file->master->lock);
-
-       mutex_lock(&dev->struct_mutex);
-       if (list_empty(&file_priv->obj_list)) {
-               mutex_unlock(&dev->struct_mutex);
-               drm_legacy_idlelock_release(&file->master->lock);
-
-               return;
-       }
-
-       via_driver_dma_quiescent(dev);
-
-       list_for_each_entry_safe(entry, next, &file_priv->obj_list,
-                                owner_list) {
-               list_del(&entry->owner_list);
-               drm_mm_remove_node(&entry->mm_node);
-               kfree(entry);
-       }
-       mutex_unlock(&dev->struct_mutex);
-
-       drm_legacy_idlelock_release(&file->master->lock);
-
-       return;
-}