Commit eb0f5044 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Don't pass plane to .check_plane() 



.check_plane() already gets the plane state, so we can dig out the plane
from there if needed. No need in passing it separately.

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180828142707.31583-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent ed11e415

drivers/gpu/drm/i915/intel_atomic_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ 
	}



	intel_state->base.visible = false;

	ret = intel_plane->check_plane(intel_plane, crtc_state, intel_state);

	ret = intel_plane->check_plane(crtc_state, intel_state);

	if (ret)

		return ret;

drivers/gpu/drm/i915/intel_display.c

+5 −6
Original line number Diff line number Diff line
@@ -9694,8 +9694,7 @@ static bool i845_cursor_size_ok(const struct intel_plane_state *plane_state) 
	return intel_cursor_size_ok(plane_state) && IS_ALIGNED(width, 64);

}



static int i845_check_cursor(struct intel_plane *plane,

			     struct intel_crtc_state *crtc_state,

static int i845_check_cursor(struct intel_crtc_state *crtc_state,

			     struct intel_plane_state *plane_state)

{

	const struct drm_framebuffer *fb = plane_state->base.fb;
@@ -9885,10 +9884,10 @@ static bool i9xx_cursor_size_ok(const struct intel_plane_state *plane_state) 
	return true;

}



static int i9xx_check_cursor(struct intel_plane *plane,

			     struct intel_crtc_state *crtc_state,

static int i9xx_check_cursor(struct intel_crtc_state *crtc_state,

			     struct intel_plane_state *plane_state)

{

	struct intel_plane *plane = to_intel_plane(plane_state->base.plane);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum pipe pipe = plane->pipe;
@@ -13190,10 +13189,10 @@ skl_max_scale(struct intel_crtc *intel_crtc, 
}



static int

intel_check_primary_plane(struct intel_plane *plane,

			  struct intel_crtc_state *crtc_state,

intel_check_primary_plane(struct intel_crtc_state *crtc_state,

			  struct intel_plane_state *state)

{

	struct intel_plane *plane = to_intel_plane(state->base.plane);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct drm_crtc *crtc = state->base.crtc;

	int min_scale = DRM_PLANE_HELPER_NO_SCALING;

drivers/gpu/drm/i915/intel_drv.h

+2 −3
Original line number Diff line number Diff line
@@ -971,9 +971,8 @@ struct intel_plane { 
	void (*disable_plane)(struct intel_plane *plane,

			      struct intel_crtc *crtc);

	bool (*get_hw_state)(struct intel_plane *plane, enum pipe *pipe);

	int (*check_plane)(struct intel_plane *plane,

			   struct intel_crtc_state *crtc_state,

			   struct intel_plane_state *state);

	int (*check_plane)(struct intel_crtc_state *crtc_state,

			   struct intel_plane_state *plane_state);

};



struct intel_watermark_params {

drivers/gpu/drm/i915/intel_sprite.c

+2 −2
Original line number Diff line number Diff line
@@ -959,10 +959,10 @@ g4x_plane_get_hw_state(struct intel_plane *plane, 
}



static int

intel_check_sprite_plane(struct intel_plane *plane,

			 struct intel_crtc_state *crtc_state,

intel_check_sprite_plane(struct intel_crtc_state *crtc_state,

			 struct intel_plane_state *state)

{

	struct intel_plane *plane = to_intel_plane(state->base.plane);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct drm_framebuffer *fb = state->base.fb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE