rpms/kernel/F-12 drm-nouveau.patch, 1.58, 1.59 drm-vga-arb.patch, 1.7, 1.8 kernel.spec, 1.1828, 1.1829 drm-edid-fixes.patch, 1.1, NONE drm-next.patch, 1.18, NONE
Dave Airlie
airlied at fedoraproject.org
Fri Sep 25 03:43:53 UTC 2009
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29216
Modified Files:
drm-nouveau.patch drm-vga-arb.patch kernel.spec
Removed Files:
drm-edid-fixes.patch drm-next.patch
Log Message:
* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
- drm-next update - fix r600 s/r, and command line mode picking and r600 tv
drm-nouveau.patch:
drivers/gpu/drm/Kconfig | 45
drivers/gpu/drm/Makefile | 2
drivers/gpu/drm/i2c/Makefile | 4
drivers/gpu/drm/i2c/ch7006_drv.c | 531
drivers/gpu/drm/i2c/ch7006_mode.c | 473
drivers/gpu/drm/i2c/ch7006_priv.h | 344
drivers/gpu/drm/nouveau/Makefile | 29
drivers/gpu/drm/nouveau/nouveau_acpi.c | 127
drivers/gpu/drm/nouveau/nouveau_backlight.c | 155
drivers/gpu/drm/nouveau/nouveau_bios.c | 5476 ++++++
drivers/gpu/drm/nouveau/nouveau_bios.h | 235
drivers/gpu/drm/nouveau/nouveau_bo.c | 620
drivers/gpu/drm/nouveau/nouveau_calc.c | 626
drivers/gpu/drm/nouveau/nouveau_channel.c | 540
drivers/gpu/drm/nouveau/nouveau_connector.c | 754
drivers/gpu/drm/nouveau/nouveau_connector.h | 55
drivers/gpu/drm/nouveau/nouveau_crtc.h | 95
drivers/gpu/drm/nouveau/nouveau_debugfs.c | 157
drivers/gpu/drm/nouveau/nouveau_display.c | 115
drivers/gpu/drm/nouveau/nouveau_dma.c | 206
drivers/gpu/drm/nouveau/nouveau_dma.h | 148
drivers/gpu/drm/nouveau/nouveau_drv.c | 437
drivers/gpu/drm/nouveau/nouveau_drv.h | 1262 +
drivers/gpu/drm/nouveau/nouveau_encoder.h | 66
drivers/gpu/drm/nouveau/nouveau_fb.h | 47
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 357
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 48
drivers/gpu/drm/nouveau/nouveau_fence.c | 262
drivers/gpu/drm/nouveau/nouveau_gem.c | 954 +
drivers/gpu/drm/nouveau/nouveau_hw.c | 1078 +
drivers/gpu/drm/nouveau/nouveau_hw.h | 448
drivers/gpu/drm/nouveau/nouveau_i2c.c | 256
drivers/gpu/drm/nouveau/nouveau_i2c.h | 45
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 72
drivers/gpu/drm/nouveau/nouveau_irq.c | 688
drivers/gpu/drm/nouveau/nouveau_mem.c | 572
drivers/gpu/drm/nouveau/nouveau_notifier.c | 194
drivers/gpu/drm/nouveau/nouveau_object.c | 1294 +
drivers/gpu/drm/nouveau/nouveau_reg.h | 833 +
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 318
drivers/gpu/drm/nouveau/nouveau_state.c | 848 +
drivers/gpu/drm/nouveau/nouveau_swmthd.h | 33
drivers/gpu/drm/nouveau/nouveau_ttm.c | 131
drivers/gpu/drm/nouveau/nv04_crtc.c | 1019 +
drivers/gpu/drm/nouveau/nv04_cursor.c | 70
drivers/gpu/drm/nouveau/nv04_dac.c | 529
drivers/gpu/drm/nouveau/nv04_dfp.c | 621
drivers/gpu/drm/nouveau/nv04_display.c | 293
drivers/gpu/drm/nouveau/nv04_fb.c | 21
drivers/gpu/drm/nouveau/nv04_fbcon.c | 295
drivers/gpu/drm/nouveau/nv04_fifo.c | 296
drivers/gpu/drm/nouveau/nv04_graph.c | 585
drivers/gpu/drm/nouveau/nv04_instmem.c | 210
drivers/gpu/drm/nouveau/nv04_mc.c | 20
drivers/gpu/drm/nouveau/nv04_timer.c | 51
drivers/gpu/drm/nouveau/nv04_tv.c | 305
drivers/gpu/drm/nouveau/nv10_fb.c | 24
drivers/gpu/drm/nouveau/nv10_fifo.c | 178
drivers/gpu/drm/nouveau/nv10_graph.c | 950 +
drivers/gpu/drm/nouveau/nv17_tv.c | 688
drivers/gpu/drm/nouveau/nv17_tv.h | 156
drivers/gpu/drm/nouveau/nv17_tv_modes.c | 583
drivers/gpu/drm/nouveau/nv20_graph.c | 789
drivers/gpu/drm/nouveau/nv40_fb.c | 62
drivers/gpu/drm/nouveau/nv40_fifo.c | 224
drivers/gpu/drm/nouveau/nv40_graph.c | 2238 ++
drivers/gpu/drm/nouveau/nv40_mc.c | 38
drivers/gpu/drm/nouveau/nv50_crtc.c | 809 +
drivers/gpu/drm/nouveau/nv50_cursor.c | 151
drivers/gpu/drm/nouveau/nv50_dac.c | 295
drivers/gpu/drm/nouveau/nv50_display.c | 902 +
drivers/gpu/drm/nouveau/nv50_display.h | 46
drivers/gpu/drm/nouveau/nv50_evo.h | 113
drivers/gpu/drm/nouveau/nv50_fbcon.c | 256
drivers/gpu/drm/nouveau/nv50_fifo.c | 479
drivers/gpu/drm/nouveau/nv50_graph.c | 450
drivers/gpu/drm/nouveau/nv50_grctx.h |22284 ++++++++++++++++++++++++++++
drivers/gpu/drm/nouveau/nv50_instmem.c | 508
drivers/gpu/drm/nouveau/nv50_mc.c | 40
drivers/gpu/drm/nouveau/nv50_sor.c | 250
drivers/gpu/drm/nouveau/nvreg.h | 535
drivers/gpu/drm/ttm/ttm_bo.c | 4
include/drm/Kbuild | 1
include/drm/i2c/ch7006.h | 86
include/drm/nouveau_drm.h | 216
85 files changed, 58650 insertions(+)
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- drm-nouveau.patch 21 Sep 2009 05:38:42 -0000 1.58
+++ drm-nouveau.patch 25 Sep 2009 03:43:51 -0000 1.59
@@ -9732,7 +9732,7 @@ index 0000000..681a761
+ mode->vdisplay <= native->vdisplay) {
+ m = drm_cvt_mode(dev, mode->hdisplay, mode->vdisplay,
+ drm_mode_vrefresh(native), false,
-+ false);
++ false, false);
+ if (!m)
+ continue;
+
@@ -12872,7 +12872,7 @@ index 0000000..3397a88
+static int
+nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
+ uint32_t fb_height, uint32_t surface_width,
-+ uint32_t surface_height, struct drm_framebuffer **pfb)
++ uint32_t surface_height, uint32_t surface_depth, uint32_t surface_bpp, struct drm_framebuffer **pfb)
+{
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ struct fb_info *info;
@@ -26940,7 +26940,7 @@ index 0000000..051da27
+ } else {
+ mode = drm_cvt_mode(encoder->dev, modes[i].hdisplay,
+ modes[i].vdisplay, 60, false,
-+ output_mode->flags & DRM_MODE_FLAG_INTERLACE);
++ output_mode->flags & DRM_MODE_FLAG_INTERLACE, false);
+ }
+
+ /* CVT modes are sometimes unsuitable... */
drm-vga-arb.patch:
drivers/gpu/drm/drm_irq.c | 27 +++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_dma.c | 20 ++++++++++++++++++++
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 1 +
drivers/gpu/drm/radeon/r100.c | 14 ++++++++++++++
drivers/gpu/drm/radeon/r600.c | 14 ++++++++++++++
drivers/gpu/drm/radeon/r600d.h | 1 +
drivers/gpu/drm/radeon/radeon.h | 2 ++
drivers/gpu/drm/radeon/radeon_asic.h | 12 ++++++++++++
drivers/gpu/drm/radeon/radeon_device.c | 21 ++++++++++++++++++++-
include/drm/drmP.h | 4 +++-
13 files changed, 133 insertions(+), 2 deletions(-)
Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-vga-arb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drm-vga-arb.patch 8 Sep 2009 04:03:56 -0000 1.7
+++ drm-vga-arb.patch 25 Sep 2009 03:43:52 -0000 1.8
@@ -1,8 +1,18 @@
-From ba0d10c754ca30de35063a5e14c92bb7328a9f32 Mon Sep 17 00:00:00 2001
+From 28d520433b6375740990ab99d69b0d0067fd656b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
-Date: Tue, 8 Sep 2009 13:54:31 +1000
-Subject: [PATCH] drm-vga-arb.patch
+Date: Mon, 21 Sep 2009 14:33:58 +1000
+Subject: [PATCH] drm/vgaarb: add VGA arbitration support to the drm and kms.
+VGA arb requires DRM support for non-kms drivers, to turn on/off
+irqs when disabling the mem/io regions.
+
+VGA arb requires KMS support for GPUs where we can turn off VGA
+decoding. Currently we know how to do this for intel and radeon
+kms drivers, which allows them to be removed from the arbiter.
+
+This patch comes from Fedora rawhide kernel.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
---
drivers/gpu/drm/drm_irq.c | 27 +++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_dma.c | 20 ++++++++++++++++++++
@@ -15,9 +25,9 @@ Subject: [PATCH] drm-vga-arb.patch
drivers/gpu/drm/radeon/r600d.h | 1 +
drivers/gpu/drm/radeon/radeon.h | 2 ++
drivers/gpu/drm/radeon/radeon_asic.h | 12 ++++++++++++
- drivers/gpu/drm/radeon/radeon_device.c | 19 +++++++++++++++++++
+ drivers/gpu/drm/radeon/radeon_device.c | 21 ++++++++++++++++++++-
include/drm/drmP.h | 3 +++
- 13 files changed, 132 insertions(+), 0 deletions(-)
+ 13 files changed, 133 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index f85aaf2..0a6f0b3 100644
@@ -190,10 +200,10 @@ index b9e47f1..3a0004f 100644
+
#endif /* __INTEL_DRV_H__ */
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index 5708c07..386ddbc 100644
+index 737970b..be51c5f 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1916,6 +1916,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
+@@ -1955,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
rdev->mc.real_vram_size = rdev->mc.aper_size;
}
@@ -215,11 +225,11 @@ index 5708c07..386ddbc 100644
{
r100_vram_get_type(rdev);
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index d8fcef4..3417dff 100644
+index 5f42fad..eab31c1 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -1444,6 +1444,20 @@ bool r600_card_posted(struct radeon_device *rdev)
- return false;
+@@ -1499,6 +1499,20 @@ int r600_startup(struct radeon_device *rdev)
+ return 0;
}
+void r600_vga_set_state(struct radeon_device *rdev, bool state)
@@ -252,10 +262,10 @@ index 723295f..4a9028a 100644
#define CP_COHER_BASE 0x85F8
#define CP_DEBUG 0xC1FC
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 3299733..98a0c7f 100644
+index 817af8e..c839b60 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -592,6 +592,7 @@ struct radeon_asic {
+@@ -596,6 +596,7 @@ struct radeon_asic {
int (*suspend)(struct radeon_device *rdev);
void (*errata)(struct radeon_device *rdev);
void (*vram_info)(struct radeon_device *rdev);
@@ -263,7 +273,7 @@ index 3299733..98a0c7f 100644
int (*gpu_reset)(struct radeon_device *rdev);
int (*mc_init)(struct radeon_device *rdev);
void (*mc_fini)(struct radeon_device *rdev);
-@@ -901,6 +902,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
+@@ -954,6 +955,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
#define radeon_cs_parse(p) rdev->asic->cs_parse((p))
#define radeon_errata(rdev) (rdev)->asic->errata((rdev))
#define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
@@ -272,7 +282,7 @@ index 3299733..98a0c7f 100644
#define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
#define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index e87bb91..fd18cd6 100644
+index 5f2a9e6..8968f78 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
@@ -283,7 +293,7 @@ index e87bb91..fd18cd6 100644
int r100_gpu_reset(struct radeon_device *rdev);
int r100_mc_init(struct radeon_device *rdev);
void r100_mc_fini(struct radeon_device *rdev);
-@@ -87,6 +88,7 @@ static struct radeon_asic r100_asic = {
+@@ -89,6 +90,7 @@ static struct radeon_asic r100_asic = {
.init = &r100_init,
.errata = &r100_errata,
.vram_info = &r100_vram_info,
@@ -291,7 +301,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &r100_gpu_reset,
.mc_init = &r100_mc_init,
.mc_fini = &r100_mc_fini,
-@@ -152,6 +154,7 @@ static struct radeon_asic r300_asic = {
+@@ -158,6 +160,7 @@ static struct radeon_asic r300_asic = {
.init = &r300_init,
.errata = &r300_errata,
.vram_info = &r300_vram_info,
@@ -299,15 +309,15 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &r300_gpu_reset,
.mc_init = &r300_mc_init,
.mc_fini = &r300_mc_fini,
-@@ -197,6 +200,7 @@ static struct radeon_asic r420_asic = {
- .init = &r300_init,
- .errata = &r420_errata,
- .vram_info = &r420_vram_info,
+@@ -208,6 +211,7 @@ static struct radeon_asic r420_asic = {
+ .resume = &r420_resume,
+ .errata = NULL,
+ .vram_info = NULL,
+ .vga_set_state = &r100_vga_set_state,
.gpu_reset = &r300_gpu_reset,
- .mc_init = &r420_mc_init,
- .mc_fini = &r420_mc_fini,
-@@ -249,6 +253,7 @@ static struct radeon_asic rs400_asic = {
+ .mc_init = NULL,
+ .mc_fini = NULL,
+@@ -262,6 +266,7 @@ static struct radeon_asic rs400_asic = {
.init = &r300_init,
.errata = &rs400_errata,
.vram_info = &rs400_vram_info,
@@ -315,7 +325,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &r300_gpu_reset,
.mc_init = &rs400_mc_init,
.mc_fini = &rs400_mc_fini,
-@@ -306,6 +311,7 @@ static struct radeon_asic rs600_asic = {
+@@ -323,6 +328,7 @@ static struct radeon_asic rs600_asic = {
.init = &rs600_init,
.errata = &rs600_errata,
.vram_info = &rs600_vram_info,
@@ -323,7 +333,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &r300_gpu_reset,
.mc_init = &rs600_mc_init,
.mc_fini = &rs600_mc_fini,
-@@ -353,6 +359,7 @@ static struct radeon_asic rs690_asic = {
+@@ -372,6 +378,7 @@ static struct radeon_asic rs690_asic = {
.init = &rs600_init,
.errata = &rs690_errata,
.vram_info = &rs690_vram_info,
@@ -331,7 +341,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &r300_gpu_reset,
.mc_init = &rs690_mc_init,
.mc_fini = &rs690_mc_fini,
-@@ -407,6 +414,7 @@ static struct radeon_asic rv515_asic = {
+@@ -428,6 +435,7 @@ static struct radeon_asic rv515_asic = {
.init = &rv515_init,
.errata = &rv515_errata,
.vram_info = &rv515_vram_info,
@@ -339,7 +349,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &rv515_gpu_reset,
.mc_init = &rv515_mc_init,
.mc_fini = &rv515_mc_fini,
-@@ -454,6 +462,7 @@ static struct radeon_asic r520_asic = {
+@@ -477,6 +485,7 @@ static struct radeon_asic r520_asic = {
.init = &rv515_init,
.errata = &r520_errata,
.vram_info = &r520_vram_info,
@@ -347,7 +357,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &rv515_gpu_reset,
.mc_init = &r520_mc_init,
.mc_fini = &r520_mc_fini,
-@@ -495,6 +504,7 @@ int r600_init(struct radeon_device *rdev);
+@@ -520,6 +529,7 @@ int r600_init(struct radeon_device *rdev);
void r600_fini(struct radeon_device *rdev);
int r600_suspend(struct radeon_device *rdev);
int r600_resume(struct radeon_device *rdev);
@@ -355,7 +365,7 @@ index e87bb91..fd18cd6 100644
int r600_wb_init(struct radeon_device *rdev);
void r600_wb_fini(struct radeon_device *rdev);
void r600_cp_commit(struct radeon_device *rdev);
-@@ -531,6 +541,7 @@ static struct radeon_asic r600_asic = {
+@@ -556,6 +566,7 @@ static struct radeon_asic r600_asic = {
.resume = &r600_resume,
.cp_commit = &r600_cp_commit,
.vram_info = NULL,
@@ -363,7 +373,7 @@ index e87bb91..fd18cd6 100644
.gpu_reset = &r600_gpu_reset,
.mc_init = NULL,
.mc_fini = NULL,
-@@ -581,6 +592,7 @@ static struct radeon_asic rv770_asic = {
+@@ -606,6 +617,7 @@ static struct radeon_asic rv770_asic = {
.cp_commit = &r600_cp_commit,
.vram_info = NULL,
.gpu_reset = &rv770_gpu_reset,
@@ -372,7 +382,7 @@ index e87bb91..fd18cd6 100644
.mc_fini = NULL,
.wb_init = &r600_wb_init,
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index f2469c5..764d2f8 100644
+index 8a40c61..daf5db7 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -29,6 +29,7 @@
@@ -383,9 +393,9 @@ index f2469c5..764d2f8 100644
#include "radeon_reg.h"
#include "radeon.h"
#include "radeon_asic.h"
-@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
- int radeon_modeset_init(struct radeon_device *rdev);
- void radeon_modeset_fini(struct radeon_device *rdev);
+@@ -480,7 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
+ {
+ }
+/* if we get transitioned to only one device, tak VGA back */
+static unsigned int radeon_vga_set_decode(void *cookie, bool state)
@@ -402,20 +412,29 @@ index f2469c5..764d2f8 100644
/*
* Radeon device.
*/
-@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -578,6 +590,13 @@ int radeon_device_init(struct radeon_device *rdev,
+ if (r) {
+ return r;
+ }
++
++ /* if we have > 1 VGA cards, then disable the radeon VGA resources */
++ r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
++ if (r) {
++ return -EINVAL;
++ }
++
+ if (!rdev->new_init_path) {
+ /* Setup errata flags */
+ radeon_errata(rdev);
+@@ -586,7 +605,6 @@ int radeon_device_init(struct radeon_device *rdev,
/* Initialize surface registers */
radeon_surface_init(rdev);
-+ /* if we have > 1 VGA cards, then disable the radeon VGA resources */
-+ ret = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-+ if (ret) {
-+ return -EINVAL;
-+ }
-+
- /* TODO: disable VGA need to use VGA request */
+- /* TODO: disable VGA need to use VGA request */
/* BIOS*/
if (!radeon_get_bios(rdev)) {
-@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_device *rdev)
+ if (ASIC_IS_AVIVO(rdev))
+@@ -697,6 +715,7 @@ void radeon_device_fini(struct radeon_device *rdev)
radeon_agp_fini(rdev);
#endif
radeon_irq_kms_fini(rdev);
@@ -438,5 +457,5 @@ index eeefb63..c8e64bb 100644
struct vm_operations_struct *gem_vm_ops;
--
-1.6.0.6
+1.6.4.2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1828
retrieving revision 1.1829
diff -u -p -r1.1828 -r1.1829
--- kernel.spec 24 Sep 2009 19:48:11 -0000 1.1828
+++ kernel.spec 25 Sep 2009 03:43:53 -0000 1.1829
@@ -696,7 +696,7 @@ Patch1578: linux-2.6-xen-stack-protector
Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
# nouveau + drm fixes
-Patch1812: drm-next.patch
+Patch1812: drm-next-31edd4824e.patch
Patch1813: drm-radeon-pm.patch
Patch1814: drm-nouveau.patch
Patch1818: drm-i915-resume-force-mode.patch
@@ -705,7 +705,6 @@ Patch1819: drm-intel-big-hammer.patch
Patch1824: drm-intel-next.patch
Patch1825: drm-intel-pm.patch
Patch1826: drm-intel-no-tv-hotplug.patch
-Patch1827: drm-edid-fixes.patch
# vga arb
Patch1900: linux-2.6-vga-arb.patch
@@ -1362,7 +1361,7 @@ ApplyPatch linux-2.6-block-silently-erro
ApplyPatch linux-2.6-e1000-ich9.patch
# Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
+ApplyPatch drm-next-31edd4824e.patch
ApplyPatch drm-nouveau.patch
# pm broken on my thinkpad t60p - airlied
@@ -1373,7 +1372,6 @@ ApplyOptionalPatch drm-intel-next.patch
#this appears to be upstream - mjg59?
#ApplyPatch drm-intel-pm.patch
ApplyPatch drm-intel-no-tv-hotplug.patch
-ApplyPatch drm-edid-fixes.patch
# VGA arb + drm
ApplyPatch linux-2.6-vga-arb.patch
@@ -2061,6 +2059,9 @@ fi
# and build.
%changelog
+* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-42
+- drm-next update - fix r600 s/r, and command line mode picking and r600 tv
+
* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.1-41
- Linux 2.6.31.1
- Drop patches merged upstream:
--- drm-edid-fixes.patch DELETED ---
--- drm-next.patch DELETED ---
More information about the fedora-extras-commits
mailing list