Commit fa5a7970 authored Oct 15, 2015 by Ville Syrjälä

drm/i915: skl_update_scaler() wants a rotation bitmask instead of bit number

Pass BIT(DRM_ROTATE_0) instead of DRM_ROTATE_0 to skl_update_scaler().
The former is a mask, the latter just the bit number.

Fortunately the only thing skl_update_scaler() does with the rotation
is check if it's 90/270 degrees or not, and so in this case it would
still do the right thing.

Cc: Chandra Konduru <chandra.konduru@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1444917718-28495-1-git-send-email-ville.syrjala@linux.intel.com

Fixes: 6156a456 ("drm/i915: skylake primary plane scaling using shared scalers")
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

parent 693bdc28

drivers/gpu/drm/i915/intel_display.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4438,7 +4438,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)
	intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX);		intel_crtc->base.base.id, 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, BIT(DRM_ROTATE_0),
	state->pipe_src_w, state->pipe_src_h,		state->pipe_src_w, state->pipe_src_h,
	adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay);		adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay);
	}		}