30 lines
987 B
Diff
30 lines
987 B
Diff
|
From 3a25c2ea8bd898dff218ef8baa09ea1f05a60b48 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Skeggs <bskeggs@redhat.com>
|
||
|
|
Date: Fri, 10 Sep 2010 15:33:11 +1000
|
||
|
|
Subject: [PATCH] drm/nouveau: we can't free ACPI EDID, so make a copy that we can
|
||
|
|
|
||
|
|
The rest of the connector code assumes we can kfree() the EDID pointer.
|
||
|
|
This causes things to blow up with the ACPI EDID pointer we get
|
||
|
|
passed.
|
||
|
|
|
||
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
|
||
|
|
index c17a055..1191526 100644
|
||
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
|
||
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
|
||
|
|
@@ -292,6 +292,6 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
|
||
|
|
if (ret < 0)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
- nv_connector->edid = edid;
|
||
|
|
+ nv_connector->edid = kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.2.2
|
||
|
|
|