Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964924AbaDITg2 (ORCPT ); Wed, 9 Apr 2014 15:36:28 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:55493 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933342AbaDITg1 (ORCPT ); Wed, 9 Apr 2014 15:36:27 -0400 From: Andreas Noever To: dri-devel@lists.freedesktop.org Cc: Andreas Noever , David Airlie , Ben Skeggs , Martin Peres , Ilia Mirkin , Maarten Lankhorst , linux-kernel@vger.kernel.org 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> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/