Patch "drm/i915: skl_update_scaler() wants a rotation bitmask instead of bit number" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-skl_update_scaler-wants-a-rotation-bitmask-instead-of-bit-number.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Thu, 15 Oct 2015 17:01:58 +0300
Subject: drm/i915: skl_update_scaler() wants a rotation bitmask instead of bit number
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Ville Syrjälä <[email protected]>

commit fa5a7970d372c9c9beb3a0ce79ee1d0c23387d0a upstream.

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.

---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -4447,7 +4447,7 @@ int skl_update_scaler_crtc(struct intel_
 		      intel_crtc->base.base.id, intel_crtc->pipe, 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,
 		adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/drm-i915-use-fw_domains_put_with_fifo-on-hsw.patch queue-4.4/drm-i915-exit-cherryview_irq_handler-after-one-pass.patch queue-4.4/drm-i915-skl_update_scaler-wants-a-rotation-bitmask-instead-of-bit-number.patch queue-4.4/drm-i915-cleanup-phys-status-page-too.patch queue-4.4/drm-i915-fix-race-condition-in-intel_dp_destroy_mst_connector.patch