diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2013-07-19 06:27:45 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-30 13:03:59 +1000 |
| commit | bfcd92a0ae2996a34b1fd020b3e0951946ae6903 (patch) | |
| tree | 654dd6bf2be440b6ac6df6842f55533a61099549 /drivers/gpu | |
| parent | 0108bc808107b97e101b15af9705729626be6447 (diff) | |
| download | kernel-common-bfcd92a0ae2996a34b1fd020b3e0951946ae6903.tar.gz kernel-common-bfcd92a0ae2996a34b1fd020b3e0951946ae6903.tar.bz2 kernel-common-bfcd92a0ae2996a34b1fd020b3e0951946ae6903.zip | |
drm/nouveau/core: xtensa firmware size needs to be 0x40000 no matter what
The current logic is wrong since we send fw->size >> 8 to the
card. Rounding the size up by 0x100 and 0x1000 didn't seem to help,
the card still hung, so go back to what the blob does -- 0x40000.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/xtensa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/xtensa.c b/drivers/gpu/drm/nouveau/core/engine/xtensa.c index 0639bc59d0a5..5f6ede7c4892 100644 --- a/drivers/gpu/drm/nouveau/core/engine/xtensa.c +++ b/drivers/gpu/drm/nouveau/core/engine/xtensa.c @@ -118,7 +118,13 @@ _nouveau_xtensa_init(struct nouveau_object *object) return ret; } - ret = nouveau_gpuobj_new(object, NULL, fw->size, 0x1000, 0, + if (fw->size > 0x40000) { + nv_warn(xtensa, "firmware %s too large\n", name); + release_firmware(fw); + return -EINVAL; + } + + ret = nouveau_gpuobj_new(object, NULL, 0x40000, 0x1000, 0, &xtensa->gpu_fw); if (ret) { release_firmware(fw); |