drm/i915: simplify check for I915G/I945G in bit 6 swizzling detection
Subsystems (2)
PATCH 1/1 drm/i915: simplify check for I915G/I945G in bit 6 swizzling detection
c9c4b6f6c283 ("drm/i915: fix swizzle detection for gen3") added a complicated check for I915G/I945G. Pineview and other gen3 devices match IS_MOBILE() anyway. Simplify.
--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_fence_reg.c +1 -2
@@ -513,8 +513,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; }else if (IS_MOBILE (dev_priv) || - (IS_GEN3 (dev_priv) && - !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv))) { +IS_I915G (dev_priv) ||IS_I945G (dev_priv)) {uint32_t dcc;/* On 9xx chipsets, channel interleave by the CPU is
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: simplify check for I915G/I945G in bit 6 swizzling detection
== Series Details ==
== Series Details ==
Series: drm/i915: simplify check for I915G/I945G in bit 6 swizzling detection
URL : https://patchwork.freedesktop.org/series/16738/
State : failure
== Summary ==
Series 16738v1 drm/i915: simplify check for I915G/I945G in bit 6 swizzling detection
https://patchwork.freedesktop.org/api/1.0/series/16738/revisions/1/mbox/
Test gem_ringfill:
Subgroup basic-default-hang:
incomplete -> PASS (fi-snb-2600)
pass -> INCOMPLETE (fi-ivb-3520m)fi-bdw-5557u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:247 pass:208 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-t5700 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-j1900 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-ilk-650 total:247 pass:195 dwarn:0 dfail:0 fail:0 skip:52 fi-ivb-3520m total:118 pass:105 dwarn:0 dfail:0 fail:0 skip:12 fi-ivb-3770 total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:247 pass:224 dwarn:3 dfail:0 fail:0 skip:20 fi-skl-6770hq total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
d4ed6d3718cc5f9f2832177d292f425466a8a460 drm-tip: 2016y-12m-13d-10h-41m-44s UTC integration manifest 5f86459 drm/i915: simplify check for I915G/I945G in bit 6 swizzling detection
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3273/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Jani Nikula
c9c4b6f6c283("drm/i915: fix swizzle detection for gen3") added a complicated check for I915G/I945G. Pineview and other gen3 devices matchIS_MOBILE()anyway. Simplify.Cc Daniel Vetter <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_fence_reg.c +0
-0
drivers/gpu/drm/i915/i915_gem_fence_reg.c i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) · line 516
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c +1
-2@@ -513,8 +513,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; }else if (IS_MOBILE (dev_priv) || - (IS_GEN3 (dev_priv) && - !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv))) { +IS_I915G (dev_priv) ||IS_I945G (dev_priv)) {
Seems to miss i915gm and i945gm. Hm, but then you mention those are mobile. Then I guess it's a bikeshed, but at least a correct one.
-Daniel
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c +0
-0uint32_t dcc;/* On 9xx chipsets, channel interleave by the CPU is Signature · 1 line
2.1.4
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Jani Nikula
c9c4b6f6c283("drm/i915: fix swizzle detection for gen3") added a complicated check for I915G/I945G. Pineview and other gen3 devices matchIS_MOBILE()anyway. Simplify.Cc Daniel Vetter <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 14 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) · line 516
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c +1
-2@@ -513,8 +513,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; }else if (IS_MOBILE (dev_priv) || - (IS_GEN3 (dev_priv) && - !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv))) { +IS_I915G (dev_priv) ||IS_I945G (dev_priv)) {Seems to miss i915gm and i945gm. Hm, but then you mention those are mobile. Then I guess it's a bikeshed, but at least a correct one.
Considering the discussion over the last few days, I'd rather see IS_MOBILE() phased out and not relied upon even more. /bikeshed
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · Chris Wilson
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Jani Nikula
c9c4b6f6c283("drm/i915: fix swizzle detection for gen3") added a complicated check for I915G/I945G. Pineview and other gen3 devices matchIS_MOBILE()anyway. Simplify.Cc Daniel Vetter <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)Quoted 14 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) · line 516
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c +1
-2@@ -513,8 +513,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; }else if (IS_MOBILE (dev_priv) || - (IS_GEN3 (dev_priv) && - !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv))) { +IS_I915G (dev_priv) ||IS_I945G (dev_priv)) {Seems to miss i915gm and i945gm. Hm, but then you mention those are mobile. Then I guess it's a bikeshed, but at least a correct one.
Quoted 3 lines
Considering the discussion over the last few days, I'd rather see
IS_MOBILE()phased out and not relied upon even more. /bikeshed
I'm afraid I already pushed (thanks for the review Daniel).
Last I looked, IS_MOBILE() seems like difficult to untangle, and this is not one of the hard spots. Simpler conditions should actually be helpful.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx