Attachment 114968 Details for Bug 89047 – accept 0 from nvbois_extend

[patch] accept 0 from nvbois_extend

0001-drm-nouveau-bios-0-means-success-for-nvbios_extend.patch (text/plain), 2.20 KB, created by Jan Vesely on 2015-04-09 01:45:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Vesely

Created: 2015-04-09 01:45:16 UTC

Size: 2.20 KB

patch

obsolete

>From 640f9ff443b693028e5bd2386016e4197d562dd5 Mon Sep 17 00:00:00 2001
>From: Jan Vesely <jano.vesely@gmail.com>
>Date: Wed, 8 Apr 2015 21:34:36 -0400
>Subject: [PATCH] drm/nouveau/bios: 0 means success for nvbios_extend
>
>Bugzilla:https://bugs.freedesktop.org/show_bug.cgi?id=89047
>
>CC: David Airlie <airlied@linux.ie>
>CC: Ben Skeggs <bskeggs@redhat.com>
>CC: dri-devel@lists.freedesktop.org
>CC: linux-kernel@vger.kernel.org
>Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
>---
>
>It's needed for 3.19 too
>
> drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c     | 2 +-
> drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
>index 8c2b7cb..f566ac8 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
>+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
>@@ -44,7 +44,7 @@ shadow_fetch(struct nvkm_bios *bios, u32 upto)
> 	const u32 limit = (upto + 3) & ~3;
> 	const u32 start = bios->size;
> 	void *data = mthd->data;
>-	if (nvbios_extend(bios, limit) > 0) {
>+	if (nvbios_extend(bios, limit) >= 0) {
> 		u32 read = mthd->func->read(data, start, limit - start, bios);
> 		bios->size = start + read;
> 	}
>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
>index 1fbd93b..f9d0eb5 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
>+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
>@@ -52,7 +52,7 @@ acpi_read_fast(void *data, u32 offset, u32 length, struct nvkm_bios *bios)
> 	u32 start = offset & ~0x00000fff;
> 	u32 fetch = limit - start;
> 
>-	if (nvbios_extend(bios, limit) > 0) {
>+	if (nvbios_extend(bios, limit) >= 0) {
> 		int ret = nouveau_acpi_get_bios_chunk(bios->data, start, fetch);
> 		if (ret == fetch)
> 			return fetch;
>@@ -73,7 +73,7 @@ acpi_read_slow(void *data, u32 offset, u32 length, struct nvkm_bios *bios)
> 	u32 start = offset & ~0xfff;
> 	u32 fetch = 0;
> 
>-	if (nvbios_extend(bios, limit) > 0) {
>+	if (nvbios_extend(bios, limit) >= 0) {
> 		while (start + fetch < limit) {
> 			int ret = nouveau_acpi_get_bios_chunk(bios->data,
> 							      start + fetch,
>-- 
>2.0.5
>

Actions: View | Splinter Review

Attachments on bug 89047: 114968 | 115044

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.