aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher2013-04-24 13:39:31 -0500
committerGreg Kroah-Hartman2013-05-11 15:54:08 -0500
commit67d3fdc21b2875d89eb32ec64265d17b9292ff47 (patch)
treea863ffb540ece66c1d34718c1b4091b89ad52a12
parent81f9eaffece244b74f1d0a25218b6d2ab5809638 (diff)
downloadkernel-omap-67d3fdc21b2875d89eb32ec64265d17b9292ff47.tar.gz
kernel-omap-67d3fdc21b2875d89eb32ec64265d17b9292ff47.tar.xz
kernel-omap-67d3fdc21b2875d89eb32ec64265d17b9292ff47.zip
drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
commit beb71fc61c2cad64e347f164991b8ef476529e64 upstream. Reviwed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/atom.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 5ce9bf51a8de..43672b6f7cfd 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -1389,10 +1389,10 @@ int atom_allocate_fb_scratch(struct atom_context *ctx)
1389 firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset); 1389 firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset);
1390 1390
1391 DRM_DEBUG("atom firmware requested %08x %dkb\n", 1391 DRM_DEBUG("atom firmware requested %08x %dkb\n",
1392 firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware, 1392 le32_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware),
1393 firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb); 1393 le16_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb));
1394 1394
1395 usage_bytes = firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb * 1024; 1395 usage_bytes = le16_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb) * 1024;
1396 } 1396 }
1397 ctx->scratch_size_bytes = 0; 1397 ctx->scratch_size_bytes = 0;
1398 if (usage_bytes == 0) 1398 if (usage_bytes == 0)