rpms/kernel/devel drm-next.patch, 1.22, 1.23 kernel.spec, 1.2030, 1.2031 drm-provide-knob-to-enable-radeon_pm.patch, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Wed Jun 16 14:27:44 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12497
Modified Files:
drm-next.patch kernel.spec
Removed Files:
drm-provide-knob-to-enable-radeon_pm.patch
Log Message:
* Wed Jun 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-40
- Snag some more DRM commits into drm-next.patch that I missed the first
time.
- Fix up radeon_pm toggle to work with the upstream code.
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 | 56
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 | 13
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 | 910 +++++++---
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 | 745 +++++++-
b/drivers/gpu/drm/i915/i915_drv.c | 99 -
b/drivers/gpu/drm/i915/i915_drv.h | 246 +-
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 | 1350 +++++++++++----
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 | 223 +-
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 | 594 ++++--
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 | 15
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 | 265 +--
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 | 83
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_fb.c | 10
b/drivers/gpu/drm/nouveau/nv50_fbcon.c | 16
b/drivers/gpu/drm/nouveau/nv50_gpio.c | 2
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 | 1562 +++++++++++++++++-
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 | 739 ++++++--
b/drivers/gpu/drm/radeon/r100d.h | 164 +
b/drivers/gpu/drm/radeon/r300.c | 151 -
b/drivers/gpu/drm/radeon/r300d.h | 47
b/drivers/gpu/drm/radeon/r420.c | 46
b/drivers/gpu/drm/radeon/r500_reg.h | 3
b/drivers/gpu/drm/radeon/r520.c | 7
b/drivers/gpu/drm/radeon/r600.c | 693 +++++++-
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 | 265 ++-
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 | 321 ++-
b/drivers/gpu/drm/radeon/radeon_bios.c | 3
b/drivers/gpu/drm/radeon/radeon_combios.c | 71
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 | 135 -
b/drivers/gpu/drm/radeon/radeon_drv.c | 12
b/drivers/gpu/drm/radeon/radeon_encoders.c | 44
b/drivers/gpu/drm/radeon/radeon_fb.c | 364 ++--
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 | 25
b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 14
b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 26
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 | 834 ++++++---
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 | 39
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 | 14
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/drm/vmwgfx/vmwgfx_resource.c | 8
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 | 2
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
200 files changed, 21571 insertions(+), 8636 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.22 -r 1.23 drm-next.patchIndex: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- drm-next.patch 13 Jun 2010 11:30:55 -0000 1.22
+++ drm-next.patch 16 Jun 2010 14:27:42 -0000 1.23
@@ -1,3089 +1,388 @@
-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>
-Date: Mon May 31 12:38:09 2010 +0100
-
- nouveau is not in staging on Fedora
-
-commit fc5f2e0a106ffdb3d201ff2d08d384dff38a769e
-Author: Adam Jackson <ajax at redhat.com>
-Date: Tue May 25 16:33:09 2010 -0400
-
- drm/edid: Allow non-fatal checksum errors in CEA blocks
-
- Switches will try to update the topology address and not correctly fix
- up the checksum, so just let it slide.
-
- https://bugs.freedesktop.org/28229
-
- Signed-off-by: Adam Jackson <ajax at redhat.com>
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 42e6272d336e13ddd1ca6daac8e127a5b3b3a672
-Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Wed May 26 10:27:44 2010 +1000
-
- drm/radeon/kms: suppress a build warning (unused variable)
-
- At least 'make CONFIG_DEBUG_SECTION_MISMATCH=y' causes
- drivers/gpu/drm/radeon/atombios_crtc.c: In function 'atombios_crtc_set_pll':
- drivers/gpu/drm/radeon/atombios_crtc.c:684: warning: 'pll' may be used uninitialized in this function
- which has the looks of a falso positive.
-
- Add a default: case so that gcc rests assured that all possible pll_id's are covered.
- Keep the present cases that fall through to the default one for self-documentation.
-
- Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
- Reviewed-by: Alex Deucher <alexdeucher at gmail.com>
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 4bbcbb4866d54dc77ff2aa2cb0a2ac74d147caf0
-Author: Prarit Bhargava <prarit at redhat.com>
-Date: Mon May 24 10:24:07 2010 +1000
-
- drm: Fixes linux-next & linux-2.6 checkstack warnings:
-
- drivers/gpu/drm/nouveau/nv40_graph.c: In function `nv40_graph_init':
- drivers/gpu/drm/nouveau/nv40_graph.c:400: warning: the frame size of 1184 bytes is larger than 1024 bytes
- drivers/gpu/drm/radeon/radeon_atombios.c: In function `radeon_get_atom_connector_info_from_supported_devices_table':
- drivers/gpu/drm/radeon/radeon_atombios.c:857: warning: the frame size of 1872 bytes is larger than 1024 bytes
-
- Signed-off-by: Prarit Bhargava <prarit at redhat.com>
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 718bc70da3469867b05a17449da519443e5b5bd0
-Author: Randy Dunlap <randy.dunlap at oracle.com>
-Date: Sun May 23 17:00:40 2010 -0700
-
- nouveau: fix acpi_lid_open undefined
-
- When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled)
- and NOUVEAU is built-in (not as a loadable module):
-
- nouveau_connector.c:(.text+0xe17ce): undefined reference to `acpi_lid_open'
-
- Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
- Acked-by: Ben Skeggs <bskeggs at redhat.com>
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 5f056ef08a093c2aba47538ea1542820730a2543
-Author: Jerome Glisse <jglisse at redhat.com>
-Date: Fri May 21 18:48:54 2010 +0200
-
- drm/radeon/kms: release AGP bridge at suspend
-
- I think it's good to release the AGP bridge at suspend
- and reacquire it at resume. Also fix :
- https://bugzilla.kernel.org/show_bug.cgi?id=15969
-
- Signed-off-by: Jerome Glisse <jglisse at redhat.com>
- Cc: stable <stable at kernel.org>
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 08d76aad4816808ab8e80956a78b7dc64fec94ae
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date: Thu May 20 18:44:49 2010 -0400
-
- drm/radeon/kms/pm/r600: select the mid clock mode for single head low profile
-
- This saves some more power at the expense of performance.
-
- Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 384acf057b2097c43988adebc7b6c2325cf15dc6
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri May 21 15:41:20 2010 +1000
-
- drm/radeon: fix power supply kconfig interaction.
-
- radeon needs power supply to get correct PM info so select it at the radeon
- level not at the kms option.
-
- Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit 8e3701cbb713150746fd96647d62c36435b69d0c
-Author: Jerome Glisse <jglisse at redhat.com>
-Date: Wed May 19 16:05:50 2010 +0200
-
[...7090 lines suppressed...]
+ DRM_DEBUG("not in vbl for pm change %08x at %s\n", stat_crtc,
@@ -39253,7 +37107,7 @@ index a4b5749..4d3c1e4 100644
unsigned long irq_flags;
int not_processed = 0;
-@@ -421,35 +652,40 @@ static void radeon_pm_idle_work_handler(struct work_struct *work)
+@@ -421,35 +691,40 @@ static void radeon_pm_idle_work_handler(struct work_struct *work)
read_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
if (not_processed >= 3) { /* should upclock */
@@ -39311,7 +37165,7 @@ index a4b5749..4d3c1e4 100644
msecs_to_jiffies(RADEON_IDLE_LOOP_MS));
}
-@@ -464,7 +700,6 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
+@@ -464,12 +739,13 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
struct drm_device *dev = node->minor->dev;
struct radeon_device *rdev = dev->dev_private;
@@ -39319,6 +37173,13 @@ index a4b5749..4d3c1e4 100644
seq_printf(m, "default engine clock: %u0 kHz\n", rdev->clock.default_sclk);
seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
seq_printf(m, "default memory clock: %u0 kHz\n", rdev->clock.default_mclk);
+ if (rdev->asic->get_memory_clock)
+ seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
++ if (rdev->pm.current_vddc)
++ seq_printf(m, "voltage: %u mV\n", rdev->pm.current_vddc);
+ if (rdev->asic->get_pcie_lanes)
+ seq_printf(m, "PCIE lanes: %d\n", radeon_get_pcie_lanes(rdev));
+
diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
index eabbc9c..c332f46 100644
--- a/drivers/gpu/drm/radeon/radeon_reg.h
@@ -41931,26 +39792,32 @@ index fc216e4..590309a 100644
#define S_0000F8_CONFIG_MEMSIZE(x) (((x) & 0xFFFFFFFF) << 0)
#define G_0000F8_CONFIG_MEMSIZE(x) (((x) >> 0) & 0xFFFFFFFF)
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
-index 97958a6..33952da 100644
+index 97958a6..cec536c 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
-@@ -42,6 +42,15 @@
+@@ -42,6 +42,21 @@
static void rv770_gpu_init(struct radeon_device *rdev);
void rv770_fini(struct radeon_device *rdev);
+void rv770_pm_misc(struct radeon_device *rdev)
+{
-+ int requested_index = rdev->pm.requested_power_state_index;
-+ struct radeon_power_state *ps = &rdev->pm.power_state[requested_index];
-+ struct radeon_voltage *voltage = &ps->clock_info[0].voltage;
-+
-+ if ((voltage->type == VOLTAGE_SW) && voltage->voltage)
-+ radeon_atom_set_voltage(rdev, voltage->voltage);
++ int req_ps_idx = rdev->pm.requested_power_state_index;
++ int req_cm_idx = rdev->pm.requested_clock_mode_index;
++ struct radeon_power_state *ps = &rdev->pm.power_state[req_ps_idx];
++ struct radeon_voltage *voltage = &ps->clock_info[req_cm_idx].voltage;
++
++ if ((voltage->type == VOLTAGE_SW) && voltage->voltage) {
++ if (voltage->voltage != rdev->pm.current_vddc) {
++ radeon_atom_set_voltage(rdev, voltage->voltage);
++ rdev->pm.current_vddc = voltage->voltage;
++ DRM_DEBUG("Setting: v: %d\n", voltage->voltage);
++ }
++ }
+}
/*
* GART
-@@ -237,7 +246,6 @@ void r700_cp_stop(struct radeon_device *rdev)
+@@ -237,7 +252,6 @@ void r700_cp_stop(struct radeon_device *rdev)
WREG32(CP_ME_CNTL, (CP_ME_HALT | CP_PFP_HALT));
}
@@ -41958,7 +39825,7 @@ index 97958a6..33952da 100644
static int rv770_cp_load_microcode(struct radeon_device *rdev)
{
const __be32 *fw_data;
-@@ -272,6 +280,11 @@ static int rv770_cp_load_microcode(struct radeon_device *rdev)
+@@ -272,6 +286,11 @@ static int rv770_cp_load_microcode(struct radeon_device *rdev)
return 0;
}
@@ -41970,7 +39837,7 @@ index 97958a6..33952da 100644
/*
* Core functions
-@@ -906,23 +919,12 @@ int rv770_mc_init(struct radeon_device *rdev)
+@@ -906,23 +925,12 @@ int rv770_mc_init(struct radeon_device *rdev)
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
rdev->mc.visible_vram_size = rdev->mc.aper_size;
@@ -41994,7 +39861,7 @@ index 97958a6..33952da 100644
static int rv770_startup(struct radeon_device *rdev)
{
int r;
-@@ -1094,8 +1096,6 @@ int rv770_init(struct radeon_device *rdev)
+@@ -1094,8 +1102,6 @@ int rv770_init(struct radeon_device *rdev)
r = radeon_clocks_init(rdev);
if (r)
return r;
@@ -42003,7 +39870,7 @@ index 97958a6..33952da 100644
/* Fence driver */
r = radeon_fence_driver_init(rdev);
if (r)
-@@ -1132,7 +1132,7 @@ int rv770_init(struct radeon_device *rdev)
+@@ -1132,7 +1138,7 @@ int rv770_init(struct radeon_device *rdev)
r = rv770_startup(rdev);
if (r) {
dev_err(rdev->dev, "disabling GPU acceleration\n");
@@ -42012,7 +39879,7 @@ index 97958a6..33952da 100644
r600_wb_fini(rdev);
r600_irq_fini(rdev);
radeon_irq_kms_fini(rdev);
-@@ -1164,9 +1164,8 @@ int rv770_init(struct radeon_device *rdev)
+@@ -1164,9 +1170,8 @@ int rv770_init(struct radeon_device *rdev)
void rv770_fini(struct radeon_device *rdev)
{
@@ -43978,7 +41845,7 @@ index 356dc93..eaad520 100644
/**
* Overlay control - vmwgfx_overlay.c
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
-index 0897359..bdd67cf 100644
+index 0897359..8e39685 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -570,7 +570,7 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv,
@@ -43999,7 +41866,15 @@ index 0897359..bdd67cf 100644
return ret;
}
-@@ -669,6 +669,15 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data,
+@@ -644,6 +644,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data,
+ ret = copy_from_user(cmd, user_cmd, arg->command_size);
+
+ if (unlikely(ret != 0)) {
++ ret = -EFAULT;
+ DRM_ERROR("Failed copying commands.\n");
+ goto out_commit;
+ }
+@@ -669,6 +670,15 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data,
goto out_err;
vmw_apply_relocations(sw_context);
@@ -45140,6 +43015,35 @@ index 5b6eabe..df2036e 100644
return 0;
}
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+index f8fbbc6..8612378 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+@@ -597,8 +597,10 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
+
+ ret = copy_from_user(srf->sizes, user_sizes,
+ srf->num_sizes * sizeof(*srf->sizes));
+- if (unlikely(ret != 0))
++ if (unlikely(ret != 0)) {
++ ret = -EFAULT;
+ goto out_err1;
++ }
+
+ if (srf->scanout &&
+ srf->num_sizes == 1 &&
+@@ -697,9 +699,11 @@ int vmw_surface_reference_ioctl(struct drm_device *dev, void *data,
+ if (user_sizes)
+ ret = copy_to_user(user_sizes, srf->sizes,
+ srf->num_sizes * sizeof(*srf->sizes));
+- if (unlikely(ret != 0))
++ if (unlikely(ret != 0)) {
+ DRM_ERROR("copy_to_user failed %p %u\n",
+ user_sizes, srf->num_sizes);
++ ret = -EFAULT;
++ }
+ out_bad_resource:
+ out_no_reference:
+ ttm_base_object_unref(&base);
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 61ab4da..8d0e31a 100644
--- a/drivers/gpu/vga/Kconfig
@@ -46094,14 +43998,15 @@ index a6a9f4a..fe917de 100644
uint64_t param;
uint64_t value;
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 81e614b..3ff9fc0 100644
+index 81e614b..5347063 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
-@@ -902,6 +902,7 @@ struct drm_radeon_cs {
+@@ -902,6 +902,8 @@ struct drm_radeon_cs {
#define RADEON_INFO_NUM_GB_PIPES 0x01
#define RADEON_INFO_NUM_Z_PIPES 0x02
#define RADEON_INFO_ACCEL_WORKING 0x03
+#define RADEON_INFO_CRTC_FROM_ID 0x04
++#define RADEON_INFO_ACCEL_WORKING2 0x05
struct drm_radeon_info {
uint32_t request;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -p -r1.2030 -r1.2031
--- kernel.spec 15 Jun 2010 13:45:20 -0000 1.2030
+++ kernel.spec 16 Jun 2010 14:27:44 -0000 1.2031
@@ -681,7 +681,6 @@ Patch1555: fix_xen_guest_on_old_EC2.patc
# DRM
Patch1800: drm-next.patch
-Patch1801: drm-provide-knob-to-enable-radeon_pm.patch
# nouveau + drm fixes
Patch1815: drm-nouveau-drm-fixed-header.patch
Patch1819: drm-intel-big-hammer.patch
@@ -1300,7 +1299,6 @@ ApplyPatch virt_console-rollup.patch
ApplyPatch fix_xen_guest_on_old_EC2.patch
ApplyPatch drm-next.patch
-ApplyPatch drm-provide-knob-to-enable-radeon_pm.patch
# Nouveau DRM + drm fixes
ApplyPatch drm-nouveau-drm-fixed-header.patch
@@ -1992,6 +1990,11 @@ fi
# || ||
%changelog
+* Wed Jun 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-40
+- Snag some more DRM commits into drm-next.patch that I missed the first
+ time.
+- Fix up radeon_pm toggle to work with the upstream code.
+
* Tue Jun 15 2010 Prarit Bhargava <prarit at redhat.com>
- Turn off CONFIG_I2O on x86.
It is broken on 64-bit address spaces (i686/PAE, x86_64), and frankly, I'm
--- drm-provide-knob-to-enable-radeon_pm.patch DELETED ---
More information about the scm-commits
mailing list