Permalink
Browse files

Merge upstream commit 5a4ff9f48f638d0cddeb6788743f32d8cdc89423

  • Loading branch information...
1 parent bb0951c commit 420c14acb6071b9a73e093cf7d0fbc0fb8ffb673 @koriakin koriakin committed Sep 28, 2010
View
@@ -1,12 +1,14 @@
pscnv-y := nouveau_drv.o nouveau_state.o \
- nouveau_irq.o nouveau_bios.o nouveau_hw.o \
+ nouveau_irq.o nouveau_bios.o nouveau_hw.o nouveau_mem.o \
nouveau_i2c.o nouveau_calc.o nouveau_dp.o nouveau_connector.o \
nouveau_display.o nouveau_fbcon.o nouveau_dma.o \
+ nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \
nv04_tv.o nv04_dfp.o nv04_dac.o nv04_timer.o \
nv10_gpio.o \
nv50_gpio.o nv50_grctx.o \
nv50_display.o nv50_crtc.o nv50_cursor.o nv50_calc.o nv50_dac.o \
nv50_sor.o \
+ nv04_pm.o nv50_pm.o nva3_pm.o \
pscnv_mm.o pscnv_mem.o pscnv_vm.o pscnv_gem.o pscnv_ioctl.o \
pscnv_ramht.o pscnv_chan.o pscnv_sysram.o \
nv50_vram.o nv50_vm.o nv50_chan.o nv50_fifo.o nv50_graph.o \
View
@@ -291,6 +291,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;
}
Oops, something went wrong.

0 comments on commit 420c14a

Please sign in to comment.