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

Commit bdd7554d authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Kill intel_plane->obj 



intel_plane->obj is not used anymore so kill it. Also don't pass both
the fb and obj to the sprite .update_plane() hook, as just passing the fb
is enough.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6702cf16

drivers/gpu/drm/i915/intel_display.c

+0 −7
Original line number Diff line number Diff line
@@ -12091,8 +12091,6 @@ intel_commit_primary_plane(struct drm_plane *plane, 
	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc;

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct drm_rect *src = &state->src;



	crtc = crtc ? crtc : plane->crtc;
@@ -12102,8 +12100,6 @@ intel_commit_primary_plane(struct drm_plane *plane, 
	crtc->x = src->x1 >> 16;

	crtc->y = src->y1 >> 16;



	intel_plane->obj = obj;



	if (intel_crtc->active) {

		if (state->visible) {

			/* FIXME: kill this fastboot hack */
@@ -12367,7 +12363,6 @@ intel_commit_cursor_plane(struct drm_plane *plane, 
	struct drm_crtc *crtc = state->base.crtc;

	struct drm_device *dev = plane->dev;

	struct intel_crtc *intel_crtc;

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct drm_i915_gem_object *obj = intel_fb_obj(state->base.fb);

	uint32_t addr;
@@ -12378,8 +12373,6 @@ intel_commit_cursor_plane(struct drm_plane *plane, 
	crtc->cursor_x = state->base.crtc_x;

	crtc->cursor_y = state->base.crtc_y;



	intel_plane->obj = obj;



	if (intel_crtc->cursor_bo == obj)

		goto update;

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ struct intel_plane { 
	struct drm_plane base;

	int plane;

	enum pipe pipe;

	struct drm_i915_gem_object *obj;

	bool can_scale;

	int max_downscale;
@@ -527,7 +526,6 @@ struct intel_plane { 
	void (*update_plane)(struct drm_plane *plane,

			     struct drm_crtc *crtc,

			     struct drm_framebuffer *fb,

			     struct drm_i915_gem_object *obj,

			     int crtc_x, int crtc_y,

			     unsigned int crtc_w, unsigned int crtc_h,

			     uint32_t x, uint32_t y,

drivers/gpu/drm/i915/intel_sprite.c

+10 −8
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static void intel_update_primary_plane(struct intel_crtc *crtc) 
static void

skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,

		 struct drm_framebuffer *fb,

		 struct drm_i915_gem_object *obj, int crtc_x, int crtc_y,

		 int crtc_x, int crtc_y,

		 unsigned int crtc_w, unsigned int crtc_h,

		 uint32_t x, uint32_t y,

		 uint32_t src_w, uint32_t src_h)
@@ -187,6 +187,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, 
	struct drm_device *dev = drm_plane->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_plane *intel_plane = to_intel_plane(drm_plane);

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	const int pipe = intel_plane->pipe;

	const int plane = intel_plane->plane + 1;

	u32 plane_ctl, stride_div;
@@ -407,7 +408,7 @@ chv_update_csc(struct intel_plane *intel_plane, uint32_t format) 
static void

vlv_update_plane(struct drm_plane *dplane, struct drm_crtc *crtc,

		 struct drm_framebuffer *fb,

		 struct drm_i915_gem_object *obj, int crtc_x, int crtc_y,

		 int crtc_x, int crtc_y,

		 unsigned int crtc_w, unsigned int crtc_h,

		 uint32_t x, uint32_t y,

		 uint32_t src_w, uint32_t src_h)
@@ -416,6 +417,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_crtc *crtc, 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_plane *intel_plane = to_intel_plane(dplane);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	int pipe = intel_plane->pipe;

	int plane = intel_plane->plane;

	u32 sprctl;
@@ -608,7 +610,7 @@ vlv_get_colorkey(struct drm_plane *dplane, 
static void

ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,

		 struct drm_framebuffer *fb,

		 struct drm_i915_gem_object *obj, int crtc_x, int crtc_y,

		 int crtc_x, int crtc_y,

		 unsigned int crtc_w, unsigned int crtc_h,

		 uint32_t x, uint32_t y,

		 uint32_t src_w, uint32_t src_h)
@@ -617,6 +619,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	int pipe = intel_plane->pipe;

	u32 sprctl, sprscale = 0;

	unsigned long sprsurf_offset, linear_offset;
@@ -813,7 +816,7 @@ ivb_get_colorkey(struct drm_plane *plane, struct drm_intel_sprite_colorkey *key) 
static void

ilk_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,

		 struct drm_framebuffer *fb,

		 struct drm_i915_gem_object *obj, int crtc_x, int crtc_y,

		 int crtc_x, int crtc_y,

		 unsigned int crtc_w, unsigned int crtc_h,

		 uint32_t x, uint32_t y,

		 uint32_t src_w, uint32_t src_h)
@@ -822,6 +825,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	int pipe = intel_plane->pipe;

	unsigned long dvssurf_offset, linear_offset;

	u32 dvscntr, dvsscale;
@@ -1275,7 +1279,6 @@ intel_commit_sprite_plane(struct drm_plane *plane, 
	struct intel_crtc *intel_crtc;

	struct intel_plane *intel_plane = to_intel_plane(plane);

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

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	int crtc_x, crtc_y;

	unsigned int crtc_w, crtc_h;

	uint32_t src_x, src_y, src_w, src_h;
@@ -1283,8 +1286,7 @@ intel_commit_sprite_plane(struct drm_plane *plane, 
	crtc = crtc ? crtc : plane->crtc;

	intel_crtc = to_intel_crtc(crtc);



	plane->fb = state->base.fb;

	intel_plane->obj = obj;

	plane->fb = fb;



	if (intel_crtc->active) {

		intel_crtc->primary_enabled = !state->hides_primary;
@@ -1298,7 +1300,7 @@ intel_commit_sprite_plane(struct drm_plane *plane, 
			src_y = state->src.y1;

			src_w = drm_rect_width(&state->src);

			src_h = drm_rect_height(&state->src);

			intel_plane->update_plane(plane, crtc, fb, obj,

			intel_plane->update_plane(plane, crtc, fb,

						  crtc_x, crtc_y, crtc_w, crtc_h,

						  src_x, src_y, src_w, src_h);

		} else {