[RFC 18/21] DRM: Add VIA drm driver

2013-06-08 Thread James Simmons

commit 589665935a7ec7c29103c9ea4eb1d0ffc4b918d5
Author: James Simmons 
Date:   Sat Jun 8 12:15:30 2013 -0400

via: New GEM/TTM kms ioctls

New ioctls to allow userland to allocate TTM/GEM buffer objects. Obsolete
UMS ioctls.

Signed-Off-by: James Simmons 

diff --git a/drivers/gpu/drm/via/via_ioc32.c b/drivers/gpu/drm/via/via_ioc32.c
new file mode 100644
index 000..03b8508
--- /dev/null
+++ b/drivers/gpu/drm/via/via_ioc32.c
@@ -0,0 +1,202 @@
+/*
+ * 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 
+ */
+
+#include "drmP.h"
+#include "via_drv.h"
+
+static int
+via_getparam(struct drm_device *dev, void *data,
+   struct drm_file *filp)
+{
+   struct drm_via_private *dev_priv = dev->dev_private;
+   struct drm_via_param *args = data;
+   int ret = 0;
+
+   switch (args->param) {
+   case VIA_PARAM_CHIPSET_ID:
+   args->value = dev->pci_device;
+   break;
+   case VIA_PARAM_REVISION_ID:
+   args->value = dev_priv->revision;
+   break;
+   default:
+   ret = -EINVAL;
+   break;
+   }
+   return ret;
+}
+
+/* Not yet supported */
+static int
+via_setparam(struct drm_device *dev, void *data,
+   struct drm_file *filp)
+{
+   return -EINVAL;
+}
+
+static int
+via_gem_alloc(struct drm_device *dev, void *data,
+   struct drm_file *filp)
+{
+   struct drm_via_private *dev_priv = dev->dev_private;
+   struct drm_via_gem_create *args = data;
+   struct drm_gem_object *obj;
+   int ret = -ENOMEM;
+
+   obj = ttm_gem_create(dev, _priv->bdev, args->domains, false,
+   args->alignment, PAGE_SIZE, args->size);
+   if (obj && obj->driver_private) {
+   ret = drm_gem_handle_create(filp, obj, >handle);
+   /* drop reference from allocate - handle holds it now */
+   drm_gem_object_unreference_unlocked(obj);
+   if (!ret) {
+   struct ttm_buffer_object *bo = obj->driver_private;
+
+   args->domains = bo->mem.placement & TTM_PL_MASK_MEM;
+   args->map_handle = bo->addr_space_offset;
+   args->offset = bo->offset;
+   args->size = bo->mem.size;
+
+   obj->read_domains = obj->write_domain = args->domains;
+   }
+   }
+   return ret;
+}
+
+static int
+via_gem_state(struct drm_device *dev, void *data, struct drm_file *file_priv)
+{
+   struct ttm_buffer_object *bo = NULL;
+   struct drm_via_gem_create *args = data;
+   struct drm_gem_object *obj = NULL;
+   struct ttm_placement placement;
+   int ret = -EINVAL;
+
+   obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+   if (!obj || !obj->driver_private)
+   return ret;
+
+   bo = obj->driver_private;
+
+   /* Don't bother to migrate to same domain */
+   args->domains &= ~(bo->mem.placement & TTM_PL_MASK_MEM);
+   if (args->domains) {
+   ret = ttm_bo_reserve(bo, true, false, false, 0);
+   if (unlikely(ret))
+   return ret;
+
+   ttm_placement_from_domain(bo, , args->domains, 
bo->bdev);
+   ret = ttm_bo_validate(bo, , false, false);
+   ttm_bo_unreserve(bo);
+
+   if (!ret) {
+   args->domains = bo->mem.placement & TTM_PL_MASK_MEM;
+   args->map_handle = bo->addr_space_offset;
+   args->offset = bo->offset;
+   args->size = bo->mem.size;
+
+   obj->read_domains = obj->write_domain = args->domains;
+   }
+ 

[RFC 18/21] DRM: Add VIA drm driver

2013-06-08 Thread James Simmons

commit 589665935a7ec7c29103c9ea4eb1d0ffc4b918d5
Author: James Simmons jsimm...@infradead.org
Date:   Sat Jun 8 12:15:30 2013 -0400

via: New GEM/TTM kms ioctls

New ioctls to allow userland to allocate TTM/GEM buffer objects. Obsolete
UMS ioctls.

Signed-Off-by: James Simmons jsimm...@infradead.org

diff --git a/drivers/gpu/drm/via/via_ioc32.c b/drivers/gpu/drm/via/via_ioc32.c
new file mode 100644
index 000..03b8508
--- /dev/null
+++ b/drivers/gpu/drm/via/via_ioc32.c
@@ -0,0 +1,202 @@
+/*
+ * 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 drmP.h
+#include via_drv.h
+
+static int
+via_getparam(struct drm_device *dev, void *data,
+   struct drm_file *filp)
+{
+   struct drm_via_private *dev_priv = dev-dev_private;
+   struct drm_via_param *args = data;
+   int ret = 0;
+
+   switch (args-param) {
+   case VIA_PARAM_CHIPSET_ID:
+   args-value = dev-pci_device;
+   break;
+   case VIA_PARAM_REVISION_ID:
+   args-value = dev_priv-revision;
+   break;
+   default:
+   ret = -EINVAL;
+   break;
+   }
+   return ret;
+}
+
+/* Not yet supported */
+static int
+via_setparam(struct drm_device *dev, void *data,
+   struct drm_file *filp)
+{
+   return -EINVAL;
+}
+
+static int
+via_gem_alloc(struct drm_device *dev, void *data,
+   struct drm_file *filp)
+{
+   struct drm_via_private *dev_priv = dev-dev_private;
+   struct drm_via_gem_create *args = data;
+   struct drm_gem_object *obj;
+   int ret = -ENOMEM;
+
+   obj = ttm_gem_create(dev, dev_priv-bdev, args-domains, false,
+   args-alignment, PAGE_SIZE, args-size);
+   if (obj  obj-driver_private) {
+   ret = drm_gem_handle_create(filp, obj, args-handle);
+   /* drop reference from allocate - handle holds it now */
+   drm_gem_object_unreference_unlocked(obj);
+   if (!ret) {
+   struct ttm_buffer_object *bo = obj-driver_private;
+
+   args-domains = bo-mem.placement  TTM_PL_MASK_MEM;
+   args-map_handle = bo-addr_space_offset;
+   args-offset = bo-offset;
+   args-size = bo-mem.size;
+
+   obj-read_domains = obj-write_domain = args-domains;
+   }
+   }
+   return ret;
+}
+
+static int
+via_gem_state(struct drm_device *dev, void *data, struct drm_file *file_priv)
+{
+   struct ttm_buffer_object *bo = NULL;
+   struct drm_via_gem_create *args = data;
+   struct drm_gem_object *obj = NULL;
+   struct ttm_placement placement;
+   int ret = -EINVAL;
+
+   obj = drm_gem_object_lookup(dev, file_priv, args-handle);
+   if (!obj || !obj-driver_private)
+   return ret;
+
+   bo = obj-driver_private;
+
+   /* Don't bother to migrate to same domain */
+   args-domains = ~(bo-mem.placement  TTM_PL_MASK_MEM);
+   if (args-domains) {
+   ret = ttm_bo_reserve(bo, true, false, false, 0);
+   if (unlikely(ret))
+   return ret;
+
+   ttm_placement_from_domain(bo, placement, args-domains, 
bo-bdev);
+   ret = ttm_bo_validate(bo, placement, false, false);
+   ttm_bo_unreserve(bo);
+
+   if (!ret) {
+   args-domains = bo-mem.placement  TTM_PL_MASK_MEM;
+   args-map_handle = bo-addr_space_offset;
+   args-offset = bo-offset;
+   args-size = bo-mem.size;
+
+   obj-read_domains =