rpms/kernel/devel drm-next.patch, 1.21, 1.22 kernel.spec, 1.2023, 1.2024 drm-disable-radeon_pm.patch, 1.1, NONE drm_gem_object_alloc-i915_gem_alloc_object.patch, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Sun Jun 13 11:30:57 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26540
Modified Files:
drm-next.patch kernel.spec
Removed Files:
drm-disable-radeon_pm.patch
drm_gem_object_alloc-i915_gem_alloc_object.patch
Log Message:
* Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-33
- Update drm-next to include fixes since 2.6.35-rc1.
drm-next.patch:
b/Documentation/DocBook/Makefile | 2
b/Documentation/DocBook/drm.tmpl | 839 +++++++++
b/arch/x86/include/asm/cacheflush.h | 2
b/arch/x86/mm/pageattr.c | 53
b/drivers/char/agp/agp.h | 80
b/drivers/char/agp/ali-agp.c | 1
b/drivers/char/agp/amd-k7-agp.c | 9
b/drivers/char/agp/amd64-agp.c | 28
b/drivers/char/agp/ati-agp.c | 8
b/drivers/char/agp/efficeon-agp.c | 1
b/drivers/char/agp/intel-agp.c | 1883 +---------------------
b/drivers/char/agp/intel-agp.h | 239 ++
b/drivers/char/agp/intel-gtt.c | 1548 ++++++++++++++++++
b/drivers/char/agp/nvidia-agp.c | 1
b/drivers/char/agp/sis-agp.c | 9
b/drivers/char/agp/uninorth-agp.c | 16
b/drivers/char/agp/via-agp.c | 2
b/drivers/gpu/drm/Kconfig | 4
b/drivers/gpu/drm/drm_auth.c | 3
b/drivers/gpu/drm/drm_crtc.c | 9
b/drivers/gpu/drm/drm_crtc_helper.c | 506 +----
b/drivers/gpu/drm/drm_dma.c | 4
b/drivers/gpu/drm/drm_edid.c | 807 ++++++---
b/drivers/gpu/drm/drm_fb_helper.c | 908 +++++++---
b/drivers/gpu/drm/drm_fops.c | 3
b/drivers/gpu/drm/drm_gem.c | 49
b/drivers/gpu/drm/drm_modes.c | 105 -
b/drivers/gpu/drm/drm_sysfs.c | 2
b/drivers/gpu/drm/i915/Makefile | 3
b/drivers/gpu/drm/i915/dvo.h | 10
b/drivers/gpu/drm/i915/dvo_ch7017.c | 46
b/drivers/gpu/drm/i915/dvo_ch7xxx.c | 44
b/drivers/gpu/drm/i915/dvo_ivch.c | 21
b/drivers/gpu/drm/i915/dvo_sil164.c | 38
b/drivers/gpu/drm/i915/dvo_tfp410.c | 32
b/drivers/gpu/drm/i915/i915_debugfs.c | 110 -
b/drivers/gpu/drm/i915/i915_dma.c | 730 ++++++--
b/drivers/gpu/drm/i915/i915_drv.c | 99 -
b/drivers/gpu/drm/i915/i915_drv.h | 243 +-
b/drivers/gpu/drm/i915/i915_gem.c | 1045 +++++-------
b/drivers/gpu/drm/i915/i915_gem_debug.c | 2
b/drivers/gpu/drm/i915/i915_gem_tiling.c | 5
b/drivers/gpu/drm/i915/i915_irq.c | 205 +-
b/drivers/gpu/drm/i915/i915_reg.h | 225 ++
b/drivers/gpu/drm/i915/i915_suspend.c | 41
b/drivers/gpu/drm/i915/i915_trace.h | 112 -
b/drivers/gpu/drm/i915/intel_bios.c | 11
b/drivers/gpu/drm/i915/intel_crt.c | 116 -
b/drivers/gpu/drm/i915/intel_display.c | 1337 +++++++++++----
b/drivers/gpu/drm/i915/intel_dp.c | 263 +--
b/drivers/gpu/drm/i915/intel_drv.h | 31
b/drivers/gpu/drm/i915/intel_dvo.c | 103 -
b/drivers/gpu/drm/i915/intel_fb.c | 217 +-
b/drivers/gpu/drm/i915/intel_hdmi.c | 76
b/drivers/gpu/drm/i915/intel_lvds.c | 111 -
b/drivers/gpu/drm/i915/intel_modes.c | 21
b/drivers/gpu/drm/i915/intel_overlay.c | 60
b/drivers/gpu/drm/i915/intel_ringbuffer.c | 849 +++++++++
b/drivers/gpu/drm/i915/intel_ringbuffer.h | 124 +
b/drivers/gpu/drm/i915/intel_sdvo.c | 1009 +++++------
b/drivers/gpu/drm/i915/intel_tv.c | 185 --
b/drivers/gpu/drm/nouveau/Makefile | 3
b/drivers/gpu/drm/nouveau/nouveau_acpi.c | 71
b/drivers/gpu/drm/nouveau/nouveau_bios.c | 571 ++++--
b/drivers/gpu/drm/nouveau/nouveau_bios.h | 1
b/drivers/gpu/drm/nouveau/nouveau_bo.c | 116 -
b/drivers/gpu/drm/nouveau/nouveau_connector.c | 49
b/drivers/gpu/drm/nouveau/nouveau_crtc.h | 2
b/drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3
b/drivers/gpu/drm/nouveau/nouveau_display.c | 42
b/drivers/gpu/drm/nouveau/nouveau_drv.c | 48
b/drivers/gpu/drm/nouveau/nouveau_drv.h | 17
b/drivers/gpu/drm/nouveau/nouveau_encoder.h | 2
b/drivers/gpu/drm/nouveau/nouveau_fb.h | 6
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 259 +--
b/drivers/gpu/drm/nouveau/nouveau_fbcon.h | 19
b/drivers/gpu/drm/nouveau/nouveau_gem.c | 5
b/drivers/gpu/drm/nouveau/nouveau_grctx.c | 6
b/drivers/gpu/drm/nouveau/nouveau_i2c.c | 21
b/drivers/gpu/drm/nouveau/nouveau_irq.c | 10
b/drivers/gpu/drm/nouveau/nouveau_mem.c | 3
b/drivers/gpu/drm/nouveau/nouveau_reg.h | 1
b/drivers/gpu/drm/nouveau/nouveau_state.c | 64
b/drivers/gpu/drm/nouveau/nv04_cursor.c | 1
b/drivers/gpu/drm/nouveau/nv04_fbcon.c | 18
b/drivers/gpu/drm/nouveau/nv04_graph.c | 566 ++++++
b/drivers/gpu/drm/nouveau/nv40_graph.c | 8
b/drivers/gpu/drm/nouveau/nv40_grctx.c | 5
b/drivers/gpu/drm/nouveau/nv50_calc.c | 87 +
b/drivers/gpu/drm/nouveau/nv50_crtc.c | 46
b/drivers/gpu/drm/nouveau/nv50_cursor.c | 1
b/drivers/gpu/drm/nouveau/nv50_display.c | 36
b/drivers/gpu/drm/nouveau/nv50_fbcon.c | 16
b/drivers/gpu/drm/nouveau/nv50_sor.c | 18
b/drivers/gpu/drm/radeon/Makefile | 7
b/drivers/gpu/drm/radeon/atombios.h | 76
b/drivers/gpu/drm/radeon/atombios_crtc.c | 23
b/drivers/gpu/drm/radeon/atombios_dp.c | 2
b/drivers/gpu/drm/radeon/evergreen.c | 1554 +++++++++++++++++-
b/drivers/gpu/drm/radeon/evergreen_cs.c | 1356 +++++++++++++++
b/drivers/gpu/drm/radeon/evergreen_reg.h | 7
b/drivers/gpu/drm/radeon/evergreend.h | 1020 +++++++++++
b/drivers/gpu/drm/radeon/r100.c | 729 ++++++--
b/drivers/gpu/drm/radeon/r100d.h | 164 +
b/drivers/gpu/drm/radeon/r300.c | 152 -
b/drivers/gpu/drm/radeon/r300d.h | 47
b/drivers/gpu/drm/radeon/r420.c | 36
b/drivers/gpu/drm/radeon/r500_reg.h | 3
b/drivers/gpu/drm/radeon/r520.c | 7
b/drivers/gpu/drm/radeon/r600.c | 606 ++++++-
b/drivers/gpu/drm/radeon/r600_audio.c | 58
b/drivers/gpu/drm/radeon/r600_blit_kms.c | 3
b/drivers/gpu/drm/radeon/r600_hdmi.c | 65
b/drivers/gpu/drm/radeon/r600_reg.h | 57
b/drivers/gpu/drm/radeon/radeon.h | 260 ++-
b/drivers/gpu/drm/radeon/radeon_agp.c | 5
b/drivers/gpu/drm/radeon/radeon_asic.c | 144 +
b/drivers/gpu/drm/radeon/radeon_asic.h | 45
b/drivers/gpu/drm/radeon/radeon_atombios.c | 323 ++-
b/drivers/gpu/drm/radeon/radeon_bios.c | 3
b/drivers/gpu/drm/radeon/radeon_combios.c | 69
b/drivers/gpu/drm/radeon/radeon_connectors.c | 63
b/drivers/gpu/drm/radeon/radeon_cs.c | 4
b/drivers/gpu/drm/radeon/radeon_device.c | 72
b/drivers/gpu/drm/radeon/radeon_display.c | 129 -
b/drivers/gpu/drm/radeon/radeon_drv.c | 7
b/drivers/gpu/drm/radeon/radeon_encoders.c | 44
b/drivers/gpu/drm/radeon/radeon_fb.c | 358 ++--
b/drivers/gpu/drm/radeon/radeon_fence.c | 107 -
b/drivers/gpu/drm/radeon/radeon_gart.c | 2
b/drivers/gpu/drm/radeon/radeon_gem.c | 6
b/drivers/gpu/drm/radeon/radeon_irq_kms.c | 5
b/drivers/gpu/drm/radeon/radeon_kms.c | 18
b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 14
b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 15
b/drivers/gpu/drm/radeon/radeon_mode.h | 49
b/drivers/gpu/drm/radeon/radeon_object.c | 44
b/drivers/gpu/drm/radeon/radeon_object.h | 2
b/drivers/gpu/drm/radeon/radeon_pm.c | 799 ++++++---
b/drivers/gpu/drm/radeon/radeon_reg.h | 4
b/drivers/gpu/drm/radeon/radeon_ring.c | 66
b/drivers/gpu/drm/radeon/radeon_state.c | 5
b/drivers/gpu/drm/radeon/radeon_ttm.c | 122 -
b/drivers/gpu/drm/radeon/reg_srcs/evergreen | 611 +++++++
b/drivers/gpu/drm/radeon/rs400.c | 9
b/drivers/gpu/drm/radeon/rs600.c | 232 ++
b/drivers/gpu/drm/radeon/rs600d.h | 80
b/drivers/gpu/drm/radeon/rs690.c | 289 +--
b/drivers/gpu/drm/radeon/rv515.c | 287 +--
b/drivers/gpu/drm/radeon/rv515d.h | 46
b/drivers/gpu/drm/radeon/rv770.c | 33
b/drivers/gpu/drm/savage/savage_bci.c | 3
b/drivers/gpu/drm/ttm/Makefile | 2
b/drivers/gpu/drm/ttm/ttm_bo.c | 98 -
b/drivers/gpu/drm/ttm/ttm_bo_util.c | 122 -
b/drivers/gpu/drm/ttm/ttm_bo_vm.c | 41
b/drivers/gpu/drm/ttm/ttm_memory.c | 7
b/drivers/gpu/drm/ttm/ttm_page_alloc.c | 855 +++++++++
b/drivers/gpu/drm/ttm/ttm_tt.c | 44
b/drivers/gpu/drm/vmwgfx/Makefile | 2
b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 50
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 24
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 49
b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 13
b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 101 -
b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 173 ++
b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 23
b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 17
b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 209 +-
b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4
b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 189 +-
b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 4
b/drivers/gpu/vga/Kconfig | 6
b/drivers/gpu/vga/vgaarb.c | 61
b/drivers/staging/Kconfig | 2
b/drivers/video/efifb.c | 11
b/drivers/video/fbmem.c | 74
b/drivers/video/fbsysfs.c | 1
b/drivers/video/offb.c | 28
b/drivers/video/vesafb.c | 11
b/drivers/video/vga16fb.c | 26
b/include/drm/drmP.h | 3
b/include/drm/drm_crtc.h | 43
b/include/drm/drm_crtc_helper.h | 12
b/include/drm/drm_edid.h | 5
b/include/drm/drm_fb_helper.h | 67
b/include/drm/drm_fixed.h | 67
b/include/drm/i915_drm.h | 5
b/include/drm/nouveau_drm.h | 1
b/include/drm/radeon_drm.h | 1
b/include/drm/ttm/ttm_bo_api.h | 46
b/include/drm/ttm/ttm_bo_driver.h | 57
b/include/drm/ttm/ttm_page_alloc.h | 74
b/include/drm/vmwgfx_drm.h | 26
b/include/linux/fb.h | 19
b/include/linux/vgaarb.h | 21
drivers/gpu/drm/radeon/radeon_fixed.h | 67
197 files changed, 21270 insertions(+), 8603 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 drm-next.patchIndex: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- drm-next.patch 31 May 2010 14:12:01 -0000 1.21
+++ drm-next.patch 13 Jun 2010 11:30:55 -0000 1.22
@@ -1,10 +1,86 @@
-# generated with:
-# $ git branch stable-2.6.34 v2.6.34
-# $ git fetch drm-2.6
-# $ git branch drm-next drm-2.6/drm-next
-# $ git branch drm-rebase stable-2.6.34
-# $ git rebase --onto drm-rebase TAIL..drm-next
-# <fix up rejects, enable nouveau>
+commit f06fda0d7acc5a58196ffb5bb28bd8190427b69d
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Thu Jun 3 07:19:45 2010 -0700
+
+ Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
+
+ * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits)
+ drm/radeon/kms: make sure display hw is disabled when suspending
+ drm/vmwgfx: Allow userspace to change default layout. Bump minor.
+ drm/vmwgfx: Fix framebuffer modesetting
+ drm/vmwgfx: Fix vga save / restore with display topology.
+ vgaarb: use MIT license
+ vgaarb: convert pr_devel() to pr_debug()
+ drm: fix typos in Linux DRM Developer's Guide
+ drm/radeon/kms/pm: voltage fixes
+ drm/radeon/kms/pm: radeon_set_power_state fixes
+ drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+
+ drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen
+ drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)
+ drm/radeon/kms/evergreen: add initial CS parser
+ drm/kms: disable/enable poll around switcheroo on/off
+ drm/nouveau: fixup confusion over which handle the DSM is hanging off.
+ drm/nouveau: attempt to get bios from ACPI v3
+ drm/nv50: cast IGP memory location to u64 before shifting
+ drm/ttm: Fix ttm_page_alloc.c
+ drm/ttm: Fix cached TTM page allocation.
+ drm/vmwgfx: Remove some leftover debug messages.
+ ...
+
+commit baa7e3afb3d5fb414ee24f2db0e8652e7e0eede6
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Tue Jun 1 14:12:27 2010 -0700
+
+ Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
+
+ * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (41 commits)
+ drm/i915: add HAS_BSD check to i915_getparam
+ drm/i915: Honor sync polarity from VBT panel timing descriptors
+ drm/i915: Unmask interrupt for render engine on Sandybridge
+ drm/i915: Fix PIPE_CONTROL command on Sandybridge
+ drm/i915: Fix up address spaces in slow_kernel_write()
+ drm/i915: Use non-atomic kmap for slow copy paths
+ drm/i915: Avoid moving from CPU domain during pwrite
+ drm/i915: Cleanup after failed initialization of ringbuffers
+ drm/i915: Reject bind_to_gtt() early if object > aperture
+ drm/i915: Check error code whilst moving buffer to GTT domain.
+ drm/i915: Remove spurious warning "Failure to install fence"
+ drm/i915: Rebind bo if currently bound with incorrect alignment.
+ drm/i915: Include pitch in set_base debug statement.
+ drm/i915: Only print "nothing to do" debug message as required.
+ drm/i915: Propagate error from unbinding an unfenceable object.
+ drm/i915: Avoid nesting of domain changes when setting display plane
+ drm/i915: Hold the spinlock whilst resetting unpin_work along error path
+ drm/i915: Only print an message if there was an error
+ drm/i915: Clean up leftover bits from hws move to ring structure.
+ drm/i915: Add CxSR support on Pineview DDR3
+ ...
+
+commit 436cd723183cf14fba1fd47403aecd71ff32416a
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sat May 29 06:50:37 2010 +1000
+
+ drm/radeon: fix the r100/r200 ums block 0 page fix
+
+ airlied -> brown paper bag.
+
+ I blame Hi-5 or the Wiggles for lowering my IQ, move the fix inside some
+ brackets instead of breaking everything in site.
+
+ Cc: stable at kernel.org
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 3fe5bbc9666069dd38a23da33a35e752d5bf19d7
+Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
+Date: Tue Jun 1 15:41:32 2010 +0100
+
+ drm_gem_object_alloc -> i915_gem_alloc_object
+
+commit c172c0749d16b3efe02a5f812cff72698562a83c
+Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
+Date: Tue Jun 1 11:07:14 2010 +0100
+
+ gut radeon_pm init for now
commit 69cf253d1d16fbcc9225582776ebe11f2f13d921
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
@@ -3009,6 +3085,205 @@ Date: Mon Mar 29 21:43:18 2010 +0000
Signed-off-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/drm.tmpl | 839 ++++++++++
+ arch/x86/include/asm/cacheflush.h | 2 +
+ arch/x86/mm/pageattr.c | 53 +-
+ drivers/char/agp/agp.h | 80 -
+ drivers/char/agp/ali-agp.c | 1 +
+ drivers/char/agp/amd-k7-agp.c | 9 +
+ drivers/char/agp/amd64-agp.c | 28 +-
+ drivers/char/agp/ati-agp.c | 8 +
+ drivers/char/agp/efficeon-agp.c | 1 +
+ drivers/char/agp/intel-agp.c | 1883 ++---------------------
+ drivers/char/agp/intel-agp.h | 239 +++
+ drivers/char/agp/intel-gtt.c | 1548 +++++++++++++++++++
+ drivers/char/agp/nvidia-agp.c | 1 +
+ drivers/char/agp/sis-agp.c | 9 +-
+ drivers/char/agp/uninorth-agp.c | 16 +-
+ drivers/char/agp/via-agp.c | 2 +
+ drivers/gpu/drm/Kconfig | 4 +
+ drivers/gpu/drm/drm_auth.c | 3 +-
+ drivers/gpu/drm/drm_crtc.c | 9 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 506 ++-----
+ drivers/gpu/drm/drm_dma.c | 4 +-
+ drivers/gpu/drm/drm_edid.c | 807 +++++++---
+ drivers/gpu/drm/drm_fb_helper.c | 908 ++++++++----
+ drivers/gpu/drm/drm_fops.c | 3 +-
+ drivers/gpu/drm/drm_gem.c | 49 +-
+ drivers/gpu/drm/drm_modes.c | 105 +-
+ drivers/gpu/drm/drm_sysfs.c | 2 +-
+ drivers/gpu/drm/i915/Makefile | 3 +
+ drivers/gpu/drm/i915/dvo.h | 10 -
+ drivers/gpu/drm/i915/dvo_ch7017.c | 46 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c | 44 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 21 -
+ drivers/gpu/drm/i915/dvo_sil164.c | 38 -
+ drivers/gpu/drm/i915/dvo_tfp410.c | 32 -
+ drivers/gpu/drm/i915/i915_debugfs.c | 110 +-
+ drivers/gpu/drm/i915/i915_dma.c | 730 +++++++--
+ drivers/gpu/drm/i915/i915_drv.c | 99 +-
+ drivers/gpu/drm/i915/i915_drv.h | 243 ++--
+ drivers/gpu/drm/i915/i915_gem.c | 1045 ++++++--------
+ drivers/gpu/drm/i915/i915_gem_debug.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 5 +
+ drivers/gpu/drm/i915/i915_irq.c | 205 ++--
+ drivers/gpu/drm/i915/i915_reg.h | 225 +++-
+ drivers/gpu/drm/i915/i915_suspend.c | 41 +-
+ drivers/gpu/drm/i915/i915_trace.h | 112 +-
+ drivers/gpu/drm/i915/intel_bios.c | 11 +
+ drivers/gpu/drm/i915/intel_crt.c | 116 +-
+ drivers/gpu/drm/i915/intel_display.c | 1337 ++++++++++++-----
+ drivers/gpu/drm/i915/intel_dp.c | 263 ++--
+ drivers/gpu/drm/i915/intel_drv.h | 31 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 103 +-
+ drivers/gpu/drm/i915/intel_fb.c | 217 ++--
+ drivers/gpu/drm/i915/intel_hdmi.c | 76 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 111 +-
+ drivers/gpu/drm/i915/intel_modes.c | 21 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 60 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 849 ++++++++++
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 124 ++
+ drivers/gpu/drm/i915/intel_sdvo.c | 1009 ++++++-------
+ drivers/gpu/drm/i915/intel_tv.c | 185 +--
+ drivers/gpu/drm/nouveau/Makefile | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 71 +-
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 571 +++++---
+ drivers/gpu/drm/nouveau/nouveau_bios.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 116 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 49 +-
+ drivers/gpu/drm/nouveau/nouveau_crtc.h | 2 +
+ drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 +
+ drivers/gpu/drm/nouveau/nouveau_display.c | 42 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.c | 48 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 17 +-
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 +
+ drivers/gpu/drm/nouveau/nouveau_fb.h | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 259 ++--
+ drivers/gpu/drm/nouveau/nouveau_fbcon.h | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_grctx.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_i2c.c | 21 +-
+ drivers/gpu/drm/nouveau/nouveau_irq.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_reg.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_state.c | 64 +-
+ drivers/gpu/drm/nouveau/nv04_cursor.c | 1 +
+ drivers/gpu/drm/nouveau/nv04_fbcon.c | 18 +-
+ drivers/gpu/drm/nouveau/nv04_graph.c | 566 +++++++-
+ drivers/gpu/drm/nouveau/nv40_graph.c | 8 +-
+ drivers/gpu/drm/nouveau/nv40_grctx.c | 5 -
+ drivers/gpu/drm/nouveau/nv50_calc.c | 87 ++
+ drivers/gpu/drm/nouveau/nv50_crtc.c | 46 +-
+ drivers/gpu/drm/nouveau/nv50_cursor.c | 1 +
+ drivers/gpu/drm/nouveau/nv50_display.c | 36 +
+ drivers/gpu/drm/nouveau/nv50_fbcon.c | 16 +-
+ drivers/gpu/drm/nouveau/nv50_sor.c | 18 +-
[...14844 lines suppressed...]
+
+- pr_devel("%s\n", __func__);
++ pr_debug("%s\n", __func__);
+
+ if (priv == NULL)
+ return -ENODEV;
+@@ -1071,7 +1092,7 @@ static int vga_arb_open(struct inode *inode, struct file *file)
+ struct vga_arb_private *priv;
+ unsigned long flags;
+
+- pr_devel("%s\n", __func__);
++ pr_debug("%s\n", __func__);
+
+ priv = kmalloc(sizeof(struct vga_arb_private), GFP_KERNEL);
+ if (priv == NULL)
+@@ -1101,7 +1122,7 @@ static int vga_arb_release(struct inode *inode, struct file *file)
+ unsigned long flags;
+ int i;
+
+- pr_devel("%s\n", __func__);
++ pr_debug("%s\n", __func__);
+
+ if (priv == NULL)
+ return -ENODEV;
+@@ -1112,7 +1133,7 @@ static int vga_arb_release(struct inode *inode, struct file *file)
+ uc = &priv->cards[i];
+ if (uc->pdev == NULL)
+ continue;
+- pr_devel("uc->io_cnt == %d, uc->mem_cnt == %d\n",
++ pr_debug("uc->io_cnt == %d, uc->mem_cnt == %d\n",
+ uc->io_cnt, uc->mem_cnt);
+ while (uc->io_cnt--)
+ vga_put(uc->pdev, VGA_RSRC_LEGACY_IO);
+@@ -1165,7 +1186,7 @@ static int pci_notify(struct notifier_block *nb, unsigned long action,
+ struct pci_dev *pdev = to_pci_dev(dev);
+ bool notify = false;
+
+- pr_devel("%s\n", __func__);
++ pr_debug("%s\n", __func__);
+
+ /* For now we're only intereted in devices added and removed. I didn't
+ * test this thing here, so someone needs to double check for the
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7696a66..82cb8ff 100644
--- a/drivers/staging/Kconfig
@@ -35501,7 +45811,7 @@ index 1347524..93a1a31 100644
+ int hsize, int vsize, int fresh);
#endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index b29e201..dc5873c 100644
+index b29e201..1121f77 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -39,7 +39,6 @@
@@ -35521,7 +45831,7 @@ index b29e201..dc5873c 100644
extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
struct drm_display_mode *mode,
-@@ -123,12 +120,14 @@ static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
+@@ -123,12 +120,17 @@ static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
encoder->helper_private = (void *)funcs;
}
@@ -35537,6 +45847,9 @@ index b29e201..dc5873c 100644
+extern void drm_kms_helper_poll_init(struct drm_device *dev);
+extern void drm_kms_helper_poll_fini(struct drm_device *dev);
+extern void drm_helper_hpd_irq_event(struct drm_device *dev);
++
++extern void drm_kms_helper_poll_disable(struct drm_device *dev);
++extern void drm_kms_helper_poll_enable(struct drm_device *dev);
#endif
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index b420989..39e2cc5 100644
@@ -35745,6 +46058,41 @@ index 0000000..4a08a66
+ return lower_32_bits(tmp);
+}
+#endif
+diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
+index b64a8d7..7f0028e 100644
+--- a/include/drm/i915_drm.h
++++ b/include/drm/i915_drm.h
+@@ -275,6 +275,7 @@ typedef struct drm_i915_irq_wait {
+ #define I915_PARAM_HAS_OVERLAY 7
+ #define I915_PARAM_HAS_PAGEFLIPPING 8
+ #define I915_PARAM_HAS_EXECBUF2 9
++#define I915_PARAM_HAS_BSD 10
+
+ typedef struct drm_i915_getparam {
+ int param;
+@@ -616,7 +617,9 @@ struct drm_i915_gem_execbuffer2 {
+ __u32 num_cliprects;
+ /** This is a struct drm_clip_rect *cliprects */
+ __u64 cliprects_ptr;
+- __u64 flags; /* currently unused */
++#define I915_EXEC_RENDER (1<<0)
++#define I915_EXEC_BSD (1<<1)
++ __u64 flags;
+ __u64 rsvd1;
+ __u64 rsvd2;
+ };
+diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
+index a6a9f4a..fe917de 100644
+--- a/include/drm/nouveau_drm.h
++++ b/include/drm/nouveau_drm.h
+@@ -79,6 +79,7 @@ struct drm_nouveau_gpuobj_free {
+ #define NOUVEAU_GETPARAM_CHIPSET_ID 11
+ #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12
+ #define NOUVEAU_GETPARAM_GRAPH_UNITS 13
++#define NOUVEAU_GETPARAM_PTIMER_TIME 14
+ struct drm_nouveau_getparam {
+ uint64_t param;
+ uint64_t value;
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 81e614b..3ff9fc0 100644
--- a/include/drm/radeon_drm.h
@@ -36099,6 +46447,48 @@ index 0000000..8bb4de5
+ */
+extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
+#endif
+diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h
+index c7645f4..4d08423 100644
+--- a/include/drm/vmwgfx_drm.h
++++ b/include/drm/vmwgfx_drm.h
+@@ -50,6 +50,8 @@
+ #define DRM_VMW_EXECBUF 12
+ #define DRM_VMW_FIFO_DEBUG 13
+ #define DRM_VMW_FENCE_WAIT 14
++/* guarded by minor version >= 2 */
++#define DRM_VMW_UPDATE_LAYOUT 15
+
+
+ /*************************************************************************/
+@@ -585,4 +587,28 @@ struct drm_vmw_stream_arg {
+ * sure that the stream has been stopped.
+ */
+
++/*************************************************************************/
++/**
++ * DRM_VMW_UPDATE_LAYOUT - Update layout
++ *
++ * Updates the prefered modes and connection status for connectors. The
++ * command conisits of one drm_vmw_update_layout_arg pointing out a array
++ * of num_outputs drm_vmw_rect's.
++ */
++
++/**
++ * struct drm_vmw_update_layout_arg
++ *
++ * @num_outputs: number of active
++ * @rects: pointer to array of drm_vmw_rect
++ *
++ * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl.
++ */
++
++struct drm_vmw_update_layout_arg {
++ uint32_t num_outputs;
++ uint32_t pad64;
++ uint64_t rects;
++};
++
+ #endif
diff --git a/include/linux/fb.h b/include/linux/fb.h
index c10163b..1296af4 100644
--- a/include/linux/fb.h
@@ -36145,3 +46535,35 @@ index c10163b..1296af4 100644
extern int fb_prepare_logo(struct fb_info *fb_info, int rotate);
extern int fb_show_logo(struct fb_info *fb_info, int rotate);
extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);
+diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
+index 2dfaa29..c9a9759 100644
+--- a/include/linux/vgaarb.h
++++ b/include/linux/vgaarb.h
+@@ -5,6 +5,27 @@
+ * (C) Copyright 2005 Benjamin Herrenschmidt <benh at kernel.crashing.org>
+ * (C) Copyright 2007 Paulo R. Zanoni <przanoni at gmail.com>
+ * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti at freedesktop.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS
++ * IN THE SOFTWARE.
++ *
+ */
+
+ #ifndef LINUX_VGA_H
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -p -r1.2023 -r1.2024
--- kernel.spec 11 Jun 2010 19:29:22 -0000 1.2023
+++ kernel.spec 13 Jun 2010 11:30:56 -0000 1.2024
@@ -681,8 +681,6 @@ Patch1555: fix_xen_guest_on_old_EC2.patc
# DRM
Patch1800: drm-next.patch
-Patch1801: drm-disable-radeon_pm.patch
-Patch1802: drm_gem_object_alloc-i915_gem_alloc_object.patch
# nouveau + drm fixes
Patch1815: drm-nouveau-drm-fixed-header.patch
Patch1819: drm-intel-big-hammer.patch
@@ -1287,8 +1285,6 @@ ApplyPatch virt_console-rollup.patch
ApplyPatch fix_xen_guest_on_old_EC2.patch
ApplyPatch drm-next.patch
-ApplyPatch drm-disable-radeon_pm.patch
-ApplyPatch drm_gem_object_alloc-i915_gem_alloc_object.patch
# Nouveau DRM + drm fixes
ApplyPatch drm-nouveau-drm-fixed-header.patch
@@ -1975,6 +1971,9 @@ fi
# || ||
%changelog
+* Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-33
+- Update drm-next to include fixes since 2.6.35-rc1.
+
* Fri Jun 11 2010 Justin M. Forbes <jforbes at redhat.com>
- Disable xsave for so that kernel will boot on ancient EC2 hosts.
--- drm-disable-radeon_pm.patch DELETED ---
--- drm_gem_object_alloc-i915_gem_alloc_object.patch DELETED ---
More information about the scm-commits
mailing list