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

Commit 302d19ac authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: clean up plane commit functions 



No point in hiding behind big ifs. This will be true most of the time.

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 da20eabd

drivers/gpu/drm/i915/intel_display.c

+8 −8
Original line number Diff line number Diff line
@@ -13769,14 +13769,14 @@ intel_commit_primary_plane(struct drm_plane *plane, 
	crtc->x = src->x1 >> 16;

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



	if (intel_crtc->active) {

	if (!intel_crtc->active)

		return;



	if (state->visible)

		/* FIXME: kill this fastboot hack */

		intel_update_pipe_size(intel_crtc);



		dev_priv->display.update_primary_plane(crtc, plane->fb,

						       crtc->x, crtc->y);

	}

	dev_priv->display.update_primary_plane(crtc, fb, crtc->x, crtc->y);

}



static void
@@ -14078,8 +14078,8 @@ intel_commit_cursor_plane(struct drm_plane *plane, 


	intel_crtc->cursor_addr = addr;

	intel_crtc->cursor_bo = obj;

update:



update:

	if (intel_crtc->active)

		intel_crtc_update_cursor(crtc, state->visible);

}

drivers/gpu/drm/i915/intel_sprite.c

+14 −19
Original line number Diff line number Diff line
@@ -930,33 +930,28 @@ 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;

	int crtc_x, crtc_y;

	unsigned int crtc_w, crtc_h;

	uint32_t src_x, src_y, src_w, src_h;



	crtc = crtc ? crtc : plane->crtc;

	intel_crtc = to_intel_crtc(crtc);



	plane->fb = fb;



	if (intel_crtc->active) {

	if (!intel_crtc->active)

		return;



	if (state->visible) {

			crtc_x = state->dst.x1;

			crtc_y = state->dst.y1;

			crtc_w = drm_rect_width(&state->dst);

			crtc_h = drm_rect_height(&state->dst);

			src_x = state->src.x1 >> 16;

			src_y = state->src.y1 >> 16;

			src_w = drm_rect_width(&state->src) >> 16;

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

		intel_plane->update_plane(plane, crtc, fb,

						  crtc_x, crtc_y, crtc_w, crtc_h,

						  src_x, src_y, src_w, src_h);

					  state->dst.x1, state->dst.y1,

					  drm_rect_width(&state->dst),

					  drm_rect_height(&state->dst),

					  state->src.x1 >> 16,

					  state->src.y1 >> 16,

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

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

	} else {

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

	}

}

}



int intel_sprite_set_colorkey(struct drm_device *dev, void *data,

			      struct drm_file *file_priv)