rpms/kernel/F-12 patch-2.6.32.10-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.1149, 1.1150 drm-upgrayedd.patch, 1.3, 1.4 kernel.spec, 1.2032, 1.2033 linux-2.6-upstream-reverts.patch, 1.9, 1.10 sources, 1.1107, 1.1108 upstream, 1.1021, 1.1022 fix-LOOKUP_FOLLOW-on-automount-symlinks.patch, 1.1, NONE fs-exec.c-fix-initial-stack-reservation.patch, 1.1, NONE kms-offb-handoff.patch, 1.3, NONE linux-2.6-input-hid-quirk-hp-touchsmart.patch, 1.1, NONE sparc-additional-pci-id-xvr-500.patch, 1.1, NONE sparc-align-clone-and-signal-stacks-to-16-bytes.patch, 1.2, NONE

Chuck Ebbert cebbert at fedoraproject.org
Sun Mar 14 04:38:02 UTC 2010


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7538

Modified Files:
	.cvsignore drm-upgrayedd.patch kernel.spec 
	linux-2.6-upstream-reverts.patch sources upstream 
Added Files:
	patch-2.6.32.10-rc1.bz2.sign 
Removed Files:
	fix-LOOKUP_FOLLOW-on-automount-symlinks.patch 
	fs-exec.c-fix-initial-stack-reservation.patch 
	kms-offb-handoff.patch 
	linux-2.6-input-hid-quirk-hp-touchsmart.patch 
	sparc-additional-pci-id-xvr-500.patch 
	sparc-align-clone-and-signal-stacks-to-16-bytes.patch 
Log Message:
Linux 2.6.32.10-rc1
Manually fix up drm-upgrayedd.patch to apply after this stable patch:
  drm-i915-use-a-dmi-quirk-to-skip-a-broken-sdvo-tv-output.patch
Added stable patches to upstream-reverts; we have these in our backports:
  drm-ttm-handle-oom-in-ttm_tt_swapout.patch
  v4l-dvb-13991-gspca_mr973010a-fix-cif-type-1-cameras-not-streaming-on-uhci-controllers.patch
  drm-i915-disable-tv-hotplug-status-check.patch
  drm-i915-fix-get_core_clock_speed-for-g33-class-desktop-chips.patch
  drm-radeon-r6xx-r7xx-possible-security-issue-system-ram-access.patch
  drm-radeon-kms-r600-r700-don-t-test-ib-if-ib-initialization-fails.patch
  drm-radeon-kms-forbid-creation-of-framebuffer-with-no-valid-gem-object.patch
  acpi-i915-blacklist-clevo-m5x0n-bad_lid-state.patch
Dropped merged upstream patches:
  fix-LOOKUP_FOLLOW-on-automount-symlinks.patch
  fs-exec.c-fix-initial-stack-reservation.patch
  kms-offb-handoff.patch
  linux-2.6-input-hid-quirk-hp-touchsmart.patch
  sparc-align-clone-and-signal-stacks-to-16-bytes.patch
  sparc-additional-pci-id-xvr-500.patch


--- NEW FILE patch-2.6.32.10-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLmwb4yGugalF9Dw4RAnSfAJ4yLK8VGGyyHi3U/hr87H+c90Gr1gCfakje
ojX23o142BfLTb+lbVZrF8g=
=FCkI
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -p -r1.1149 -r1.1150
--- .cvsignore	23 Feb 2010 22:58:21 -0000	1.1149
+++ .cvsignore	14 Mar 2010 04:38:00 -0000	1.1150
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.32
 linux-2.6.32.tar.bz2
 patch-2.6.32.9.bz2
+patch-2.6.32.10-rc1.bz2

