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

Commit 8b00f55a authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Convert wait_for(I915_READ(reg)) to intel_wait_for_register() 



By using the out-of-line intel_wait_for_register() not only do we can
efficiency from using the hybrid wait_for() contained within, but we
avoid code bloat from the numerous inlined loops, in total (all patches):

   text    data     bss     dec     hex filename
1078551    4557     416 1083524  108884 drivers/gpu/drm/i915/i915.ko
1070775    4557     416 1075748  106a24 drivers/gpu/drm/i915/i915.ko

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467297225-21379-51-git-send-email-chris@chris-wilson.co.uk
parent 117c1148

drivers/gpu/drm/i915/intel_runtime_pm.c

+10 −4
Original line number Diff line number Diff line
@@ -768,12 +768,18 @@ static void skl_set_power_well(struct drm_i915_private *dev_priv, 


	if (check_fuse_status) {

		if (power_well->data == SKL_DISP_PW_1) {

			if (wait_for((I915_READ(SKL_FUSE_STATUS) &

				SKL_FUSE_PG1_DIST_STATUS), 1))

			if (intel_wait_for_register(dev_priv,

						    SKL_FUSE_STATUS,

						    SKL_FUSE_PG1_DIST_STATUS,

						    SKL_FUSE_PG1_DIST_STATUS,

						    1))

				DRM_ERROR("PG1 distributing status timeout\n");

		} else if (power_well->data == SKL_DISP_PW_2) {

			if (wait_for((I915_READ(SKL_FUSE_STATUS) &

				SKL_FUSE_PG2_DIST_STATUS), 1))

			if (intel_wait_for_register(dev_priv,

						    SKL_FUSE_STATUS,

						    SKL_FUSE_PG2_DIST_STATUS,

						    SKL_FUSE_PG2_DIST_STATUS,

						    1))

				DRM_ERROR("PG2 distributing status timeout\n");

		}

	}