This is a note to let you know that I've just added the patch titled
drm/radeon/cik: Fix printing of client name on VM protection fault
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-cik-fix-printing-of-client-name-on-vm-protection-fault.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 328a50c7b09d313ab9278f972950da414d348eb1 Mon Sep 17 00:00:00 2001
From: Michel Dänzer <michel.daenzer@xxxxxxx>
Date: Wed, 18 Sep 2013 15:39:40 +0200
Subject: drm/radeon/cik: Fix printing of client name on VM protection fault
From: Michel Dänzer <michel.daenzer@xxxxxxx>
commit 328a50c7b09d313ab9278f972950da414d348eb1 upstream.
The string is encoded from the MSB to the LSB of the register.
Signed-off-by: Michel Dänzer <michel.daenzer@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/cik.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4506,12 +4506,13 @@ static void cik_vm_decode_fault(struct r
u32 mc_id = (status & MEMORY_CLIENT_ID_MASK) >> MEMORY_CLIENT_ID_SHIFT;
u32 vmid = (status & FAULT_VMID_MASK) >> FAULT_VMID_SHIFT;
u32 protections = (status & PROTECTIONS_MASK) >> PROTECTIONS_SHIFT;
- char *block = (char *)&mc_client;
+ char block[5] = { mc_client >> 24, (mc_client >> 16) & 0xff,
+ (mc_client >> 8) & 0xff, mc_client & 0xff, 0 };
- printk("VM fault (0x%02x, vmid %d) at page %u, %s from %s (%d)\n",
+ printk("VM fault (0x%02x, vmid %d) at page %u, %s from '%s' (0x%08x) (%d)\n",
protections, vmid, addr,
(status & MEMORY_CLIENT_RW_MASK) ? "write" : "read",
- block, mc_id);
+ block, mc_client, mc_id);
}
/**
Patches currently in stable-queue which might be from michel.daenzer@xxxxxxx are
queue-3.11/drm-radeon-cik-fix-printing-of-client-name-on-vm-protection-fault.patch
queue-3.11/drm-radeon-cik-fix-encoding-of-number-of-banks-in-tiling-configuration-info.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html