drm-upgrayedd.patch:
 b/drivers/gpu/drm/Kconfig                         |    2 
 b/drivers/gpu/drm/Makefile                        |    5 
 b/drivers/gpu/drm/ati_pcigart.c                   |    2 
 b/drivers/gpu/drm/drm_crtc.c                      |  181 
 b/drivers/gpu/drm/drm_crtc_helper.c               |   31 
 b/drivers/gpu/drm/drm_dp_i2c_helper.c             |  209 
 b/drivers/gpu/drm/drm_drv.c                       |   55 
 b/drivers/gpu/drm/drm_edid.c                      |  363 -
 b/drivers/gpu/drm/drm_fb_helper.c                 |   32 
 b/drivers/gpu/drm/drm_fops.c                      |  112 
 b/drivers/gpu/drm/drm_ioc32.c                     |   89 
 b/drivers/gpu/drm/drm_irq.c                       |  101 
 b/drivers/gpu/drm/drm_mm.c                        |  113 
 b/drivers/gpu/drm/drm_modes.c                     |  118 
 b/drivers/gpu/drm/drm_stub.c                      |   15 
 b/drivers/gpu/drm/i2c/Makefile                    |    4 
 b/drivers/gpu/drm/i2c/ch7006_drv.c                |  536 +
 b/drivers/gpu/drm/i2c/ch7006_mode.c               |  468 +
 b/drivers/gpu/drm/i2c/ch7006_priv.h               |  344 +
 b/drivers/gpu/drm/i810/i810_dma.c                 |    2 
 b/drivers/gpu/drm/i810/i810_drv.c                 |    2 
 b/drivers/gpu/drm/i830/i830_dma.c                 |    2 
 b/drivers/gpu/drm/i830/i830_drv.c                 |    2 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/dvo_ch7017.c               |    9 
 b/drivers/gpu/drm/i915/dvo_ch7xxx.c               |   16 
 b/drivers/gpu/drm/i915/dvo_ivch.c                 |   37 
 b/drivers/gpu/drm/i915/dvo_sil164.c               |   20 
 b/drivers/gpu/drm/i915/dvo_tfp410.c               |   34 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  141 
 b/drivers/gpu/drm/i915/i915_dma.c                 |   67 
 b/drivers/gpu/drm/i915/i915_drv.c                 |  297 -
 b/drivers/gpu/drm/i915/i915_drv.h                 |  196 
 b/drivers/gpu/drm/i915/i915_gem.c                 |  437 +
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   52 
 b/drivers/gpu/drm/i915/i915_ioc32.c               |   23 
 b/drivers/gpu/drm/i915/i915_irq.c                 |  194 
 b/drivers/gpu/drm/i915/i915_opregion.c            |   92 
 b/drivers/gpu/drm/i915/i915_reg.h                 |   73 
 b/drivers/gpu/drm/i915/i915_suspend.c             |   86 
 b/drivers/gpu/drm/i915/intel_bios.c               |  170 
 b/drivers/gpu/drm/i915/intel_bios.h               |   57 
 b/drivers/gpu/drm/i915/intel_crt.c                |   53 
 b/drivers/gpu/drm/i915/intel_display.c            | 1317 +++-
 b/drivers/gpu/drm/i915/intel_dp.c                 |  127 
 b/drivers/gpu/drm/i915/intel_drv.h                |   44 
 b/drivers/gpu/drm/i915/intel_fb.c                 |   11 
 b/drivers/gpu/drm/i915/intel_hdmi.c               |    5 
 b/drivers/gpu/drm/i915/intel_i2c.c                |   21 
 b/drivers/gpu/drm/i915/intel_lvds.c               |  200 
 b/drivers/gpu/drm/i915/intel_overlay.c            | 1416 +++++
 b/drivers/gpu/drm/i915/intel_sdvo.c               |   24 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   49 
 b/drivers/gpu/drm/mga/mga_drv.c                   |    2 
 b/drivers/gpu/drm/mga/mga_ioc32.c                 |   13 
 b/drivers/gpu/drm/nouveau/Kconfig                 |   44 
 b/drivers/gpu/drm/nouveau/Makefile                |   32 
 b/drivers/gpu/drm/nouveau/nouveau_acpi.c          |  125 
 b/drivers/gpu/drm/nouveau/nouveau_backlight.c     |  155 
 b/drivers/gpu/drm/nouveau/nouveau_bios.c          | 6052 ++++++++++++++++++++++
 b/drivers/gpu/drm/nouveau/nouveau_bios.h          |  292 +
 b/drivers/gpu/drm/nouveau/nouveau_bo.c            |  773 ++
 b/drivers/gpu/drm/nouveau/nouveau_calc.c          |  478 +
 b/drivers/gpu/drm/nouveau/nouveau_channel.c       |  430 +
 b/drivers/gpu/drm/nouveau/nouveau_connector.c     |  846 +++
 b/drivers/gpu/drm/nouveau/nouveau_connector.h     |   54 
 b/drivers/gpu/drm/nouveau/nouveau_crtc.h          |   95 
 b/drivers/gpu/drm/nouveau/nouveau_debugfs.c       |  155 
 b/drivers/gpu/drm/nouveau/nouveau_display.c       |  115 
 b/drivers/gpu/drm/nouveau/nouveau_dma.c           |  244 
 b/drivers/gpu/drm/nouveau/nouveau_dma.h           |  159 
 b/drivers/gpu/drm/nouveau/nouveau_dp.c            |  575 ++
 b/drivers/gpu/drm/nouveau/nouveau_drv.c           |  421 +
 b/drivers/gpu/drm/nouveau/nouveau_drv.h           | 1350 ++++
 b/drivers/gpu/drm/nouveau/nouveau_encoder.h       |   91 
 b/drivers/gpu/drm/nouveau/nouveau_fb.h            |   47 
 b/drivers/gpu/drm/nouveau/nouveau_fbcon.c         |  423 +
 b/drivers/gpu/drm/nouveau/nouveau_fbcon.h         |   54 
 b/drivers/gpu/drm/nouveau/nouveau_fence.c         |  262 
 b/drivers/gpu/drm/nouveau/nouveau_gem.c           |  994 +++
 b/drivers/gpu/drm/nouveau/nouveau_grctx.c         |  161 
 b/drivers/gpu/drm/nouveau/nouveau_grctx.h         |  133 
 b/drivers/gpu/drm/nouveau/nouveau_hw.c            | 1080 +++
 b/drivers/gpu/drm/nouveau/nouveau_hw.h            |  455 +
 b/drivers/gpu/drm/nouveau/nouveau_i2c.c           |  269 
 b/drivers/gpu/drm/nouveau/nouveau_i2c.h           |   52 
 b/drivers/gpu/drm/nouveau/nouveau_ioc32.c         |   70 
 b/drivers/gpu/drm/nouveau/nouveau_irq.c           |  737 ++
 b/drivers/gpu/drm/nouveau/nouveau_mem.c           |  668 ++
 b/drivers/gpu/drm/nouveau/nouveau_notifier.c      |  203 
 b/drivers/gpu/drm/nouveau/nouveau_object.c        | 1295 ++++
 b/drivers/gpu/drm/nouveau/nouveau_reg.h           |  837 +++
 b/drivers/gpu/drm/nouveau/nouveau_sgdma.c         |  322 +
 b/drivers/gpu/drm/nouveau/nouveau_state.c         |  897 +++
 b/drivers/gpu/drm/nouveau/nouveau_ttm.c           |  103 
 b/drivers/gpu/drm/nouveau/nv04_crtc.c             | 1002 +++
 b/drivers/gpu/drm/nouveau/nv04_cursor.c           |   70 
 b/drivers/gpu/drm/nouveau/nv04_dac.c              |  527 +
 b/drivers/gpu/drm/nouveau/nv04_dfp.c              |  623 ++
 b/drivers/gpu/drm/nouveau/nv04_display.c          |  287 +
 b/drivers/gpu/drm/nouveau/nv04_fb.c               |   21 
 b/drivers/gpu/drm/nouveau/nv04_fbcon.c            |  312 +
 b/drivers/gpu/drm/nouveau/nv04_fifo.c             |  305 +
 b/drivers/gpu/drm/nouveau/nv04_graph.c            |  584 ++
 b/drivers/gpu/drm/nouveau/nv04_instmem.c          |  208 
 b/drivers/gpu/drm/nouveau/nv04_mc.c               |   20 
 b/drivers/gpu/drm/nouveau/nv04_timer.c            |   51 
 b/drivers/gpu/drm/nouveau/nv04_tv.c               |  305 +
 b/drivers/gpu/drm/nouveau/nv10_fb.c               |   44 
 b/drivers/gpu/drm/nouveau/nv10_fifo.c             |  260 
 b/drivers/gpu/drm/nouveau/nv10_graph.c            | 1009 +++
 b/drivers/gpu/drm/nouveau/nv17_gpio.c             |   92 
 b/drivers/gpu/drm/nouveau/nv17_tv.c               |  776 ++
 b/drivers/gpu/drm/nouveau/nv17_tv.h               |  156 
 b/drivers/gpu/drm/nouveau/nv17_tv_modes.c         |  583 ++
 b/drivers/gpu/drm/nouveau/nv20_graph.c            |  775 ++
 b/drivers/gpu/drm/nouveau/nv40_fb.c               |   75 
 b/drivers/gpu/drm/nouveau/nv40_fifo.c             |  314 +
 b/drivers/gpu/drm/nouveau/nv40_graph.c            |  406 +
 b/drivers/gpu/drm/nouveau/nv40_grctx.c            |  678 ++
 b/drivers/gpu/drm/nouveau/nv40_mc.c               |   38 
 b/drivers/gpu/drm/nouveau/nv50_crtc.c             |  792 ++
 b/drivers/gpu/drm/nouveau/nv50_cursor.c           |  156 
 b/drivers/gpu/drm/nouveau/nv50_dac.c              |  304 +
 b/drivers/gpu/drm/nouveau/nv50_display.c          | 1032 +++
 b/drivers/gpu/drm/nouveau/nv50_display.h          |   46 
 b/drivers/gpu/drm/nouveau/nv50_evo.h              |  113 
 b/drivers/gpu/drm/nouveau/nv50_fbcon.c            |  267 
 b/drivers/gpu/drm/nouveau/nv50_fifo.c             |  495 +
 b/drivers/gpu/drm/nouveau/nv50_graph.c            |  394 +
 b/drivers/gpu/drm/nouveau/nv50_instmem.c          |  509 +
 b/drivers/gpu/drm/nouveau/nv50_mc.c               |   40 
 b/drivers/gpu/drm/nouveau/nv50_sor.c              |  323 +
 b/drivers/gpu/drm/nouveau/nvreg.h                 |  535 +
 b/drivers/gpu/drm/r128/r128_drv.c                 |    2 
 b/drivers/gpu/drm/r128/r128_ioc32.c               |   16 
 b/drivers/gpu/drm/radeon/Kconfig                  |   12 
 b/drivers/gpu/drm/radeon/Makefile                 |    7 
 b/drivers/gpu/drm/radeon/ObjectID.h               |  801 +-
 b/drivers/gpu/drm/radeon/atom.c                   |  155 
 b/drivers/gpu/drm/radeon/atom.h                   |    4 
 b/drivers/gpu/drm/radeon/atombios.h               |  217 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  306 -
 b/drivers/gpu/drm/radeon/atombios_dp.c            |  789 ++
 b/drivers/gpu/drm/radeon/mkregtable.c             |    4 
 b/drivers/gpu/drm/radeon/r100.c                   |  392 +
 b/drivers/gpu/drm/radeon/r100_track.h             |   19 
 b/drivers/gpu/drm/radeon/r200.c                   |   17 
 b/drivers/gpu/drm/radeon/r300.c                   |  120 
 b/drivers/gpu/drm/radeon/r300_cmdbuf.c            |    6 
 b/drivers/gpu/drm/radeon/r300_reg.h               |    1 
 b/drivers/gpu/drm/radeon/r420.c                   |   73 
 b/drivers/gpu/drm/radeon/r500_reg.h               |    2 
 b/drivers/gpu/drm/radeon/r520.c                   |   12 
 b/drivers/gpu/drm/radeon/r600.c                   | 1279 ++++
 b/drivers/gpu/drm/radeon/r600_audio.c             |  266 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |   55 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      |   10 
 b/drivers/gpu/drm/radeon/r600_cs.c                |   87 
 b/drivers/gpu/drm/radeon/r600_hdmi.c              |  506 +
 b/drivers/gpu/drm/radeon/r600_reg.h               |   74 
 b/drivers/gpu/drm/radeon/r600d.h                  |  237 
 b/drivers/gpu/drm/radeon/radeon.h                 |  222 
 b/drivers/gpu/drm/radeon/radeon_agp.c             |   17 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |   76 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  477 +
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |   91 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |    6 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   29 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  800 ++
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  243 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |   46 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |   16 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  149 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  221 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   12 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |    1 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  399 -
 b/drivers/gpu/drm/radeon/radeon_fb.c              |   74 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   65 
 b/drivers/gpu/drm/radeon/radeon_fixed.h           |   17 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   42 
 b/drivers/gpu/drm/radeon/radeon_gem.c             |  111 
 b/drivers/gpu/drm/radeon/radeon_i2c.c             |  182 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   38 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   10 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |   71 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   42 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |  202 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  148 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |   14 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  216 
 b/drivers/gpu/drm/radeon/radeon_object.c          |  578 --
 b/drivers/gpu/drm/radeon/radeon_object.h          |  151 
 b/drivers/gpu/drm/radeon/radeon_pm.c              |    9 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   60 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  172 
 b/drivers/gpu/drm/radeon/radeon_state.c           |    2 
 b/drivers/gpu/drm/radeon/radeon_test.c            |   55 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |  113 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |    2 
 b/drivers/gpu/drm/radeon/reg_srcs/r420            |  795 ++
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |   68 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |    6 
 b/drivers/gpu/drm/radeon/rs400.c                  |   49 
 b/drivers/gpu/drm/radeon/rs600.c                  |  235 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  112 
 b/drivers/gpu/drm/radeon/rs690.c                  |   42 
 b/drivers/gpu/drm/radeon/rv515.c                  |   29 
 b/drivers/gpu/drm/radeon/rv770.c                  |  128 
 b/drivers/gpu/drm/savage/savage_drv.c             |    2 
 b/drivers/gpu/drm/sis/sis_drv.c                   |    2 
 b/drivers/gpu/drm/tdfx/tdfx_drv.c                 |    2 
 b/drivers/gpu/drm/ttm/Makefile                    |    3 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  747 +-
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |   12 
 b/drivers/gpu/drm/ttm/ttm_bo_vm.c                 |    9 
 b/drivers/gpu/drm/ttm/ttm_execbuf_util.c          |  117 
 b/drivers/gpu/drm/ttm/ttm_lock.c                  |  313 +
 b/drivers/gpu/drm/ttm/ttm_memory.c                |   16 
 b/drivers/gpu/drm/ttm/ttm_object.c                |  452 +
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |   24 
 b/drivers/gpu/drm/via/via_drv.c                   |    2 
 b/drivers/gpu/drm/vmwgfx/Kconfig                  |   13 
 b/drivers/gpu/drm/vmwgfx/Makefile                 |    9 
 b/drivers/gpu/drm/vmwgfx/svga3d_reg.h             | 1793 ++++++
 b/drivers/gpu/drm/vmwgfx/svga_escape.h            |   89 
 b/drivers/gpu/drm/vmwgfx/svga_overlay.h           |  201 
 b/drivers/gpu/drm/vmwgfx/svga_reg.h               | 1346 ++++
 b/drivers/gpu/drm/vmwgfx/svga_types.h             |   45 
 b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c          |  252 
 b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c             |  800 ++
 b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h             |  521 +
 b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c         |  640 ++
 b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c              |  734 ++
 b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c            |  538 +
 b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c             |  213 
 b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c           |   87 
 b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c             |  286 +
 b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c             |  880 +++
 b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h             |  102 
 b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c             |  516 +
 b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c         |  625 ++
 b/drivers/gpu/drm/vmwgfx/vmwgfx_reg.h             |   57 
 b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c        | 1187 ++++
 b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c        |   99 
 b/drivers/staging/Kconfig                         |    2 
 b/fs/ubifs/gc.c                                   |   96 
 b/include/drm/Kbuild                              |    2 
 b/include/drm/drm.h                               |   65 
 b/include/drm/drmP.h                              |   91 
 b/include/drm/drm_crtc.h                          |   49 
 b/include/drm/drm_dp_helper.h                     |  180 
 b/include/drm/drm_edid.h                          |   11 
 b/include/drm/drm_mm.h                            |   35 
 b/include/drm/drm_mode.h                          |   83 
 b/include/drm/drm_os_linux.h                      |    2 
 b/include/drm/i2c/ch7006.h                        |   86 
 b/include/drm/i915_drm.h                          |  132 
 b/include/drm/mga_drm.h                           |    2 
 b/include/drm/nouveau_drm.h                       |  221 
 b/include/drm/radeon_drm.h                        |    2 
 b/include/drm/ttm/ttm_bo_api.h                    |  115 
 b/include/drm/ttm/ttm_bo_driver.h                 |   42 
 b/include/drm/ttm/ttm_execbuf_util.h              |  107 
 b/include/drm/ttm/ttm_lock.h                      |  247 
 b/include/drm/ttm/ttm_object.h                    |  271 
 b/include/drm/via_drm.h                           |    2 
 b/include/drm/vmwgfx_drm.h                        |  588 ++
 b/include/linux/list_sort.h                       |   11 
 b/lib/Makefile                                    |    2 
 b/lib/list_sort.c                                 |  102 
 drivers/gpu/drm/i915/intel_dp.h                   |  144 
 drivers/gpu/drm/i915/intel_dp_i2c.c               |  273 
 274 files changed, 66855 insertions(+), 5102 deletions(-)

