diff options
| author | Alan Cox | 2011-11-29 23:21:03 +0100 |
|---|---|---|
| committer | Dave Airlie | 2011-12-06 10:55:33 +0100 |
| commit | a746092b679e6045dae91ceacb9abc6c83e38e0e (patch) | |
| tree | f1cc7a4da7f183dd5b2dab52ba4fabe7cb420fd9 /drivers/gpu/drm/gma500/oaktrail_crtc.c | |
| parent | gma500: Add VBLANK support for Poulsbo hardware (diff) | |
| download | kernel-qcow2-linux-a746092b679e6045dae91ceacb9abc6c83e38e0e.tar.gz kernel-qcow2-linux-a746092b679e6045dae91ceacb9abc6c83e38e0e.tar.xz kernel-qcow2-linux-a746092b679e6045dae91ceacb9abc6c83e38e0e.zip | |
gma500: do a pass over the FIXME tags
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/oaktrail_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_crtc.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c index 7f9c791fbe78..8e15b5af1213 100644 --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c @@ -521,12 +521,11 @@ int oaktrail_pipe_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { struct drm_device *dev = crtc->dev; - /* 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); int pipe = psb_intel_crtc->pipe; 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); int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE; @@ -572,15 +571,10 @@ int oaktrail_pipe_set_base(struct drm_crtc *crtc, } REG_WRITE(dspcntr_reg, dspcntr); - if (0 /* FIXMEAC - check what PSB needs */) { - REG_WRITE(dspbase, offset); - REG_READ(dspbase); - REG_WRITE(dspsurf, start); - REG_READ(dspsurf); - } else { - REG_WRITE(dspbase, start + offset); - REG_READ(dspbase); - } + REG_WRITE(dspbase, offset); + REG_READ(dspbase); + REG_WRITE(dspsurf, start); + REG_READ(dspsurf); pipe_set_base_exit: gma_power_end(dev); |