summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-07-24 13:27:44 -0700
committerIan Romanick <idr@us.ibm.com>2007-07-24 13:27:44 -0700
commit887cb31ee9ec04e45829500f095aa4a3bc1095ea (patch)
treef4a3a1e8fa27888728730137253cd7ac0bb87c21 /shared-core
parent46214fc3979ed60b32289ade1b8efbba1c8bf732 (diff)
Fix bug preventing X server from restarting.
The core DRM lastclose routine automatically destroys all mappings and releases SG memory. XP10 DRM and DDX assumed this data stayed around until module unload. xgi_bootstrap was reworked to recreate all these mappings. In addition, the drm_addmap for the GART backing store was moved into the kernel. This causes a change to the ioctl protocol and a version bump.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/xgi_drm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/xgi_drm.h b/shared-core/xgi_drm.h
index da2ea8b9..adce7066 100644
--- a/shared-core/xgi_drm.h
+++ b/shared-core/xgi_drm.h
@@ -49,7 +49,7 @@ struct xgi_bootstrap {
/**
* Size of PCI-e GART range in megabytes.
*/
- unsigned int gart_size;
+ struct drm_map gart;
};
@@ -113,7 +113,7 @@ struct xgi_state_info {
#define DRM_XGI_TEST_RWINKERNEL 9
#define DRM_XGI_STATE_CHANGE 10
-#define XGI_IOCTL_BOOTSTRAP DRM_IOW(DRM_COMMAND_BASE + DRM_XGI_BOOTSTRAP, struct xgi_bootstrap)
+#define XGI_IOCTL_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_XGI_BOOTSTRAP, struct xgi_bootstrap)
#define XGI_IOCTL_FB_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_XGI_FB_ALLOC, struct xgi_mem_alloc)
#define XGI_IOCTL_FB_FREE DRM_IOW(DRM_COMMAND_BASE + DRM_XGI_FB_FREE, __u32)