diff options
| author | Alan Cox <alan@linux.jf.intel.com> | 2011-04-19 15:27:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 17:13:48 -0700 |
| commit | 6a62730c7a5278c73eaaac6c9510820c86f4a6f9 (patch) | |
| tree | 76485562b34e85d8a79eba07ab08276b13824a62 /drivers/staging/gma500/psb_intel_display.c | |
| parent | f20ee24445b54be28cae8609c4194fb400377c63 (diff) | |
| download | op-kernel-dev-6a62730c7a5278c73eaaac6c9510820c86f4a6f9.zip op-kernel-dev-6a62730c7a5278c73eaaac6c9510820c86f4a6f9.tar.gz | |
gma500: Add support for inserting and removing pages from the GART
There are two chunks of code we need to do this. The first one is the code
to insert and remove the pages from the GART, the second is the code to build
page table lists from the GEM object. Surprisingly this latter one doesn't seem
to have a nice GEM helper.
While we are at it we can begin dismantling the semi redundant struct pg,
and finish pruning out the old now unused gtt code as well as the last bits
of helper glue from the old driver base.
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_display.c')
| -rw-r--r-- | drivers/staging/gma500/psb_intel_display.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index b462f32..6e14657 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -1014,6 +1014,8 @@ static void psb_intel_crtc_restore(struct drm_crtc *crtc) REG_WRITE(paletteReg + (i << 2), crtc_state->savePalette[i]); } +#if 0 +/* FIXME */ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, uint32_t handle, @@ -1092,7 +1094,7 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc, addr = page_offset << PAGE_SHIFT; - addr += pg->stolen_base; + addr += dev_priv->stolen_base; psb_intel_crtc->cursor_addr = addr; @@ -1146,6 +1148,7 @@ static int psb_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) } return 0; } +#endif static void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, uint32_t type, uint32_t size) @@ -1329,8 +1332,10 @@ static const struct drm_crtc_helper_funcs psb_intel_helper_funcs = { const struct drm_crtc_funcs psb_intel_crtc_funcs = { .save = psb_intel_crtc_save, .restore = psb_intel_crtc_restore, +/* FIXME .cursor_set = psb_intel_crtc_cursor_set, .cursor_move = psb_intel_crtc_cursor_move, +*/ .gamma_set = psb_intel_crtc_gamma_set, .set_config = psb_crtc_set_config, .destroy = psb_intel_crtc_destroy, |