Index: drm-upgrayedd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-upgrayedd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drm-upgrayedd.patch	17 Feb 2010 04:27:40 -0000	1.3
+++ drm-upgrayedd.patch	14 Mar 2010 04:38:00 -0000	1.4
@@ -13152,8 +13152,8 @@ index 3f5aaf1..82678d3 100644
 --- a/drivers/gpu/drm/i915/intel_sdvo.c
 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
 @@ -36,8 +36,6 @@
- #include "i915_drv.h"
  #include "intel_sdvo_regs.h"
+ #include <linux/dmi.h>
  
 -#undef SDVO_DEBUG
 -


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -p -r1.2032 -r1.2033
--- kernel.spec	11 Mar 2010 20:11:33 -0000	1.2032
+++ kernel.spec	14 Mar 2010 04:38:01 -0000	1.2033
@@ -40,9 +40,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 9
+%define stable_update 10
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -625,8 +625,6 @@ Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
-Patch151: sparc-align-clone-and-signal-stacks-to-16-bytes.patch
-Patch152: sparc-additional-pci-id-xvr-500.patch
 
 Patch160: linux-2.6-execshield.patch
 
@@ -653,7 +651,6 @@ Patch391: linux-2.6-acpi-video-dos.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
-Patch453: linux-2.6-input-hid-quirk-hp-touchsmart.patch
 Patch454: linux-2.6-input-hid-quirk-egalax.patch
 
 Patch460: linux-2.6-serial-460800.patch
