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

Commit 5e963a02 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make scaler updates less chatty 



It looks to me skl_update_scaler will already log interesting
debug messages when the state transitions or there is an error.

In this case it feels we can remove the two unconditional
debug messages which happen immediately before calling
skl_update_scaler. This way we get rid of the sole debug
message when switching virtual terminals for example.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479376805-5087-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent 5ca43ef0

drivers/gpu/drm/i915/intel_display.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -4719,13 +4719,8 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, 
 */

 */

int skl_update_scaler_crtc(struct intel_crtc_state *state)

int skl_update_scaler_crtc(struct intel_crtc_state *state)

{

{

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

	const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;

	const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;





	DRM_DEBUG_KMS("Updating scaler for [CRTC:%d:%s] scaler_user index %u.%u\n",

		      intel_crtc->base.base.id, intel_crtc->base.name,

		      intel_crtc->pipe, SKL_CRTC_INDEX);



	return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,

	return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,

		&state->scaler_state.scaler_id, DRM_ROTATE_0,

		&state->scaler_state.scaler_id, DRM_ROTATE_0,

		state->pipe_src_w, state->pipe_src_h,

		state->pipe_src_w, state->pipe_src_h,
@@ -4746,7 +4741,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, 
				   struct intel_plane_state *plane_state)

				   struct intel_plane_state *plane_state)

{

{





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

	struct intel_plane *intel_plane =

	struct intel_plane *intel_plane =

		to_intel_plane(plane_state->base.plane);

		to_intel_plane(plane_state->base.plane);

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

	struct drm_framebuffer *fb = plane_state->base.fb;
@@ -4754,10 +4748,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, 




	bool force_detach = !fb || !plane_state->base.visible;

	bool force_detach = !fb || !plane_state->base.visible;





	DRM_DEBUG_KMS("Updating scaler for [PLANE:%d:%s] scaler_user index %u.%u\n",

		      intel_plane->base.base.id, intel_plane->base.name,

		      intel_crtc->pipe, drm_plane_index(&intel_plane->base));



	ret = skl_update_scaler(crtc_state, force_detach,

	ret = skl_update_scaler(crtc_state, force_detach,

				drm_plane_index(&intel_plane->base),

				drm_plane_index(&intel_plane->base),

				&plane_state->scaler_id,

				&plane_state->scaler_id,