drm/i915: Use existing function instead of open-coding fence reg clear.
Subsystems (2)
PATCH 1/2 drm/i915: Use existing function instead of open-coding fence reg clear.
This is once less place to miss a new INTEL_INFO(dev)->gen update now.
--- drivers/gpu/drm/i915/i915_gem.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +3 -18
@@ -3856,25 +3856,10 @@ i915_gem_load(struct drm_device *dev) dev_priv->num_fence_regs =8 ;/* Initialize fence registers to zero */ -switch (INTEL_INFO (dev)->gen) { -case 6 : -for (i =0 ; i <16 ; i++) -I915_WRITE64 (FENCE_REG_SANDYBRIDGE_0 + (i *8 ),0 ); -break ; -case 5 : -case 4 : -for (i =0 ; i <16 ; i++) -I915_WRITE64 (FENCE_REG_965_0 + (i *8 ),0 ); -break ; -case 3 : -if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) -for (i =0 ; i <8 ; i++) -I915_WRITE (FENCE_REG_945_8 + (i *4 ),0 ); -case 2 : -for (i =0 ; i <8 ; i++) -I915_WRITE (FENCE_REG_830_0 + (i *4 ),0 ); -break ; +for (i =0 ; i < dev_priv->num_fence_regs; i++) { +i915_gem_clear_fence_reg (dev, &dev_priv->fence_regs[i]); } +i915_gem_detect_bit_6_swizzle (dev);init_waitqueue_head (&dev_priv->pending_flip_queue);
Signature · 1 line
1.7.4.4
PATCH 2/2 drm/i915: Add support for fence registers on Ivybridge.
The registers are the same as on Sandybridge. Fixes scrambled display in X when it does software drawing to the GTT, and scans the results out as tiled.
--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -2673,6 +2673,7 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj, update: obj->tiling_changed = false;switch (INTEL_INFO (dev)->gen) { +case 7 :case 6 : ret =sandybridge_write_fence_reg (obj, pipelined);break ;
@@ -2706,6 +2707,7 @@ i915_gem_clear_fence_reg(struct drm_device *dev,uint32_t fence_reg = reg - dev_priv->fence_regs;switch (INTEL_INFO (dev)->gen) { +case 7 :case 6 :I915_WRITE64 (FENCE_REG_SANDYBRIDGE_0 + fence_reg*8 ,0 );break ;
Signature · 1 line
1.7.4.4
Re: [PATCH 2/2] drm/i915: Add support for fence registers on Ivybridge.
Quoted 22 lines · On Fri, 6 May 2011 14:03:32 -0700 Eric Anholt <[email protected]> wrote:
The registers are the same as on Sandybridge. Fixes scrambled display in X when it does software drawing to the GTT, and scans the results out as tiled.
Signed-off-by Eric Anholt <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)drivers/gpu/drm/i915/i915_gem.c +1
-0@@ -2673,6 +2673,7 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj, update: obj->tiling_changed = false;switch (INTEL_INFO (dev)->gen) { +case 7 :case 6 : ret =sandybridge_write_fence_reg (obj, pipelined);break ;
drivers/gpu/drm/i915/i915_gem.c i915_gem_clear_fence_reg(struct drm_device *dev, · line 2713
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem.c +1
-0@@ -2706,6 +2707,7 @@ i915_gem_clear_fence_reg(struct drm_device *dev,uint32_t fence_reg = reg - dev_priv->fence_regs;switch (INTEL_INFO (dev)->gen) { +case 7 :case 6 :I915_WRITE64 (FENCE_REG_SANDYBRIDGE_0 + fence_reg*8 ,0 );break ;
Yep, definitely needed. I'll factor out the tiled stuff I added to testdisplay (for testing video sprites) so we can catch this stuff more easily.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 30 lines · On Fri, 6 May 2011 14:03:31 -0700 Eric Anholt <[email protected]> wrote:
This is once less place to miss a new INTEL_INFO(dev)->gen update now.
Signed-off-by Eric Anholt <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-)drivers/gpu/drm/i915/i915_gem.c +0
-15@@ -3856,25 +3856,10 @@ i915_gem_load(struct drm_device *dev) dev_priv->num_fence_regs =8 ;/* Initialize fence registers to zero */ -switch (INTEL_INFO (dev)->gen) { -case 6 : -for (i =0 ; i <16 ; i++) -I915_WRITE64 (FENCE_REG_SANDYBRIDGE_0 + (i *8 ),0 ); -break ; -case 5 : -case 4 : -for (i =0 ; i <16 ; i++) -I915_WRITE64 (FENCE_REG_965_0 + (i *8 ),0 ); -break ; -case 3 : -if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) -for (i =0 ; i <8 ; i++) -I915_WRITE (FENCE_REG_945_8 + (i *4 ),0 ); -case 2 :
drivers/gpu/drm/i915/i915_gem.c i915_gem_load(struct drm_device *dev) · line 3865
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +3
-3-for (i =0 ; i <8 ; i++) -I915_WRITE (FENCE_REG_830_0 + (i *4 ),0 ); -break ; +for (i =0 ; i < dev_priv->num_fence_regs; i++) { +i915_gem_clear_fence_reg (dev, &dev_priv->fence_regs[i]); } +i915_gem_detect_bit_6_swizzle (dev);init_waitqueue_head (&dev_priv->pending_flip_queue);
Aside from the extra curly braces:
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center