drm/i915/gen9: fix typo when setting up the crtc scaler
diff mbox

Message ID 1435081227-12428-1-git-send-email-imre.deak@intel.com
State New
Headers show

Commit Message

Imre Deak June 23, 2015, 5:40 p.m. UTC
This typo lead to the crtc scaler getting enabled incorrectly and an
evantual state checker mismatch about the scaler_id.

Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lespiau, Damien June 23, 2015, 6:16 p.m. UTC | #1
On Tue, Jun 23, 2015 at 08:40:27PM +0300, Imre Deak wrote:
> This typo lead to the crtc scaler getting enabled incorrectly and an
> evantual state checker mismatch about the scaler_id.
> 
> Signed-off-by: Imre Deak <imre.deak@intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Daniel Vetter June 23, 2015, 9:23 p.m. UTC | #2
On Tue, Jun 23, 2015 at 07:16:15PM +0100, Damien Lespiau wrote:
> On Tue, Jun 23, 2015 at 08:40:27PM +0300, Imre Deak wrote:
> > This typo lead to the crtc scaler getting enabled incorrectly and an
> > evantual state checker mismatch about the scaler_id.
> > 
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> 
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

Hooray for pipe state checker! Queued for -next, thanks for the patch.
-Daniel

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6dabc1c..7f2167e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4368,7 +4368,7 @@  int skl_update_scaler_crtc(struct intel_crtc_state *state, int force_detach)
 	return skl_update_scaler(state, force_detach, SKL_CRTC_INDEX,
 		&state->scaler_state.scaler_id, DRM_ROTATE_0,
 		state->pipe_src_w, state->pipe_src_h,
-		adjusted_mode->hdisplay, adjusted_mode->hdisplay);
+		adjusted_mode->hdisplay, adjusted_mode->vdisplay);
 }
 
 /**