summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2011-10-25 16:32:34 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2011-12-22 00:33:15 +0100
commitfdc0b8a63c1124bb025a2846d41531a123845740 (patch)
tree3913d201022d789970b6d07355864fece7455ff3 /include/drm
parentMerge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next (diff)
downloadlinux-fdc0b8a63c1124bb025a2846d41531a123845740.tar.xz
linux-fdc0b8a63c1124bb025a2846d41531a123845740.zip
drm/sis: track obj->drm_fd relations in the driver
By attach a driver private struct to each open drm fd. Because we steal the owner_list from drm_sman until things settle, use list_move instead of list_add. This requires to export a drm_sman function temporarily before drm_sman will die for real completely. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_sman.h1
-rw-r--r--include/drm/sis_drm.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/include/drm/drm_sman.h b/include/drm/drm_sman.h
index 08ecf83ad5d4..3b65ccfd1400 100644
--- a/include/drm/drm_sman.h
+++ b/include/drm/drm_sman.h
@@ -146,6 +146,7 @@ extern struct drm_memblock_item *drm_sman_alloc(struct drm_sman * sman,
*/
extern int drm_sman_free_key(struct drm_sman * sman, unsigned int key);
+extern void drm_sman_free(struct drm_memblock_item *item);
/*
* returns 1 iff there are no stale memory blocks associated with this owner.
diff --git a/include/drm/sis_drm.h b/include/drm/sis_drm.h
index 30f7b3827466..035b804dda6d 100644
--- a/include/drm/sis_drm.h
+++ b/include/drm/sis_drm.h
@@ -64,4 +64,8 @@ typedef struct {
unsigned int offset, size;
} drm_sis_fb_t;
+struct sis_file_private {
+ struct list_head obj_list;
+};
+
#endif /* __SIS_DRM_H__ */