From: Andreas Noever <andreas.noever@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Andreas Noever <andreas.noever@gmail.com>,
David Airlie <airlied@linux.ie>, Ben Skeggs <bskeggs@redhat.com>,
Martin Peres <martin.peres@free.fr>,
Ilia Mirkin <imirkin@alum.mit.edu>,
Maarten Lankhorst <maarten.lankhorst@canonical.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] drm/nouveau/bios: fix bug introduced in 457e77b2
Date: Wed, 9 Apr 2014 21:33:30 +0200 [thread overview]
Message-ID: <1397072012-9475-1-git-send-email-andreas.noever@gmail.com> (raw)
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>
---
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
next reply other threads:[~2014-04-09 19:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-09 19:33 Andreas Noever [this message]
[not found] ` <1397072012-9475-1-git-send-email-andreas.noever-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-10 9:41 ` REGRESSION Re: [PATCH] drm/nouveau/bios: fix bug introduced in 457e77b2 Thomas Glanzmann
2014-04-10 9:41 ` Thomas Glanzmann
2014-04-11 7:40 ` Ben Skeggs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397072012-9475-1-git-send-email-andreas.noever@gmail.com \
--to=andreas.noever@gmail.com \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=imirkin@alum.mit.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@canonical.com \
--cc=martin.peres@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.