@@ -690,7 +687,6 @@ Patch1551: linux-2.6-ksm-kvm.patch
 
 # fbdev multi-card fix
 Patch1700: linux-2.6-x86-64-fbdev-primary.patch
-Patch1701: kms-offb-handoff.patch
 Patch1702: linux-2.6-efi-handover.fix
 
 # nouveau + drm fixes
@@ -770,12 +766,6 @@ Patch12340: ice1712-fix-revo71-mixer-nam
 # rhbz#567530
 Patch12350: tcp-fix-icmp-rto-war.patch
 
-# fix breakage from 2.6.32.9
-Patch12400: fs-exec.c-fix-initial-stack-reservation.patch
-
-# fix automount symlinks (#567813)
-Patch12410: fix-LOOKUP_FOLLOW-on-automount-symlinks.patch
-
 # ==============================================================================
 
 %endif
@@ -1229,8 +1219,6 @@ ApplyPatch linux-2.6-imac-transparent-br
 # SPARC64
 #
 ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-ApplyPatch sparc-align-clone-and-signal-stacks-to-16-bytes.patch
-ApplyPatch sparc-additional-pci-id-xvr-500.patch
 
 #
 # Exec shield
@@ -1312,7 +1300,6 @@ ApplyPatch die-floppy-die.patch
 
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 
-ApplyPatch linux-2.6-input-hid-quirk-hp-touchsmart.patch
 ApplyPatch linux-2.6-input-hid-quirk-egalax.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
@@ -1372,7 +1359,6 @@ ApplyPatch crystalhd-2.6.34-staging.patc
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 ApplyPatch linux-2.6-x86-64-fbdev-primary.patch
-ApplyPatch kms-offb-handoff.patch
 ApplyPatch linux-2.6-efi-handover.fix
 # Nouveau DRM + drm fixes
 ApplyPatch drm-upgrayedd.patch
@@ -1422,12 +1408,6 @@ ApplyPatch ice1712-fix-revo71-mixer-name
 # rhbz#567530
 ApplyPatch tcp-fix-icmp-rto-war.patch
 
-# fix breakage from 2.6.32.9
-ApplyPatch fs-exec.c-fix-initial-stack-reservation.patch
-
-# fix automount symlinks (#567813)
-ApplyPatch fix-LOOKUP_FOLLOW-on-automount-symlinks.patch
-
 # END OF PATCH APPLICATIONS ====================================================
 
 %endif
@@ -2081,8 +2061,29 @@ fi
 # and build.
 
 %changelog
+* Sat Mar 13 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.10-73.rc1
+- Linux 2.6.32.10-rc1
+- Manually fix up drm-upgrayedd.patch to apply after this stable patch:
+  drm-i915-use-a-dmi-quirk-to-skip-a-broken-sdvo-tv-output.patch
+- Added stable patches to upstream-reverts; we have these in our backports:
+  drm-ttm-handle-oom-in-ttm_tt_swapout.patch
+  v4l-dvb-13991-gspca_mr973010a-fix-cif-type-1-cameras-not-streaming-on-uhci-controllers.patch
+  drm-i915-disable-tv-hotplug-status-check.patch
+  drm-i915-fix-get_core_clock_speed-for-g33-class-desktop-chips.patch
+  drm-radeon-r6xx-r7xx-possible-security-issue-system-ram-access.patch
+  drm-radeon-kms-r600-r700-don-t-test-ib-if-ib-initialization-fails.patch
+  drm-radeon-kms-forbid-creation-of-framebuffer-with-no-valid-gem-object.patch
+  acpi-i915-blacklist-clevo-m5x0n-bad_lid-state.patch
+- Dropped merged upstream patches:
+  fix-LOOKUP_FOLLOW-on-automount-symlinks.patch
+  fs-exec.c-fix-initial-stack-reservation.patch
+  kms-offb-handoff.patch
+  linux-2.6-input-hid-quirk-hp-touchsmart.patch
+  sparc-align-clone-and-signal-stacks-to-16-bytes.patch
+  sparc-additional-pci-id-xvr-500.patch
+
 * Thu Mar 11 2010 Dennis Gilmore <dennis at ausil.us>
-- add add aditional pci-id for  xvr-500 
+- add add aditional pci-id for  xvr-500
 - sparc stack alignment fix
 
 * Wed Mar 10 2010 Tom "spot" Callaway <tcallawa at redhat.com>

