projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/etnaviv: add clock gating workaround for GC7000 r6202
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
drm_agpsupport.c
diff --git
a/drivers/gpu/drm/drm_agpsupport.c
b/drivers/gpu/drm/drm_agpsupport.c
index
5311d03
..
a4ad6fd
100644
(file)
--- a/
drivers/gpu/drm/drm_agpsupport.c
+++ b/
drivers/gpu/drm/drm_agpsupport.c
@@
-35,9
+35,10
@@
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/slab.h>
+#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#include <asm/agp.h>
+#endif
-#include <drm/drm_agpsupport.h>
#include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include <drm/drm_file.h>
#include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include <drm/drm_file.h>
@@
-45,6
+46,8
@@
#include "drm_legacy.h"
#include "drm_legacy.h"
+#if IS_ENABLED(CONFIG_AGP)
+
/*
* Get AGP information.
*
/*
* Get AGP information.
*
@@
-53,7
+56,7
@@
* Verifies the AGP device has been initialized and acquired and fills in the
* drm_agp_info structure with the information in drm_agp_head::agp_info.
*/
* Verifies the AGP device has been initialized and acquired and fills in the
* drm_agp_info structure with the information in drm_agp_head::agp_info.
*/
-int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info)
+int drm_
legacy_
agp_info(struct drm_device *dev, struct drm_agp_info *info)
{
struct agp_kern_info *kern;
{
struct agp_kern_info *kern;
@@
-73,15
+76,15
@@
int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info)
return 0;
}
return 0;
}
-EXPORT_SYMBOL(drm_agp_info);
+EXPORT_SYMBOL(drm_
legacy_
agp_info);
-int drm_agp_info_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_info_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
struct drm_agp_info *info = data;
int err;
{
struct drm_agp_info *info = data;
int err;
- err = drm_agp_info(dev, info);
+ err = drm_
legacy_
agp_info(dev, info);
if (err)
return err;
if (err)
return err;
@@
-97,7
+100,7
@@
int drm_agp_info_ioctl(struct drm_device *dev, void *data,
* Verifies the AGP device hasn't been acquired before and calls
* \c agp_backend_acquire.
*/
* Verifies the AGP device hasn't been acquired before and calls
* \c agp_backend_acquire.
*/
-int drm_agp_acquire(struct drm_device *dev)
+int drm_
legacy_
agp_acquire(struct drm_device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev->dev);
{
struct pci_dev *pdev = to_pci_dev(dev->dev);
@@
-111,7
+114,7
@@
int drm_agp_acquire(struct drm_device *dev)
dev->agp->acquired = 1;
return 0;
}
dev->agp->acquired = 1;
return 0;
}
-EXPORT_SYMBOL(drm_agp_acquire);
+EXPORT_SYMBOL(drm_
legacy_
agp_acquire);
/*
* Acquire the AGP device (ioctl).
/*
* Acquire the AGP device (ioctl).
@@
-121,10
+124,10
@@
EXPORT_SYMBOL(drm_agp_acquire);
* Verifies the AGP device hasn't been acquired before and calls
* \c agp_backend_acquire.
*/
* Verifies the AGP device hasn't been acquired before and calls
* \c agp_backend_acquire.
*/
-int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_acquire_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
{
- return drm_
agp_acquire((struct drm_device *)
file_priv->minor->dev);
+ return drm_
legacy_agp_acquire((struct drm_device *)
file_priv->minor->dev);
}
/*
}
/*
@@
-135,7
+138,7
@@
int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
*
* Verifies the AGP device has been acquired and calls \c agp_backend_release.
*/
*
* Verifies the AGP device has been acquired and calls \c agp_backend_release.
*/
-int drm_agp_release(struct drm_device *dev)
+int drm_
legacy_
agp_release(struct drm_device *dev)
{
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
{
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
@@
-143,12
+146,12
@@
int drm_agp_release(struct drm_device *dev)
dev->agp->acquired = 0;
return 0;
}
dev->agp->acquired = 0;
return 0;
}
-EXPORT_SYMBOL(drm_agp_release);
+EXPORT_SYMBOL(drm_
legacy_
agp_release);
-int drm_agp_release_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_release_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
{
- return drm_agp_release(dev);
+ return drm_
legacy_
agp_release(dev);
}
/*
}
/*
@@
-161,7
+164,7
@@
int drm_agp_release_ioctl(struct drm_device *dev, void *data,
* Verifies the AGP device has been acquired but not enabled, and calls
* \c agp_enable.
*/
* Verifies the AGP device has been acquired but not enabled, and calls
* \c agp_enable.
*/
-int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
+int drm_
legacy_
agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
{
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
{
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
@@
-171,14
+174,14
@@
int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
dev->agp->enabled = 1;
return 0;
}
dev->agp->enabled = 1;
return 0;
}
-EXPORT_SYMBOL(drm_agp_enable);
+EXPORT_SYMBOL(drm_
legacy_
agp_enable);
-int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_enable_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
struct drm_agp_mode *mode = data;
{
struct drm_agp_mode *mode = data;
- return drm_agp_enable(dev, *mode);
+ return drm_
legacy_
agp_enable(dev, *mode);
}
/*
}
/*
@@
-189,7
+192,7
@@
int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
* Verifies the AGP device is present and has been acquired, allocates the
* memory via agp_allocate_memory() and creates a drm_agp_mem entry for it.
*/
* Verifies the AGP device is present and has been acquired, allocates the
* memory via agp_allocate_memory() and creates a drm_agp_mem entry for it.
*/
-int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
+int drm_
legacy_
agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
{
struct drm_agp_mem *entry;
struct agp_memory *memory;
{
struct drm_agp_mem *entry;
struct agp_memory *memory;
@@
-221,15
+224,15
@@
int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
return 0;
}
return 0;
}
-EXPORT_SYMBOL(drm_agp_alloc);
+EXPORT_SYMBOL(drm_
legacy_
agp_alloc);
-int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
+int drm_
legacy_
agp_alloc_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
struct drm_agp_buffer *request = data;
struct drm_file *file_priv)
{
struct drm_agp_buffer *request = data;
- return drm_agp_alloc(dev, request);
+ return drm_
legacy_
agp_alloc(dev, request);
}
/*
}
/*
@@
-241,8
+244,8
@@
int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
*
* Walks through drm_agp_head::memory until finding a matching handle.
*/
*
* Walks through drm_agp_head::memory until finding a matching handle.
*/
-static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device *dev,
- unsigned long handle)
+static struct drm_agp_mem *drm_
legacy_
agp_lookup_entry(struct drm_device *dev,
+
unsigned long handle)
{
struct drm_agp_mem *entry;
{
struct drm_agp_mem *entry;
@@
-261,14
+264,14
@@
static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device *dev,
* Verifies the AGP device is present and acquired, looks-up the AGP memory
* entry and passes it to the unbind_agp() function.
*/
* Verifies the AGP device is present and acquired, looks-up the AGP memory
* entry and passes it to the unbind_agp() function.
*/
-int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
+int drm_
legacy_
agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
{
struct drm_agp_mem *entry;
int ret;
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
{
struct drm_agp_mem *entry;
int ret;
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
- entry = drm_agp_lookup_entry(dev, request->handle);
+ entry = drm_
legacy_
agp_lookup_entry(dev, request->handle);
if (!entry || !entry->bound)
return -EINVAL;
ret = agp_unbind_memory(entry->memory);
if (!entry || !entry->bound)
return -EINVAL;
ret = agp_unbind_memory(entry->memory);
@@
-276,15
+279,15
@@
int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
entry->bound = 0;
return ret;
}
entry->bound = 0;
return ret;
}
-EXPORT_SYMBOL(drm_agp_unbind);
+EXPORT_SYMBOL(drm_
legacy_
agp_unbind);
-int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_unbind_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
struct drm_agp_binding *request = data;
{
struct drm_agp_binding *request = data;
- return drm_agp_unbind(dev, request);
+ return drm_
legacy_
agp_unbind(dev, request);
}
/*
}
/*
@@
-296,7
+299,7
@@
int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
* is currently bound into the GATT. Looks-up the AGP memory entry and passes
* it to bind_agp() function.
*/
* is currently bound into the GATT. Looks-up the AGP memory entry and passes
* it to bind_agp() function.
*/
-int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
+int drm_
legacy_
agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
{
struct drm_agp_mem *entry;
int retcode;
{
struct drm_agp_mem *entry;
int retcode;
@@
-304,7
+307,7
@@
int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
- entry = drm_agp_lookup_entry(dev, request->handle);
+ entry = drm_
legacy_
agp_lookup_entry(dev, request->handle);
if (!entry || entry->bound)
return -EINVAL;
page = DIV_ROUND_UP(request->offset, PAGE_SIZE);
if (!entry || entry->bound)
return -EINVAL;
page = DIV_ROUND_UP(request->offset, PAGE_SIZE);
@@
-316,15
+319,15
@@
int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
dev->agp->base, entry->bound);
return 0;
}
dev->agp->base, entry->bound);
return 0;
}
-EXPORT_SYMBOL(drm_agp_bind);
+EXPORT_SYMBOL(drm_
legacy_
agp_bind);
-int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_bind_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
struct drm_agp_binding *request = data;
{
struct drm_agp_binding *request = data;
- return drm_agp_bind(dev, request);
+ return drm_
legacy_
agp_bind(dev, request);
}
/*
}
/*
@@
-337,13
+340,13
@@
int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
* unbind_agp(). Frees it via free_agp() as well as the entry itself
* and unlinks from the doubly linked list it's inserted in.
*/
* unbind_agp(). Frees it via free_agp() as well as the entry itself
* and unlinks from the doubly linked list it's inserted in.
*/
-int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
+int drm_
legacy_
agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
{
struct drm_agp_mem *entry;
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
{
struct drm_agp_mem *entry;
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
- entry = drm_agp_lookup_entry(dev, request->handle);
+ entry = drm_
legacy_
agp_lookup_entry(dev, request->handle);
if (!entry)
return -EINVAL;
if (entry->bound)
if (!entry)
return -EINVAL;
if (entry->bound)
@@
-355,15
+358,15
@@
int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
kfree(entry);
return 0;
}
kfree(entry);
return 0;
}
-EXPORT_SYMBOL(drm_agp_free);
+EXPORT_SYMBOL(drm_
legacy_
agp_free);
-int drm_agp_free_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+int drm_
legacy_
agp_free_ioctl(struct drm_device *dev, void *data,
+
struct drm_file *file_priv)
{
struct drm_agp_buffer *request = data;
{
struct drm_agp_buffer *request = data;
- return drm_agp_free(dev, request);
+ return drm_
legacy_
agp_free(dev, request);
}
/*
}
/*
@@
-378,7
+381,7
@@
int drm_agp_free_ioctl(struct drm_device *dev, void *data,
* Note that final cleanup of the kmalloced structure is directly done in
* drm_pci_agp_destroy.
*/
* Note that final cleanup of the kmalloced structure is directly done in
* drm_pci_agp_destroy.
*/
-struct drm_agp_head *drm_agp_init(struct drm_device *dev)
+struct drm_agp_head *drm_
legacy_
agp_init(struct drm_device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev->dev);
struct drm_agp_head *head = NULL;
{
struct pci_dev *pdev = to_pci_dev(dev->dev);
struct drm_agp_head *head = NULL;
@@
-409,7
+412,7
@@
struct drm_agp_head *drm_agp_init(struct drm_device *dev)
return head;
}
/* Only exported for i810.ko */
return head;
}
/* Only exported for i810.ko */
-EXPORT_SYMBOL(drm_agp_init);
+EXPORT_SYMBOL(drm_
legacy_
agp_init);
/**
* drm_legacy_agp_clear - Clear AGP resource list
/**
* drm_legacy_agp_clear - Clear AGP resource list
@@
-439,8
+442,10
@@
void drm_legacy_agp_clear(struct drm_device *dev)
INIT_LIST_HEAD(&dev->agp->memory);
if (dev->agp->acquired)
INIT_LIST_HEAD(&dev->agp->memory);
if (dev->agp->acquired)
- drm_agp_release(dev);
+ drm_
legacy_
agp_release(dev);
dev->agp->acquired = 0;
dev->agp->enabled = 0;
}
dev->agp->acquired = 0;
dev->agp->enabled = 0;
}
+
+#endif