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

Commit 3bdcfc0c authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Make for_each_sprite() take dev_priv as argument 



Implicit usage of local variables in macros isn't exactly the greatest
thing in the world, especially when that variable is the drm device and
we want to move towards a broader use of the i915 device structure.

Let's make for_each_sprite() take dev_priv as its first argument then.

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Chris Wilson <chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dd740780

drivers/gpu/drm/i915/i915_drv.h

+4 −1
Original line number Diff line number Diff line
@@ -227,7 +227,10 @@ enum hpd_pin { 
	for ((__p) = 0;							\

	     (__p) < INTEL_INFO(__dev_priv)->num_sprites[(__pipe)] + 1;	\

	     (__p)++)

#define for_each_sprite(p, s) for ((s) = 0; (s) < INTEL_INFO(dev)->num_sprites[(p)]; (s)++)

#define for_each_sprite(__dev_priv, __p, __s)				\

	for ((__s) = 0;							\

	     (__s) < INTEL_INFO(__dev_priv)->num_sprites[(__p)];	\

	     (__s)++)



#define for_each_crtc(dev, crtc) \

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -1300,14 +1300,14 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv, 
	u32 val;



	if (INTEL_INFO(dev)->gen >= 9) {

		for_each_sprite(pipe, sprite) {

		for_each_sprite(dev_priv, pipe, sprite) {

			val = I915_READ(PLANE_CTL(pipe, sprite));

			I915_STATE_WARN(val & PLANE_CTL_ENABLE,

			     "plane %d assertion failure, should be off on pipe %c but is still active\n",

			     sprite, pipe_name(pipe));

		}

	} else if (IS_VALLEYVIEW(dev)) {

		for_each_sprite(pipe, sprite) {

		for_each_sprite(dev_priv, pipe, sprite) {

			reg = SPCNTR(pipe, sprite);

			val = I915_READ(reg);

			I915_STATE_WARN(val & SP_ENABLE,
@@ -13363,7 +13363,7 @@ void intel_modeset_init(struct drm_device *dev) 


	for_each_pipe(dev_priv, pipe) {

		intel_crtc_init(dev, pipe);

		for_each_sprite(pipe, sprite) {

		for_each_sprite(dev_priv, pipe, sprite) {

			ret = intel_plane_init(dev, pipe, sprite);

			if (ret)

				DRM_DEBUG_KMS("pipe %c sprite %c init failed: %d\n",