diff options
| author | Alan Cox <alan@linux.jf.intel.com> | 2011-04-19 15:27:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 17:13:48 -0700 |
| commit | 0dfac1ceb48d86008222a7846ba9e8a9403a907c (patch) | |
| tree | 196a1867c0453d30939913e1e0cd3e455652df3d /drivers/staging/gma500/psb_intel_drv.h | |
| parent | 6a62730c7a5278c73eaaac6c9510820c86f4a6f9 (diff) | |
| download | op-kernel-dev-0dfac1ceb48d86008222a7846ba9e8a9403a907c.zip op-kernel-dev-0dfac1ceb48d86008222a7846ba9e8a9403a907c.tar.gz | |
gma500: Begin the GEMification of the cursor code
Do a first pass over the cursor code and rework it to use GEM objects for
the cursor buffer as we need.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_intel_drv.h')
| -rw-r--r-- | drivers/staging/gma500/psb_intel_drv.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/staging/gma500/psb_intel_drv.h b/drivers/staging/gma500/psb_intel_drv.h index f6229c5..6006ddd 100644 --- a/drivers/staging/gma500/psb_intel_drv.h +++ b/drivers/staging/gma500/psb_intel_drv.h @@ -76,13 +76,7 @@ struct psb_intel_mode_device { /* * Abstracted memory manager operations */ - void *(*bo_from_handle) (struct drm_device *dev, - struct drm_file *file_priv, - unsigned int handle); - size_t(*bo_size) (struct drm_device *dev, void *bo); size_t(*bo_offset) (struct drm_device *dev, void *bo); - int (*bo_pin_for_scanout) (struct drm_device *dev, void *bo); - int (*bo_unpin_for_scanout) (struct drm_device *dev, void *bo); /* * Cursor @@ -156,11 +150,8 @@ struct psb_intel_crtc { /* a mode_set for fbdev users on this crtc */ struct drm_mode_set mode_set; - /* current bo we scanout from */ - void *scanout_bo; - - /* current bo we cursor from */ - void *cursor_bo; + /* GEM object that holds our cursor */ + struct drm_gem_object *cursor_obj; struct drm_display_mode saved_mode; struct drm_display_mode saved_adjusted_mode; |
