drm/i915: Fix using BIT_ULL() vs. BIT() for power domain masks

Web:        https://git.kernel.org/torvalds/c/6389902072db658366ec53711a83d711364b7330
Commit:     6389902072db658366ec53711a83d711364b7330
Parent:     90024a5951029685acc5396258f1b0de9b23cf4a
Refname:    refs/heads/master
Author:     Imre Deak <[email protected]>
AuthorDate: Tue Jan 9 14:20:40 2018 +0200
Committer:  Rodrigo Vivi <[email protected]>
CommitDate: Thu Feb 1 07:31:31 2018 -0800

    drm/i915: Fix using BIT_ULL() vs. BIT() for power domain masks
    
    The power domain masks are 64 bit wide, so we need BIT_ULL() when
    setting bits in them, these ones were missed during converting from 32
    to 64 bit masks. All 3 enums are <32 atm, so this didn't cause a real
    problem.
    
    Fixes: d8fc70b7367b ("drm/i915: Make power domain masks 64 bit long")
    Cc: Joonas Lahtinen <[email protected]>
    Reported-by: Fengguang Wu <[email protected]>
    Signed-off-by: Imre Deak <[email protected]>
    Reviewed-by: Chris Wilson <[email protected]>
    Reviewed-by: Joonas Lahtinen <[email protected]>
    Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
    (cherry picked from commit 17bd6e66d8f677b1b250d098097fbed6e70175ef)
    Signed-off-by: Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0cd355978ab4..f288bcc7be22 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5661,8 +5661,8 @@ static u64 get_crtc_power_domains(struct drm_crtc *crtc,
 	if (!crtc_state->base.active)
 		return 0;
 
-	mask = BIT(POWER_DOMAIN_PIPE(pipe));
-	mask |= BIT(POWER_DOMAIN_TRANSCODER(transcoder));
+	mask = BIT_ULL(POWER_DOMAIN_PIPE(pipe));
+	mask |= BIT_ULL(POWER_DOMAIN_TRANSCODER(transcoder));
 	if (crtc_state->pch_pfit.enabled ||
 	    crtc_state->pch_pfit.force_thru)
 		mask |= BIT_ULL(POWER_DOMAIN_PIPE_PANEL_FITTER(pipe));
@@ -5674,7 +5674,7 @@ static u64 get_crtc_power_domains(struct drm_crtc *crtc,
 	}
 
 	if (HAS_DDI(dev_priv) && crtc_state->has_audio)
-		mask |= BIT(POWER_DOMAIN_AUDIO);
+		mask |= BIT_ULL(POWER_DOMAIN_AUDIO);
 
 	if (crtc_state->shared_dpll)
 		mask |= BIT_ULL(POWER_DOMAIN_PLLS);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html