On Fri, Sep 25, 2015 at 03:02:37PM +0300, Jani Nikula wrote:
> On Mon, 21 Sep 2015, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> >
> > v2: Hide the 945 vs. rest of gen2/3 difference in the macro
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/i915_gem_fence.c | 41 +++++++++++++++--------------------
> > drivers/gpu/drm/i915/i915_gpu_error.c | 21 +++++++-----------
> > drivers/gpu/drm/i915/i915_reg.h | 18 ++++++++++-----
> > 3 files changed, 39 insertions(+), 41 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c
> > index 6077dff..1cbfd5b 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_fence.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_fence.c
> > @@ -59,19 +59,19 @@ static void i965_write_fence_reg(struct drm_device *dev, int reg,
> > struct drm_i915_gem_object *obj)
> > {
> > struct drm_i915_private *dev_priv = dev->dev_private;
> > - int fence_reg;
> > + int fence_reg_lo, fence_reg_hi;
> > int fence_pitch_shift;
> >
> > if (INTEL_INFO(dev)->gen >= 6) {
> > - fence_reg = FENCE_REG_SANDYBRIDGE_0;
> > - fence_pitch_shift = SANDYBRIDGE_FENCE_PITCH_SHIFT;
> > + fence_reg_lo = FENCE_REG_GEN6_LO(reg);
> > + fence_reg_hi = FENCE_REG_GEN6_HI(reg);
> > + fence_pitch_shift = GEN6_FENCE_PITCH_SHIFT;
> > } else {
> > - fence_reg = FENCE_REG_965_0;
> > + fence_reg_lo = FENCE_REG_965_LO(reg);
> > + fence_reg_hi = FENCE_REG_965_HI(reg);
> > fence_pitch_shift = I965_FENCE_PITCH_SHIFT;
> > }
> >
> > - fence_reg += reg * 8;
> > -
> > /* To w/a incoherency with non-atomic 64-bit register updates,
> > * we split the 64-bit update into two 32-bit writes. In order
> > * for a partial fence not to be evaluated between writes, we
> > @@ -81,8 +81,8 @@ static void i965_write_fence_reg(struct drm_device *dev, int reg,
> > * For extra levels of paranoia, we make sure each step lands
> > * before applying the next step.
> > */
> > - I915_WRITE(fence_reg, 0);
> > - POSTING_READ(fence_reg);
> > + I915_WRITE(fence_reg_lo, 0);
> > + POSTING_READ(fence_reg_lo);
> >
> > if (obj) {
> > u32 size = i915_gem_obj_ggtt_size(obj);
> > @@ -103,14 +103,14 @@ static void i965_write_fence_reg(struct drm_device *dev, int reg,
> > val |= 1 << I965_FENCE_TILING_Y_SHIFT;
> > val |= I965_FENCE_REG_VALID;
> >
> > - I915_WRITE(fence_reg + 4, val >> 32);
> > - POSTING_READ(fence_reg + 4);
> > + I915_WRITE(fence_reg_hi, val >> 32);
> > + POSTING_READ(fence_reg_hi);
> >
> > - I915_WRITE(fence_reg + 0, val);
> > - POSTING_READ(fence_reg);
> > + I915_WRITE(fence_reg_lo, val);
> > + POSTING_READ(fence_reg_lo);
> > } else {
> > - I915_WRITE(fence_reg + 4, 0);
> > - POSTING_READ(fence_reg + 4);
> > + I915_WRITE(fence_reg_hi, 0);
> > + POSTING_READ(fence_reg_hi);
> > }
> > }
> >
> > @@ -149,13 +149,8 @@ static void i915_write_fence_reg(struct drm_device *dev, int reg,
> > } else
> > val = 0;
> >
> > - if (reg < 8)
> > - reg = FENCE_REG_830_0 + reg * 4;
> > - else
> > - reg = FENCE_REG_945_8 + (reg - 8) * 4;
> > -
> > - I915_WRITE(reg, val);
> > - POSTING_READ(reg);
> > + I915_WRITE(FENCE_REG(reg), val);
> > + POSTING_READ(FENCE_REG(reg));
> > }
> >
> > static void i830_write_fence_reg(struct drm_device *dev, int reg,
> > @@ -186,8 +181,8 @@ static void i830_write_fence_reg(struct drm_device *dev, int reg,
> > } else
> > val = 0;
> >
> > - I915_WRITE(FENCE_REG_830_0 + reg * 4, val);
> > - POSTING_READ(FENCE_REG_830_0 + reg * 4);
> > + I915_WRITE(FENCE_REG(reg), val);
> > + POSTING_READ(FENCE_REG(reg));
> > }
> >
> > inline static bool i915_gem_object_needs_mb(struct drm_i915_gem_object *obj)
> > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> > index 3379f9c..3b574c2 100644
> > --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> > @@ -786,20 +786,15 @@ static void i915_gem_record_fences(struct drm_device *dev,
> > int i;
> >
> > if (IS_GEN3(dev) || IS_GEN2(dev)) {
> > - for (i = 0; i < 8; i++)
> > - error->fence[i] = I915_READ(FENCE_REG_830_0 + (i * 4));
> > - if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
> > - for (i = 0; i < 8; i++)
> > - error->fence[i+8] = I915_READ(FENCE_REG_945_8 +
> > - (i * 4));
> > - } else if (IS_GEN5(dev) || IS_GEN4(dev))
> > - for (i = 0; i < 16; i++)
> > - error->fence[i] = I915_READ64(FENCE_REG_965_0 +
> > - (i * 8));
> > - else if (INTEL_INFO(dev)->gen >= 6)
> > for (i = 0; i < dev_priv->num_fence_regs; i++)
> > - error->fence[i] = I915_READ64(FENCE_REG_SANDYBRIDGE_0 +
> > - (i * 8));
> > + error->fence[i] = I915_READ(FENCE_REG(i));
> > + } else if (IS_GEN5(dev) || IS_GEN4(dev)) {
> > + for (i = 0; i < dev_priv->num_fence_regs; i++)
> > + error->fence[i] = I915_READ64(FENCE_REG_965_LO(i));
> > + } else if (INTEL_INFO(dev)->gen >= 6) {
> > + for (i = 0; i < dev_priv->num_fence_regs; i++)
> > + error->fence[i] = I915_READ64(FENCE_REG_GEN6_LO(i));
> > + }
> > }
> >
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 44cedbf..8133c7e 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -1436,9 +1436,15 @@ enum skl_disp_power_wells {
> >
> > /*
> > * Fence registers
> > + * [0-7] @ 0x2000 gen2,gen3
> > + * [8-15] @ 0x3000 945,g33,pnv
> > + *
> > + * [0-15] @ 0x3000 gen4,gen5
> > + *
> > + * [0-15] @ 0x100000 gen6,vlv,chv
> > + * [0-31] @ 0x100000 gen7+
> > */
> > -#define FENCE_REG_830_0 0x2000
> > -#define FENCE_REG_945_8 0x3000
> > +#define FENCE_REG(i) (0x2000 + (((i) & 8) << 9) + ((i) & 7) * 4)
>
> I'd have appreciated the more obvious (i < 8 ? 0x2000 + i * 4 : 0x3000 +
> (i - 8) * 4) but meh.
>
> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Queued for -next, thanks for the patch.
-Daniel
>
>
>
>
> > #define I830_FENCE_START_MASK 0x07f80000
> > #define I830_FENCE_TILING_Y_SHIFT 12
> > #define I830_FENCE_SIZE_BITS(size) ((ffs((size) >> 19) - 1) << 8)
> > @@ -1451,14 +1457,16 @@ enum skl_disp_power_wells {
> > #define I915_FENCE_START_MASK 0x0ff00000
> > #define I915_FENCE_SIZE_BITS(size) ((ffs((size) >> 20) - 1) << 8)
> >
> > -#define FENCE_REG_965_0 0x03000
> > +#define FENCE_REG_965_LO(i) (0x03000 + (i) * 8)
> > +#define FENCE_REG_965_HI(i) (0x03000 + (i) * 8 + 4)
> > #define I965_FENCE_PITCH_SHIFT 2
> > #define I965_FENCE_TILING_Y_SHIFT 1
> > #define I965_FENCE_REG_VALID (1<<0)
> > #define I965_FENCE_MAX_PITCH_VAL 0x0400
> >
> > -#define FENCE_REG_SANDYBRIDGE_0 0x100000
> > -#define SANDYBRIDGE_FENCE_PITCH_SHIFT 32
> > +#define FENCE_REG_GEN6_LO(i) (0x100000 + (i) * 8)
> > +#define FENCE_REG_GEN6_HI(i) (0x100000 + (i) * 8 + 4)
> > +#define GEN6_FENCE_PITCH_SHIFT 32
> > #define GEN7_FENCE_MAX_PITCH_VAL 0x0800
> >
> >
> > --
> > 2.4.6
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
