aboutsummaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 14:24:46 +0100
committerDave Airlie <airlied@redhat.com>2014-01-14 12:38:32 +1000
commitb04a590623661132fbafdda53a6566b227dc39cf (patch)
tree864907c8b2e278c3646d0219f241d42f11372815 /include/drm
parentfaf096ffba2b1a4066e6d6dcd1243cc5f3d1fb23 (diff)
downloadlinux-linaro-stable-b04a590623661132fbafdda53a6566b227dc39cf.tar.gz
drm: store the gem vma offset manager in a typed pointer
This was hidden in a generic void * dev->mm_private. But only ever used for gem. But thanks to this fake generic pretension no one noticed that Rob's drm drivers are now all broken. So just give the offset manager a type pointer and fix up msm, omapdrm and tilcdc. v2: Fixup compile fail. v3: Fixup rebase fail that David spotted. Cc: David Herrmann <dh.herrmann@gmail.com> Cc: Rob Clark <robdclark@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 2fe9b5d5d162..63eab2b72ee7 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -622,13 +622,6 @@ struct drm_ati_pcigart_info {
};
/**
- * GEM specific mm private for tracking GEM objects
- */
-struct drm_gem_mm {
- struct drm_vma_offset_manager vma_manager;
-};
-
-/**
* This structure defines the drm_mm memory object, which will be used by the
* DRM for its buffer objects.
*/
@@ -1185,7 +1178,6 @@ struct drm_device {
struct drm_sg_mem *sg; /**< Scatter gather memory */
unsigned int num_crtcs; /**< Number of CRTCs on this device */
void *dev_private; /**< device private data */
- void *mm_private;
struct address_space *dev_mapping;
struct drm_sigdata sigdata; /**< For block_all_signals */
sigset_t sigmask;
@@ -1203,6 +1195,7 @@ struct drm_device {
/*@{ */
struct mutex object_name_lock;
struct idr object_name_idr;
+ struct drm_vma_offset_manager *vma_offset_manager;
/*@} */
int switch_power_state;