Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755057AbaDKHkL (ORCPT ); Fri, 11 Apr 2014 03:40:11 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:37286 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754264AbaDKHkI (ORCPT ); Fri, 11 Apr 2014 03:40:08 -0400 MIME-Version: 1.0 In-Reply-To: <1397072012-9475-1-git-send-email-andreas.noever@gmail.com> References: <1397072012-9475-1-git-send-email-andreas.noever@gmail.com> Date: Fri, 11 Apr 2014 17:40:07 +1000 Message-ID: Subject: Re: [PATCH] drm/nouveau/bios: fix bug introduced in 457e77b2 From: Ben Skeggs To: Andreas Noever Cc: "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , Ben Skeggs , stable@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 10, 2014 at 5:33 AM, Andreas Noever wrote: > 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 Signed-off-by: Ben Skeggs > --- > 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 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- 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/