This is a note to let you know that I've just added the patch titled
drm/nouveau/bios: parse external transmitter type if off-chip
to the 3.8-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-nouveau-bios-parse-external-transmitter-type-if-off-chip.patch
and it can be found in the queue-3.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f3ed1048715f2edc10c4dda6148b60e93f6282ed Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@xxxxxxxxxx>
Date: Tue, 12 Feb 2013 10:16:31 +1000
Subject: drm/nouveau/bios: parse external transmitter type if off-chip
From: Ben Skeggs <bskeggs@xxxxxxxxxx>
commit f3ed1048715f2edc10c4dda6148b60e93f6282ed upstream.
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h | 1 +
drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h
@@ -25,6 +25,7 @@ struct dcb_output {
uint8_t or;
uint8_t link;
bool duallink_possible;
+ uint8_t extdev;
union {
struct sor_conf {
int link;
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
@@ -135,6 +135,9 @@ dcb_outp_parse(struct nouveau_bios *bios
case DCB_OUTPUT_DP:
outp->link = (conf & 0x00000030) >> 4;
outp->sorconf.link = outp->link; /*XXX*/
+ outp->extdev = 0x00;
+ if (outp->location != 0)
+ outp->extdev = (conf & 0x0000ff00) >> 8;
break;
default:
break;
@@ -147,7 +150,7 @@ dcb_outp_parse(struct nouveau_bios *bios
static inline u16
dcb_outp_hasht(struct dcb_output *outp)
{
- return outp->type;
+ return (outp->location << 4) | outp->type;
}
static inline u16
Patches currently in stable-queue which might be from bskeggs@xxxxxxxxxx are
queue-3.8/drm-nouveau-bios-store-a-type-mask-hash-in-parsed-dcb-data.patch
queue-3.8/drm-nouveau-bios-parse-external-transmitter-type-if-off-chip.patch
queue-3.8/drm-nv50-devinit-reverse-the-logic-for-running-encoder-init-scripts.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