Module Name: src
Committed By: snj
Date: Thu Jul 30 16:29:38 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_bios.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #911):
sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c: revision 1.3
Fix two issues in NetBSD implementation of igp_read_bios_from_vram():
* Allocate the correct buffer for the VGA BIOS image.
* Abort if buffer allocation failed, not if buffer allocation succeeded.
Not directly tested, but I can't imagine this makes anything worse.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.2.4.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.2.4.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.2.4.1 Thu Jul 30 15:46:41 2015
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Thu Jul 30 16:29:38 2015
@@ -72,7 +72,7 @@ static bool igp_read_bios_from_vram(stru
(size < 256 * 1024) ||
(bus_space_read_1(bst, bsh, 0) != 0x55) ||
(bus_space_read_1(bst, bsh, 1) != 0xaa) ||
- ((rdev = kmalloc(size, GFP_KERNEL)) != NULL)) {
+ ((rdev->bios = kmalloc(size, GFP_KERNEL)) == NULL)) {
bus_space_unmap(bst, bsh, size);
return false;
}
