summaryrefslogtreecommitdiffstats
path: root/drivers/staging/gma500/psb_fb.h
diff options
context:
space:
mode:
authorAlan Cox2011-04-13 11:37:03 +0200
committerGreg Kroah-Hartman2011-04-26 02:12:58 +0200
commit8d9c134c6e53e27f37ae3167e25190885586e538 (patch)
tree0b20985584942c83ee419c257fa3bdbdf1a7ac56 /drivers/staging/gma500/psb_fb.h
parentgma500: backlight warning (diff)
downloadkernel-qcow2-linux-8d9c134c6e53e27f37ae3167e25190885586e538.tar.gz
kernel-qcow2-linux-8d9c134c6e53e27f37ae3167e25190885586e538.tar.xz
kernel-qcow2-linux-8d9c134c6e53e27f37ae3167e25190885586e538.zip
gma500: Add a gtt allocator
At the moment we don't do any page backing for the GTT so only the stolen area pages will actually work. That is fine for our initial framebuffer and a bit of testing but will need resolution (including alternate mmap methods and the like for s/g areas) eventually. Rather than use some of the overcomplex stuff in the DRM we use the existing Linux resource allocators to hand out framebuffers and the like. This also has the nice result that /proc/iomem shows the allocations. 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_fb.h')
-rw-r--r--drivers/staging/gma500/psb_fb.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/gma500/psb_fb.h b/drivers/staging/gma500/psb_fb.h
index b4fab9262db5..b943a9fb9b92 100644
--- a/drivers/staging/gma500/psb_fb.h
+++ b/drivers/staging/gma500/psb_fb.h
@@ -28,16 +28,11 @@
#include "psb_drv.h"
-/*IMG Headers*/
-/*#include "servicesint.h"*/
-
struct psb_framebuffer {
struct drm_framebuffer base;
struct address_space *addr_space;
- struct ttm_buffer_object *bo;
- struct fb_info * fbdev;
- /* struct ttm_bo_kmap_obj kmap; */
- void *pvrBO; /* FIXME: sort this out */
+ struct fb_info *fbdev;
+ struct gtt_range *mem;
void * hKernelMemInfo;
uint32_t size;
uint32_t offset;
@@ -45,15 +40,13 @@ struct psb_framebuffer {
struct psb_fbdev {
struct drm_fb_helper psb_fb_helper;
- struct psb_framebuffer * pfb;
+ struct psb_framebuffer *pfb;
};
#define to_psb_fb(x) container_of(x, struct psb_framebuffer, base)
-
extern int psb_intel_connector_clones(struct drm_device *dev, int type_mask);
-
#endif