Re: [PATCH] drm/nouveau/bios: fix bug introduced in 457e77b2

Ben Skeggs
2014-04-11T07:40:11Z

On Thu, Apr 10, 2014 at 5:33 AM, Andreas Noever
<andreas.noever@gmail.com> 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 <andreas.noever@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

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