diff options
| author | Alan Cox <alan@linux.jf.intel.com> | 2011-04-19 15:28:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 17:13:49 -0700 |
| commit | ed7ea13efb753b77fc18bdf62fbf196c8e693ca6 (patch) | |
| tree | 8ff6702b835dbb98fa5bd16ab35cb364b5abbdf6 /drivers/staging/gma500/mrst_crtc.c | |
| parent | 0dfac1ceb48d86008222a7846ba9e8a9403a907c (diff) | |
| download | op-kernel-dev-ed7ea13efb753b77fc18bdf62fbf196c8e693ca6.zip op-kernel-dev-ed7ea13efb753b77fc18bdf62fbf196c8e693ca6.tar.gz | |
gma500: GEMify the frame buffer base bits
This then kills off the old bo_ interfaces
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/mrst_crtc.c')
| -rw-r--r-- | drivers/staging/gma500/mrst_crtc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/gma500/mrst_crtc.c b/drivers/staging/gma500/mrst_crtc.c index 664d0e7..e4a0c03 100644 --- a/drivers/staging/gma500/mrst_crtc.c +++ b/drivers/staging/gma500/mrst_crtc.c @@ -530,9 +530,8 @@ int mrst_pipe_set_base(struct drm_crtc *crtc, /* struct drm_i915_master_private *master_priv; */ struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc); struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb); - struct psb_intel_mode_device *mode_dev = psb_intel_crtc->mode_dev; int pipe = psb_intel_crtc->pipe; - unsigned long Start, Offset; + unsigned long start, offset; /* FIXME: check if we need this surely MRST is pipe 0 only */ int dspbase = (pipe == 0 ? DSPALINOFF : DSPBBASE); int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF); @@ -552,8 +551,8 @@ int mrst_pipe_set_base(struct drm_crtc *crtc, if (!gma_power_begin(dev, true)) return 0; - Start = mode_dev->bo_offset(dev, psbfb); - Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8); + start = psbfb->gtt->offset; + offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8); REG_WRITE(dspstride, crtc->fb->pitch); @@ -581,14 +580,14 @@ int mrst_pipe_set_base(struct drm_crtc *crtc, } REG_WRITE(dspcntr_reg, dspcntr); - DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y); + DRM_DEBUG("Writing base %08lX %08lX %d %d\n", start, offset, x, y); if (0 /* FIXMEAC - check what PSB needs */) { - REG_WRITE(dspbase, Offset); + REG_WRITE(dspbase, offset); REG_READ(dspbase); - REG_WRITE(dspsurf, Start); + REG_WRITE(dspsurf, start); REG_READ(dspsurf); } else { - REG_WRITE(dspbase, Start + Offset); + REG_WRITE(dspbase, start + offset); REG_READ(dspbase); } |