linux-2.6-upstream-reverts.patch:
 drivers/gpu/drm/i915/i915_debugfs.c     |   30 -------
 drivers/gpu/drm/i915/i915_drv.h         |   13 +++
 drivers/gpu/drm/i915/i915_gem.c         |  123 ++++++++++++++++++++++++++++----
 drivers/gpu/drm/i915/i915_reg.h         |   15 +++
 drivers/gpu/drm/i915/i915_suspend.c     |    5 +
 drivers/gpu/drm/i915/intel_crt.c        |    3 
 drivers/gpu/drm/i915/intel_display.c    |   50 +++++++++++--
 drivers/gpu/drm/i915/intel_drv.h        |    2 
 drivers/gpu/drm/i915/intel_fb.c         |    2 
 drivers/gpu/drm/i915/intel_i2c.c        |   19 ++++
 drivers/gpu/drm/i915/intel_lvds.c       |   30 +++++++
 drivers/gpu/drm/i915/intel_tv.c         |    2 
 drivers/gpu/drm/radeon/atom.c           |    2 
 drivers/gpu/drm/radeon/r600.c           |   13 +--
 drivers/gpu/drm/radeon/r600_cs.c        |   83 +++++++++++++++++++++
 drivers/gpu/drm/radeon/r600d.h          |   26 ++++++
 drivers/gpu/drm/radeon/radeon.h         |    1 
 drivers/gpu/drm/radeon/radeon_cs.c      |    1 
 drivers/gpu/drm/radeon/radeon_display.c |    6 +
 drivers/gpu/drm/radeon/rv770.c          |   13 +--
 drivers/gpu/drm/ttm/ttm_tt.c            |   18 ++--
 drivers/media/video/gspca/mr97310a.c    |    6 +
 include/drm/drm_os_linux.h              |    2 
 23 files changed, 388 insertions(+), 77 deletions(-)

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- linux-2.6-upstream-reverts.patch	22 Feb 2010 07:36:05 -0000	1.9
+++ linux-2.6-upstream-reverts.patch	14 Mar 2010 04:38:01 -0000	1.10
@@ -1,3 +1,601 @@
+From 290e55056ec3d25c72088628245d8cae037b30db Mon Sep 17 00:00:00 2001
+From: Maarten Maathuis <madman2003 at gmail.com>
+Date: Sat, 20 Feb 2010 03:22:21 +0100
+Subject: drm/ttm: handle OOM in ttm_tt_swapout
+
+From: Maarten Maathuis <madman2003 at gmail.com>
+
+commit 290e55056ec3d25c72088628245d8cae037b30db upstream.
+
+- Without this change I get a general protection fault.
+- Also use PTR_ERR where applicable.
+
+Signed-off-by: Maarten Maathuis <madman2003 at gmail.com>
+Reviewed-by: Dave Airlie <airlied at redhat.com>
+Acked-by: Thomas Hellstrom <thellstrom at vmware.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/ttm/ttm_tt.c |   18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/ttm/ttm_tt.c
++++ b/drivers/gpu/drm/ttm/ttm_tt.c
+@@ -466,7 +466,7 @@ static int ttm_tt_swapin(struct ttm_tt *
+ 	void *from_virtual;
+ 	void *to_virtual;
+ 	int i;
+-	int ret;
++	int ret = -ENOMEM;
+ 
+ 	if (ttm->page_flags & TTM_PAGE_FLAG_USER) {
+ 		ret = ttm_tt_set_user(ttm, ttm->tsk, ttm->start,
+@@ -485,8 +485,10 @@ static int ttm_tt_swapin(struct ttm_tt *
+ 
+ 	for (i = 0; i < ttm->num_pages; ++i) {
+ 		from_page = read_mapping_page(swap_space, i, NULL);
+-		if (IS_ERR(from_page))
++		if (IS_ERR(from_page)) {
++			ret = PTR_ERR(from_page);
+ 			goto out_err;
++		}
+ 		to_page = __ttm_tt_get_page(ttm, i);
+ 		if (unlikely(to_page == NULL))
+ 			goto out_err;
+@@ -509,7 +511,7 @@ static int ttm_tt_swapin(struct ttm_tt *
+ 	return 0;
+ out_err:
+ 	ttm_tt_free_alloced_pages(ttm);
+-	return -ENOMEM;
++	return ret;
+ }
+ 
+ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
+@@ -521,6 +523,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, s
+ 	void *from_virtual;
+ 	void *to_virtual;
+ 	int i;
++	int ret = -ENOMEM;
+ 
+ 	BUG_ON(ttm->state != tt_unbound && ttm->state != tt_unpopulated);
+ 	BUG_ON(ttm->caching_state != tt_cached);
+@@ -543,7 +546,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, s
+ 						0);
+ 		if (unlikely(IS_ERR(swap_storage))) {
+ 			printk(KERN_ERR "Failed allocating swap storage.\n");
+-			return -ENOMEM;
++			return PTR_ERR(swap_storage);
+ 		}
+ 	} else
+ 		swap_storage = persistant_swap_storage;
+@@ -555,9 +558,10 @@ int ttm_tt_swapout(struct ttm_tt *ttm, s
+ 		if (unlikely(from_page == NULL))
+ 			continue;
+ 		to_page = read_mapping_page(swap_space, i, NULL);
+-		if (unlikely(to_page == NULL))
++		if (unlikely(IS_ERR(to_page))) {
++			ret = PTR_ERR(to_page);
+ 			goto out_err;
+-
++		}
+ 		preempt_disable();
+ 		from_virtual = kmap_atomic(from_page, KM_USER0);
+ 		to_virtual = kmap_atomic(to_page, KM_USER1);
+@@ -581,5 +585,5 @@ out_err:
+ 	if (!persistant_swap_storage)
+ 		fput(swap_storage);
+ 
+-	return -ENOMEM;
++	return ret;
+ }
+From 70136081fc67ea77d849f86fa323e5773c8e40ea Mon Sep 17 00:00:00 2001
+From: Theodore Kilgore <kilgota at auburn.edu>
+Date: Fri, 25 Dec 2009 05:15:10 -0300
+Subject: V4L/DVB (13991): gspca_mr973010a: Fix cif type 1 cameras not streaming on UHCI controllers
+
+From: Theodore Kilgore <kilgota at auburn.edu>
+
+commit 70136081fc67ea77d849f86fa323e5773c8e40ea upstream.
+
+If you read the mail to Oliver Neukum on the linux-usb list, then you know
+that I found a cure for the mysterious problem that the MR97310a CIF "type
+1" cameras have been freezing up and refusing to stream if hooked up to a
+machine with a UHCI controller.
+
+Namely, the cure is that if the camera is an mr97310a CIF type 1 camera, you
+have to send it 0xa0, 0x00. Somehow, this is a timing reset command, or
+such. It un-blocks whatever was previously stopping the CIF type 1 cameras
+from working on the UHCI-based machines.
+
+Signed-off-by: Theodore Kilgore <kilgota at auburn.edu>
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/media/video/gspca/mr97310a.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/media/video/gspca/mr97310a.c
++++ b/drivers/media/video/gspca/mr97310a.c
+@@ -530,6 +530,12 @@ static int start_cif_cam(struct gspca_de
+ 			{0x13, 0x00, {0x01}, 1},
+ 			{0, 0, {0}, 0}
+ 		};
++		/* Without this command the cam won't work with USB-UHCI */
++		gspca_dev->usb_buf[0] = 0x0a;
++		gspca_dev->usb_buf[1] = 0x00;
++		err_code = mr_write(gspca_dev, 2);
++		if (err_code < 0)
++			return err_code;
+ 		err_code = sensor_write_regs(gspca_dev, cif_sensor1_init_data,
+ 					 ARRAY_SIZE(cif_sensor1_init_data));
+ 	}
+From 8fcc501831aa5b37a4a5a8cd9dc965be3cacc599 Mon Sep 17 00:00:00 2001
+From: Zhenyu Wang <zhenyuw at linux.intel.com>
+Date: Mon, 28 Dec 2009 13:15:20 +0800
+Subject: drm/i915: disable TV hotplug status check
+
+From: Zhenyu Wang <zhenyuw at linux.intel.com>
+
+commit 8fcc501831aa5b37a4a5a8cd9dc965be3cacc599 upstream.
+
+As we removed TV hotplug, don't check its status ever.
+
+Reviewed-by: Adam Jackson <ajax at redhat.com>
+Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>
+Signed-off-by: Eric Anholt <eric at anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/i915/intel_tv.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_tv.c
++++ b/drivers/gpu/drm/i915/intel_tv.c
+@@ -1801,8 +1801,6 @@ intel_tv_init(struct drm_device *dev)
+ 	drm_connector_attach_property(connector,
+ 				   dev->mode_config.tv_bottom_margin_property,
+ 				   tv_priv->margin[TV_MARGIN_BOTTOM]);
+-
+-	dev_priv->hotplug_supported_mask |= TV_HOTPLUG_INT_STATUS;
+ out:
+ 	drm_sysfs_connector_add(connector);
+ }
+From 43bcd61fae05fc6062b4f117c5adb1a72c9f8c57 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter at ffwll.ch>
+Date: Tue, 3 Nov 2009 09:03:34 +0000
+Subject: drm/i915: fix get_core_clock_speed for G33 class desktop chips
+
+From: Daniel Vetter <daniel.vetter at ffwll.ch>
+
+commit 43bcd61fae05fc6062b4f117c5adb1a72c9f8c57 upstream.
+
+Somehow the case for G33 got dropped while porting from ums code.
+This made a 400MHz chip into a 133MHz one which resulted in the
+unnecessary enabling of double wide pipe mode which in turn
+screwed up the overlay code.
+
+Nothing else (than the overlay code) seems to be affected.
+
+This fixes fdo.org bug #24835
+
+Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
+Signed-off-by: Eric Anholt <eric at anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/i915/intel_display.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -4322,7 +4322,7 @@ static void intel_init_display(struct dr
+ 	}
+ 
+ 	/* Returns the core display clock speed */
+-	if (IS_I945G(dev))
++	if (IS_I945G(dev) || (IS_G33(dev) && ! IS_IGDGM(dev)))
+ 		dev_priv->display.get_display_clock_speed =
+ 			i945_get_display_clock_speed;
+ 	else if (IS_I915G(dev))
+From ceb0297d3da7ecf44bccec2c4520c8710612c238 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <jglisse at redhat.com>
+Date: Sun, 14 Feb 2010 19:33:18 +0000
+Subject: drm/radeon: r6xx/r7xx possible security issue, system ram access
+
+From: Jerome Glisse <jglisse at redhat.com>
+
+commit c8c15ff1e90bfc4a2db1ba77a01b3b2783e723fc upstream
+
+This patch workaround a possible security issue which can allow
+user to abuse drm on r6xx/r7xx hw to access any system ram memory.
+This patch doesn't break userspace, it detect "valid" old use of
+CB_COLOR[0-7]_FRAG & CB_COLOR[0-7]_TILE registers and overwritte
+the address these registers are pointing to with the one of the
+last color buffer. This workaround will work for old mesa &
+xf86-video-ati and any old user which did use similar register
+programming pattern as those (we expect that there is no others
+user of those ioctl except possibly a malicious one). This patch
+add a warning if it detects such usage, warning encourage people
+to update their mesa & xf86-video-ati. New userspace will submit
+proper relocation.
+
+Fix for xf86-video-ati / mesa (this kernel patch is enough to
+prevent abuse, fix for userspace are to set proper cs stream and
+avoid kernel warning) :
+http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=95d63e408cc88b6934bec84a0b1ef94dfe8bee7b
+http://cgit.freedesktop.org/mesa/mesa/commit/?id=46dc6fd3ed5ef96cda53641a97bc68c3bc104a9f
+
+Abusing this register to perform system ram memory is not easy,
+here is outline on how it could be achieve. First attacker must
+have access to the drm device and be able to submit command stream
+throught cs ioctl. Then attacker must build a proper command stream
+for r6xx/r7xx hw which will abuse the FRAG or TILE buffer to
+overwrite the GPU GART which is in VRAM. To achieve so attacker
+as to setup CB_COLOR[0-7]_FRAG or CB_COLOR[0-7]_TILE to point
+to the GPU GART, then it has to find a way to write predictable
+value into those buffer (with little cleverness i believe this
+can be done but this is an hard task). Once attacker have such
+program it can overwritte GPU GART to program GPU gart to point
+anywhere in system memory. It then can reusse same method as he
+used to reprogram GART to overwritte the system ram through the
+GART mapping. In the process the attacker has to be carefull to
+not overwritte any sensitive area of the GART table, like ring
+or IB gart entry as it will more then likely lead to GPU lockup.
+Bottom line is that i think it's very hard to use this flaw
+to get system ram access but in theory one can achieve so.
+
+Side note: I am not aware of anyone ever using the GPU as an
+attack vector, nevertheless we take great care in the opensource
+driver to try to detect and forbid malicious use of GPU. I don't
+think the closed source driver are as cautious as we are.
+
+[bwh: Adjusted context for 2.6.32]
+Signed-off-by: Jerome Glisse <jglisse at redhat.com>
+Signed-off-by: Dave Airlie <airlied at linux.ie>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/radeon/r600_cs.c   |   83 +++++++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/radeon/r600d.h     |   26 +++++++++++
+ drivers/gpu/drm/radeon/radeon.h    |    1 
+ drivers/gpu/drm/radeon/radeon_cs.c |    1 
+ 4 files changed, 111 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/r600_cs.c
++++ b/drivers/gpu/drm/radeon/r600_cs.c
+@@ -36,6 +36,10 @@ static int r600_cs_packet_next_reloc_nom
+ typedef int (*next_reloc_t)(struct radeon_cs_parser*, struct radeon_cs_reloc**);
+ static next_reloc_t r600_cs_packet_next_reloc = &r600_cs_packet_next_reloc_mm;
+ 
++struct r600_cs_track {
++	u32	cb_color0_base_last;
++};
++
+ /**
+  * r600_cs_packet_parse() - parse cp packet and point ib index to next packet
+  * @parser:	parser structure holding parsing context.
+@@ -177,6 +181,28 @@ static int r600_cs_packet_next_reloc_nom
+ }
+ 
+ /**
++ * r600_cs_packet_next_is_pkt3_nop() - test if next packet is packet3 nop for reloc
++ * @parser:		parser structure holding parsing context.
++ *
++ * Check next packet is relocation packet3, do bo validation and compute
++ * GPU offset using the provided start.
++ **/
++static inline int r600_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p)
++{
++	struct radeon_cs_packet p3reloc;
++	int r;
++
++	r = r600_cs_packet_parse(p, &p3reloc, p->idx);
++	if (r) {
++		return 0;
++	}
++	if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) {
++		return 0;
++	}
++	return 1;
++}
++
++/**
+  * r600_cs_packet_next_vline() - parse userspace VLINE packet
+  * @parser:		parser structure holding parsing context.
+  *
+@@ -337,6 +363,7 @@ static int r600_packet3_check(struct rad
+ 				struct radeon_cs_packet *pkt)
+ {
+ 	struct radeon_cs_reloc *reloc;
++	struct r600_cs_track *track;
+ 	volatile u32 *ib;
+ 	unsigned idx;
+ 	unsigned i;
+@@ -344,6 +371,7 @@ static int r600_packet3_check(struct rad
+ 	int r;
+ 	u32 idx_value;
+ 
++	track = (struct r600_cs_track *)p->track;
+ 	ib = p->ib->ptr;
+ 	idx = pkt->idx + 1;
+ 	idx_value = radeon_get_ib_value(p, idx);
+@@ -503,9 +531,60 @@ static int r600_packet3_check(struct rad
+ 		for (i = 0; i < pkt->count; i++) {
+ 			reg = start_reg + (4 * i);
+ 			switch (reg) {
++			/* This register were added late, there is userspace
++			 * which does provide relocation for those but set
++			 * 0 offset. In order to avoid breaking old userspace
++			 * we detect this and set address to point to last
++			 * CB_COLOR0_BASE, note that if userspace doesn't set
++			 * CB_COLOR0_BASE before this register we will report
++			 * error. Old userspace always set CB_COLOR0_BASE
++			 * before any of this.
++			 */
++			case R_0280E0_CB_COLOR0_FRAG:
++			case R_0280E4_CB_COLOR1_FRAG:
++			case R_0280E8_CB_COLOR2_FRAG:
++			case R_0280EC_CB_COLOR3_FRAG:
++			case R_0280F0_CB_COLOR4_FRAG:
++			case R_0280F4_CB_COLOR5_FRAG:
++			case R_0280F8_CB_COLOR6_FRAG:
++			case R_0280FC_CB_COLOR7_FRAG:
++			case R_0280C0_CB_COLOR0_TILE:
++			case R_0280C4_CB_COLOR1_TILE:
++			case R_0280C8_CB_COLOR2_TILE:
++			case R_0280CC_CB_COLOR3_TILE:
++			case R_0280D0_CB_COLOR4_TILE:
++			case R_0280D4_CB_COLOR5_TILE:
++			case R_0280D8_CB_COLOR6_TILE:
++			case R_0280DC_CB_COLOR7_TILE:
++				if (!r600_cs_packet_next_is_pkt3_nop(p)) {
++					if (!track->cb_color0_base_last) {
++						dev_err(p->dev, "Broken old userspace ? no cb_color0_base supplied before trying to write 0x%08X\n", reg);
++						return -EINVAL;
++					}
++					ib[idx+1+i] = track->cb_color0_base_last;
++					printk_once(KERN_WARNING "You have old & broken userspace "
++						"please consider updating mesa & xf86-video-ati\n");
++				} else {
++					r = r600_cs_packet_next_reloc(p, &reloc);
++					if (r) {
++						dev_err(p->dev, "bad SET_CONTEXT_REG 0x%04X\n", reg);
++						return -EINVAL;
++					}
++					ib[idx+1+i] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
++				}
++				break;
+ 			case DB_DEPTH_BASE:
+ 			case DB_HTILE_DATA_BASE:
+ 			case CB_COLOR0_BASE:
++				r = r600_cs_packet_next_reloc(p, &reloc);
++				if (r) {
++					DRM_ERROR("bad SET_CONTEXT_REG "
++							"0x%04X\n", reg);
++					return -EINVAL;
++				}
++				ib[idx+1+i] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
++				track->cb_color0_base_last = ib[idx+1+i];
++				break;
+ 			case CB_COLOR1_BASE:
+ 			case CB_COLOR2_BASE:
+ 			case CB_COLOR3_BASE:
+@@ -678,8 +757,11 @@ static int r600_packet3_check(struct rad
+ int r600_cs_parse(struct radeon_cs_parser *p)
+ {
+ 	struct radeon_cs_packet pkt;
++	struct r600_cs_track *track;
+ 	int r;
+ 
++	track = kzalloc(sizeof(*track), GFP_KERNEL);
++	p->track = track;
+ 	do {
+ 		r = r600_cs_packet_parse(p, &pkt, p->idx);
+ 		if (r) {
+@@ -757,6 +839,7 @@ int r600_cs_legacy(struct drm_device *de
+ 	/* initialize parser */
+ 	memset(&parser, 0, sizeof(struct radeon_cs_parser));
+ 	parser.filp = filp;
++	parser.dev = &dev->pdev->dev;
+ 	parser.rdev = NULL;
+ 	parser.family = family;
+ 	parser.ib = &fake_ib;
+--- a/drivers/gpu/drm/radeon/r600d.h
++++ b/drivers/gpu/drm/radeon/r600d.h
+@@ -674,4 +674,30 @@
+ #define		S_000E60_SOFT_RESET_TSC(x)		(((x) & 1) << 16)
+ #define		S_000E60_SOFT_RESET_VMC(x)		(((x) & 1) << 17)
+ 
++#define R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL		0x5480
++
++#define R_0280E0_CB_COLOR0_FRAG                      0x0280E0
++#define   S_0280E0_BASE_256B(x)                        (((x) & 0xFFFFFFFF) << 0)
++#define   G_0280E0_BASE_256B(x)                        (((x) >> 0) & 0xFFFFFFFF)
++#define   C_0280E0_BASE_256B                           0x00000000
++#define R_0280E4_CB_COLOR1_FRAG                      0x0280E4
++#define R_0280E8_CB_COLOR2_FRAG                      0x0280E8
++#define R_0280EC_CB_COLOR3_FRAG                      0x0280EC
++#define R_0280F0_CB_COLOR4_FRAG                      0x0280F0
++#define R_0280F4_CB_COLOR5_FRAG                      0x0280F4
++#define R_0280F8_CB_COLOR6_FRAG                      0x0280F8
++#define R_0280FC_CB_COLOR7_FRAG                      0x0280FC
++#define R_0280C0_CB_COLOR0_TILE                      0x0280C0
++#define   S_0280C0_BASE_256B(x)                        (((x) & 0xFFFFFFFF) << 0)
++#define   G_0280C0_BASE_256B(x)                        (((x) >> 0) & 0xFFFFFFFF)
++#define   C_0280C0_BASE_256B                           0x00000000
++#define R_0280C4_CB_COLOR1_TILE                      0x0280C4
++#define R_0280C8_CB_COLOR2_TILE                      0x0280C8
++#define R_0280CC_CB_COLOR3_TILE                      0x0280CC
++#define R_0280D0_CB_COLOR4_TILE                      0x0280D0
++#define R_0280D4_CB_COLOR5_TILE                      0x0280D4
++#define R_0280D8_CB_COLOR6_TILE                      0x0280D8
++#define R_0280DC_CB_COLOR7_TILE                      0x0280DC
++
++
+ #endif
+--- a/drivers/gpu/drm/radeon/radeon.h
++++ b/drivers/gpu/drm/radeon/radeon.h
+@@ -448,6 +448,7 @@ struct radeon_cs_chunk {
+ };
+ 
+ struct radeon_cs_parser {
++	struct device		*dev;
+ 	struct radeon_device	*rdev;
+ 	struct drm_file		*filp;
+ 	/* chunks */
+--- a/drivers/gpu/drm/radeon/radeon_cs.c
++++ b/drivers/gpu/drm/radeon/radeon_cs.c
+@@ -230,6 +230,7 @@ int radeon_cs_ioctl(struct drm_device *d
+ 	memset(&parser, 0, sizeof(struct radeon_cs_parser));
+ 	parser.filp = filp;
+ 	parser.rdev = rdev;
++	parser.dev = rdev->dev;
+ 	r = radeon_cs_parser_init(&parser, data);
+ 	if (r) {
+ 		DRM_ERROR("Failed to initialize parser !\n");
+From e3dae5087754984ed7e6daf4fbb742ff026aadd5 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <jglisse at redhat.com>
+Date: Sun, 14 Feb 2010 19:31:58 +0000
+Subject: drm/radeon/kms: r600/r700 don't test ib if ib initialization fails
+
+From: Jerome Glisse <jglisse at redhat.com>
+
+commit db96380ea26fcc31ab37189aedeabd12894b1431 upstream
+
+If ib initialization failed don't try to test ib as it will result
+in an oops (accessing NULL ib buffer ptr).
+
+[bwh: Adjusted context for 2.6.32]
+Signed-off-by: Jerome Glisse <jglisse at redhat.com>
+Signed-off-by: Dave Airlie <airlied at linux.ie>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/radeon/r600.c  |   13 +++++++------
+ drivers/gpu/drm/radeon/rv770.c |   13 +++++++------
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -1686,13 +1686,14 @@ int r600_init(struct radeon_device *rdev
+ 	if (rdev->accel_working) {
+ 		r = radeon_ib_pool_init(rdev);
+ 		if (r) {
+-			DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
+-			rdev->accel_working = false;
+-		}
+-		r = r600_ib_test(rdev);
+-		if (r) {
+-			DRM_ERROR("radeon: failled testing IB (%d).\n", r);
++			dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
+ 			rdev->accel_working = false;
++		} else {
++			r = r600_ib_test(rdev);
++			if (r) {
++				dev_err(rdev->dev, "IB test failed (%d).\n", r);
++				rdev->accel_working = false;
++			}
+ 		}
+ 	}
+ 	return 0;
+--- a/drivers/gpu/drm/radeon/rv770.c
++++ b/drivers/gpu/drm/radeon/rv770.c
+@@ -1034,13 +1034,14 @@ int rv770_init(struct radeon_device *rde
+ 	if (rdev->accel_working) {
+ 		r = radeon_ib_pool_init(rdev);
+ 		if (r) {
+-			DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
+-			rdev->accel_working = false;
+-		}
+-		r = r600_ib_test(rdev);
+-		if (r) {
+-			DRM_ERROR("radeon: failled testing IB (%d).\n", r);
++			dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
+ 			rdev->accel_working = false;
++		} else {
++			r = r600_ib_test(rdev);
++			if (r) {
++				dev_err(rdev->dev, "IB test failed (%d).\n", r);
++				rdev->accel_working = false;
++			}
+ 		}
+ 	}
+ 	return 0;
+From 7e71c9e2e7704ebf044d4a964e02fbd2098a173f Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <jglisse at redhat.com>
+Date: Sun, 17 Jan 2010 21:21:41 +0100
+Subject: drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object
+
+From: Jerome Glisse <jglisse at redhat.com>
+
+commit 7e71c9e2e7704ebf044d4a964e02fbd2098a173f upstream.
+
+This will avoid oops if at later point the fb is use. Trying to create
+a framebuffer with no valid GEM object is bogus and should be forbidden
+as this patch does.
+
+Signed-off-by: Jerome Glisse <jglisse at redhat.com>
+Signed-off-by: Dave Airlie <airlied at linux.ie>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/radeon/radeon_display.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -599,7 +599,11 @@ radeon_user_framebuffer_create(struct dr
+ 	struct drm_gem_object *obj;
+ 
+ 	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
+-
++	if (obj ==  NULL) {
++		dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
++			"can't create framebuffer\n", mode_cmd->handle);
++		return NULL;
++	}
+ 	return radeon_framebuffer_create(dev, mode_cmd, obj);
+ }
+ 
+From 1379d2fef0ec07c7027a5e89036025ce761470c8 Mon Sep 17 00:00:00 2001
+From: Zhang Rui <rui.zhang at intel.com>
+Date: Tue, 16 Feb 2010 04:16:55 -0500
+Subject: ACPI, i915: blacklist Clevo M5x0N bad_lid state
+
+From: Zhang Rui <rui.zhang at intel.com>
+
+commit 1379d2fef0ec07c7027a5e89036025ce761470c8 upstream.
+
+Wrong Lid state reported.
+Need to blacklist this machine for LVDS detection.
+
+Signed-off-by: Zhang Rui <rui.zhang at intel.com>
+Signed-off-by: Len Brown <len.brown at intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/i915/intel_lvds.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -629,6 +629,13 @@ static const struct dmi_system_id bad_li
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "PC-81005"),
+ 		},
+ 	},
++	{
++		.ident = "Clevo M5x0N",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "CLEVO Co."),
++			DMI_MATCH(DMI_BOARD_NAME, "M5x0N"),
++		},
++	},
+ 	{ }
+ };
+ 
 From 01d4503968f471f876fb44335800d2cf8dc5a2ce Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Sun, 31 Jan 2010 07:07:14 +1000


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1107
retrieving revision 1.1108
diff -u -p -r1.1107 -r1.1108
--- sources	23 Feb 2010 22:58:22 -0000	1.1107
+++ sources	14 Mar 2010 04:38:01 -0000	1.1108
@@ -1,2 +1,3 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
 7f615dd3b4a3b19fb86e479996a2deb5  patch-2.6.32.9.bz2
+9ffbbf9eb9d6537b995dd782dbbb68ee  patch-2.6.32.10-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1021
retrieving revision 1.1022
diff -u -p -r1.1021 -r1.1022
--- upstream	23 Feb 2010 22:58:22 -0000	1.1021
+++ upstream	14 Mar 2010 04:38:01 -0000	1.1022
@@ -1,2 +1,3 @@
 linux-2.6.32.tar.bz2
 patch-2.6.32.9.bz2
+patch-2.6.32.10-rc1.bz2


--- fix-LOOKUP_FOLLOW-on-automount-symlinks.patch DELETED ---


--- fs-exec.c-fix-initial-stack-reservation.patch DELETED ---


--- kms-offb-handoff.patch DELETED ---


--- linux-2.6-input-hid-quirk-hp-touchsmart.patch DELETED ---


--- sparc-additional-pci-id-xvr-500.patch DELETED ---


--- sparc-align-clone-and-signal-stacks-to-16-bytes.patch DELETED ---



More information about the scm-commits mailing list