Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f88709bd authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Use intel_uncore_rmw in intel_gt_init_swizzling 



Two easy opportunities to compact the code by using the existing helper.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-8-tvrtko.ursulin@linux.intel.com
parent 500bfa38

drivers/gpu/drm/i915/i915_gem_fence_reg.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -844,17 +844,12 @@ void intel_gt_init_swizzling(struct intel_gt *gt) 
	    i915->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_NONE)

	    i915->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_NONE)

		return;

		return;





	intel_uncore_write(uncore,

	intel_uncore_rmw(uncore, DISP_ARB_CTL, 0, DISP_TILE_SURFACE_SWIZZLING);

			   DISP_ARB_CTL,

			   intel_uncore_read(uncore, DISP_ARB_CTL) |

			   DISP_TILE_SURFACE_SWIZZLING);





	if (IS_GEN(i915, 5))

	if (IS_GEN(i915, 5))

		return;

		return;





	intel_uncore_write(uncore,

	intel_uncore_rmw(uncore, TILECTL, 0, TILECTL_SWZCTL);

			   TILECTL,

			   intel_uncore_read(uncore, TILECTL) | TILECTL_SWZCTL);





	if (IS_GEN(i915, 6))

	if (IS_GEN(i915, 6))

		intel_uncore_write(uncore,

		intel_uncore_write(uncore,