git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_grctx.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_grctx.c
b/drivers/gpu/drm/nouveau/nouveau_grctx.c
index
32f0e49
..
f731c5f
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_grctx.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_grctx.c
@@
-68,13
+68,12
@@
nouveau_grctx_prog_load(struct drm_device *dev)
return ret;
}
return ret;
}
- pgraph->ctxprog = km
alloc(
fw->size, GFP_KERNEL);
+ pgraph->ctxprog = km
emdup(fw->data,
fw->size, GFP_KERNEL);
if (!pgraph->ctxprog) {
NV_ERROR(dev, "OOM copying ctxprog\n");
release_firmware(fw);
return -ENOMEM;
}
if (!pgraph->ctxprog) {
NV_ERROR(dev, "OOM copying ctxprog\n");
release_firmware(fw);
return -ENOMEM;
}
- memcpy(pgraph->ctxprog, fw->data, fw->size);
cp = pgraph->ctxprog;
if (le32_to_cpu(cp->signature) != 0x5043564e ||
cp = pgraph->ctxprog;
if (le32_to_cpu(cp->signature) != 0x5043564e ||
@@
-97,14
+96,13
@@
nouveau_grctx_prog_load(struct drm_device *dev)
return ret;
}
return ret;
}
- pgraph->ctxvals = km
alloc(
fw->size, GFP_KERNEL);
+ pgraph->ctxvals = km
emdup(fw->data,
fw->size, GFP_KERNEL);
if (!pgraph->ctxvals) {
NV_ERROR(dev, "OOM copying ctxvals\n");
release_firmware(fw);
nouveau_grctx_fini(dev);
return -ENOMEM;
}
if (!pgraph->ctxvals) {
NV_ERROR(dev, "OOM copying ctxvals\n");
release_firmware(fw);
nouveau_grctx_fini(dev);
return -ENOMEM;
}
- memcpy(pgraph->ctxvals, fw->data, fw->size);
cv = (void *)pgraph->ctxvals;
if (le32_to_cpu(cv->signature) != 0x5643564e ||
cv = (void *)pgraph->ctxvals;
if (le32_to_cpu(cv->signature) != 0x5643564e ||