summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-07-06 12:14:00 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-10-03 13:12:44 +1000
commit9458029940ffc64bca0c5a30ea626c377205842e (patch)
treea677d326bca8e031d47b859006f9c6e71de225ad /drivers/gpu/drm/nouveau/nouveau_drv.h
parent9274f4a9ba7e70d1770e237fca16d52f27f0c728 (diff)
downloadop-kernel-dev-9458029940ffc64bca0c5a30ea626c377205842e.zip
op-kernel-dev-9458029940ffc64bca0c5a30ea626c377205842e.tar.gz
drm/nouveau: implement module init functions in nouveau_drm.c
These currently just call the existing ones in nouveau_drv.c, but will be extended in upcoming commits. This needed to be separated from the current code as there will be some header clashes until things are ported. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 2158710..d1bade3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -59,7 +59,7 @@ nouveau_fpriv(struct drm_file *file_priv)
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-#include "nouveau_drm.h"
+#include <nouveau_drm.h>
#include "nouveau_reg.h"
#include <nouveau_bios.h>
#include "nouveau_util.h"
@@ -664,6 +664,8 @@ struct drm_nouveau_private {
struct drm_device *dev;
bool noaccel;
+ void *newpriv;
+
/* the card type, takes NV_* as values */
enum nouveau_card_type card_type;
/* exact chipset, derived from NV_PMC_BOOT_0 */
OpenPOWER on IntegriCloud