Commit 7fabf5ef authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: remove force argument from disable_plane 



The idea was good, but planes can have a fb even though
they're disabled. This makes the force argument useless
and always true, because only the commit function updates
state.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 061e4b8d

drivers/gpu/drm/i915/intel_display.c

+3 −13
Original line number Original line Diff line number Diff line
@@ -4804,7 +4804,7 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc) 
			struct drm_crtc *from = intel_plane->base.crtc;

			struct drm_crtc *from = intel_plane->base.crtc;





			intel_plane->disable_plane(&intel_plane->base,

			intel_plane->disable_plane(&intel_plane->base,

						   from ?: crtc, true);

						   from ?: crtc);

		}

		}

	}

	}
@@ -13770,8 +13770,7 @@ intel_commit_primary_plane(struct drm_plane *plane, 




static void

static void

intel_disable_primary_plane(struct drm_plane *plane,

intel_disable_primary_plane(struct drm_plane *plane,

			    struct drm_crtc *crtc,

			    struct drm_crtc *crtc)

			    bool force)

{

{

	struct drm_device *dev = plane->dev;

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -14017,17 +14016,8 @@ intel_check_cursor_plane(struct drm_plane *plane, 




static void

static void

intel_disable_cursor_plane(struct drm_plane *plane,

intel_disable_cursor_plane(struct drm_plane *plane,

			   struct drm_crtc *crtc,

			   struct drm_crtc *crtc)

			   bool force)

{

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	if (!force) {

		plane->fb = NULL;

		intel_crtc->cursor_bo = NULL;

		intel_crtc->cursor_addr = 0;

	}



	intel_crtc_update_cursor(crtc, false);

	intel_crtc_update_cursor(crtc, false);

}

}

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ struct intel_plane { 
			     uint32_t x, uint32_t y,

			     uint32_t x, uint32_t y,

			     uint32_t src_w, uint32_t src_h);

			     uint32_t src_w, uint32_t src_h);

	void (*disable_plane)(struct drm_plane *plane,

	void (*disable_plane)(struct drm_plane *plane,

			      struct drm_crtc *crtc, bool force);

			      struct drm_crtc *crtc);

	int (*check_plane)(struct drm_plane *plane,

	int (*check_plane)(struct drm_plane *plane,

			   struct intel_crtc_state *crtc_state,

			   struct intel_crtc_state *crtc_state,

			   struct intel_plane_state *state);

			   struct intel_plane_state *state);

drivers/gpu/drm/i915/intel_sprite.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, 
}

}





static void

static void

skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc, bool force)

skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)

{

{

	struct drm_device *dev = dplane->dev;

	struct drm_device *dev = dplane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -456,7 +456,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_crtc *crtc, 
}

}





static void

static void

vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc, bool force)

vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)

{

{

	struct drm_device *dev = dplane->dev;

	struct drm_device *dev = dplane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -597,7 +597,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
}

}





static void

static void

ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc, bool force)

ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)

{

{

	struct drm_device *dev = plane->dev;

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -725,7 +725,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
}

}





static void

static void

ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc, bool force)

ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)

{

{

	struct drm_device *dev = plane->dev;

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -946,7 +946,7 @@ intel_commit_sprite_plane(struct drm_plane *plane, 
					  drm_rect_width(&state->src) >> 16,

					  drm_rect_width(&state->src) >> 16,

					  drm_rect_height(&state->src) >> 16);

					  drm_rect_height(&state->src) >> 16);

	} else {

	} else {

		intel_plane->disable_plane(plane, crtc, false);

		intel_plane->disable_plane(plane, crtc);

	}

	}

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE