| Message ID | 1351524335-21642-1-git-send-email-damien.lespiau@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi 2012/10/29 Damien Lespiau <damien.lespiau@gmail.com>: > From: Damien Lespiau <damien.lespiau@intel.com> > > Instead of writing to the DSP_ADDR ourselves. This will do the right > thing on gen >= 4 as well. > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> I hope this will allow us to close bugs... Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/intel_tv.c | 7 ++----- > 1 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c > index 62bb048..86d5c20 100644 > --- a/drivers/gpu/drm/i915/intel_tv.c > +++ b/drivers/gpu/drm/i915/intel_tv.c > @@ -1088,13 +1088,11 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, > int dspcntr_reg = DSPCNTR(intel_crtc->plane); > int pipeconf = I915_READ(pipeconf_reg); > int dspcntr = I915_READ(dspcntr_reg); > - int dspbase_reg = DSPADDR(intel_crtc->plane); > int xpos = 0x0, ypos = 0x0; > unsigned int xsize, ysize; > /* Pipe must be off here */ > I915_WRITE(dspcntr_reg, dspcntr & ~DISPLAY_PLANE_ENABLE); > - /* Flush the plane changes */ > - I915_WRITE(dspbase_reg, I915_READ(dspbase_reg)); > + intel_flush_display_plane(dev_priv, intel_crtc->plane); > > /* Wait for vblank for the disable to take effect */ > if (IS_GEN2(dev)) > @@ -1123,8 +1121,7 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, > > I915_WRITE(pipeconf_reg, pipeconf); > I915_WRITE(dspcntr_reg, dspcntr); > - /* Flush the plane changes */ > - I915_WRITE(dspbase_reg, I915_READ(dspbase_reg)); > + intel_flush_display_plane(dev_priv, intel_crtc->plane); > } > > j = 0; > -- > 1.7.7.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Oct 29, 2012 at 05:58:49PM -0200, Paulo Zanoni wrote: > Hi > > 2012/10/29 Damien Lespiau <damien.lespiau@gmail.com>: > > From: Damien Lespiau <damien.lespiau@intel.com> > > > > Instead of writing to the DSP_ADDR ourselves. This will do the right > > thing on gen >= 4 as well. > > > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > > I hope this will allow us to close bugs... > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 62bb048..86d5c20 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1088,13 +1088,11 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, int dspcntr_reg = DSPCNTR(intel_crtc->plane); int pipeconf = I915_READ(pipeconf_reg); int dspcntr = I915_READ(dspcntr_reg); - int dspbase_reg = DSPADDR(intel_crtc->plane); int xpos = 0x0, ypos = 0x0; unsigned int xsize, ysize; /* Pipe must be off here */ I915_WRITE(dspcntr_reg, dspcntr & ~DISPLAY_PLANE_ENABLE); - /* Flush the plane changes */ - I915_WRITE(dspbase_reg, I915_READ(dspbase_reg)); + intel_flush_display_plane(dev_priv, intel_crtc->plane); /* Wait for vblank for the disable to take effect */ if (IS_GEN2(dev)) @@ -1123,8 +1121,7 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, I915_WRITE(pipeconf_reg, pipeconf); I915_WRITE(dspcntr_reg, dspcntr); - /* Flush the plane changes */ - I915_WRITE(dspbase_reg, I915_READ(dspbase_reg)); + intel_flush_display_plane(dev_priv, intel_crtc->plane); } j = 0;