From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Noever Subject: [PATCH] drm/nouveau/bios: fix bug introduced in 457e77b2 Date: Wed, 9 Apr 2014 21:33:30 +0200 Message-ID: <1397072012-9475-1-git-send-email-andreas.noever@gmail.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: dri-devel@lists.freedesktop.org Cc: Andreas Noever , David Airlie , Ben Skeggs , Martin Peres , Ilia Mirkin , Maarten Lankhorst , linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org 457e77b2 effectively replaces (... & 0xffffff00) << 8 with (... >> 8) << 8. Which does not do the same and breaks boot on my machine. Restore the old behaviour and remove the unnecessary cast. Signed-off-by: Andreas Noever --- drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c index e9df94f..2885b7c 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c @@ -109,7 +109,7 @@ nouveau_bios_shadow_pramin(struct nouveau_bios *bios) return; } - addr = (u64)(addr >> 8) << 8; + addr = (addr >> 8) << 16; if (!addr) { addr = (u64)nv_rd32(bios, 0x001700) << 16; addr += 0xf0000; -- 1.9.1