aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-04-27 00:03:39 +0100
committerThomas White <taw@bitwiz.org.uk>2009-04-27 00:03:39 +0100
commit606179ac4f81f708aeddaa0320ca7db28ba7c476 (patch)
tree70bd47ab52c47d9861d839d21966d34b764de74a /drivers/gpu/drm
parentc537af849a1acd1a4c6f404e33439c42acd44c99 (diff)
Kernel handling of command queue
This adds handling of Glamo's ring buffer at the kernel level, to be accessed via ioctl DRM_GLAMO_CMDBUF. Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/drm_drv.c5
-rw-r--r--drivers/gpu/drm/drm_stub.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 30546a72d75..4bc5cab825b 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -302,13 +302,14 @@ EXPORT_SYMBOL(drm_init);
*
*/
-int drm_platform_init(struct drm_driver *driver, struct platform_device *pdev)
+int drm_platform_init(struct drm_driver *driver, struct platform_device *pdev,
+ void *priv)
{
DRM_DEBUG("\n");
INIT_LIST_HEAD(&driver->device_list);
- return drm_get_platform_dev(pdev, driver);
+ return drm_get_platform_dev(pdev, driver, priv);
}
EXPORT_SYMBOL(drm_platform_init);
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index e8aa423bd9b..5f392b7be23 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -434,7 +434,7 @@ err_g1:
* \sa drm_get_dev
*/
int drm_get_platform_dev(struct platform_device *pdev,
- struct drm_driver *driver)
+ struct drm_driver *driver, void *priv)
{
struct drm_device *dev;
int ret;
@@ -446,6 +446,7 @@ int drm_get_platform_dev(struct platform_device *pdev,
dev = drm_calloc(1, sizeof(*dev), DRM_MEM_STUB);
if (!dev)
return -ENOMEM;
+ dev->dev_private = priv;
if ((ret = drm_fill_in_dev(dev, NULL, NULL, driver))) {
printk(KERN_ERR "DRM: Fill_in_dev failed.\n");