aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-10-15 10:01:58 -0400
committerVille Syrjälä <ville.syrjala@linux.intel.com>2016-01-18 09:08:14 -0500
commitfa5a7970d372c9c9beb3a0ce79ee1d0c23387d0a (patch)
tree1c01518463dd666c63e92da52c33782fc931e74e
parent693bdc28a733dba68b86af295e7509812fec35d9 (diff)
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: 6156a45602f9 ("drm/i915: skylake primary plane scaling using shared scalers") Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9b6e726666c3..a851cb70479e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4438,7 +4438,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)
4438 intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX); 4438 intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX);
4439 4439
4440 return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX, 4440 return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,
4441 &state->scaler_state.scaler_id, DRM_ROTATE_0, 4441 &state->scaler_state.scaler_id, BIT(DRM_ROTATE_0),
4442 state->pipe_src_w, state->pipe_src_h, 4442 state->pipe_src_w, state->pipe_src_h,
4443 adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay); 4443 adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay);
4444} 4444}