From 6389902072db658366ec53711a83d711364b7330 Mon Sep 17 00:00:00 2001

From: Imre Deak <imre.deak@intel.com>

Date: Tue, 9 Jan 2018 14:20:40 +0200

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

Git-commit: 6389902072db658366ec53711a83d711364b7330

Patch-mainline: v4.16-rc1

References: FATE#322643 bsc#1055900

No-fix: 17bd6e66d8f677b1b250d098097fbed6e70175ef

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 <joonas.lahtinen@linux.intel.com>

Reported-by: Fengguang Wu <fengguang.wu@intel.com>

Signed-off-by: Imre Deak <imre.deak@intel.com>

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20180109122040.19425-1-imre.deak@intel.com

(cherry picked from commit 17bd6e66d8f677b1b250d098097fbed6e70175ef)

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpu/drm/i915/intel_display.c |    6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

--- 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

 	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

 	}

 	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);