| Message ID | 1383753389-12763-5-git-send-email-rodrigo.vivi@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2013-11-06 at 13:56 -0200, Rodrigo Vivi wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Use the same wait_for_vblank code for CTG that we use for ILK+. > > Also fix the name of the frame counter register while at it. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 64390f3..7595d5a 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -748,10 +748,10 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, > return intel_crtc->config.cpu_transcoder; > } > > -static void ironlake_wait_for_vblank(struct drm_device *dev, int pipe) > +static void g4x_wait_for_vblank(struct drm_device *dev, int pipe) > { > struct drm_i915_private *dev_priv = dev->dev_private; > - u32 frame, frame_reg = PIPEFRAME(pipe); > + u32 frame, frame_reg = PIPE_FRMCOUNT_GM45(pipe); > > frame = I915_READ(frame_reg); > > @@ -772,8 +772,8 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe) > struct drm_i915_private *dev_priv = dev->dev_private; > int pipestat_reg = PIPESTAT(pipe); > > - if (INTEL_INFO(dev)->gen >= 5) { > - ironlake_wait_for_vblank(dev, pipe); > + if (IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) { > + g4x_wait_for_vblank(dev, pipe); > return; > } >
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 64390f3..7595d5a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -748,10 +748,10 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, return intel_crtc->config.cpu_transcoder; } -static void ironlake_wait_for_vblank(struct drm_device *dev, int pipe) +static void g4x_wait_for_vblank(struct drm_device *dev, int pipe) { struct drm_i915_private *dev_priv = dev->dev_private; - u32 frame, frame_reg = PIPEFRAME(pipe); + u32 frame, frame_reg = PIPE_FRMCOUNT_GM45(pipe); frame = I915_READ(frame_reg); @@ -772,8 +772,8 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe) struct drm_i915_private *dev_priv = dev->dev_private; int pipestat_reg = PIPESTAT(pipe); - if (INTEL_INFO(dev)->gen >= 5) { - ironlake_wait_for_vblank(dev, pipe); + if (IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) { + g4x_wait_for_vblank(dev, pipe); return; }