rpms/kernel/devel drm-next.patch, 1.17, 1.18 kernel.spec, 1.1775, 1.1776
Dave Airlie
airlied at fedoraproject.org
Tue Sep 8 22:51:12 UTC 2009
- Previous message: rpms/eog-plugins/devel .cvsignore, 1.2, 1.3 eog-plugins.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/mesa/devel .cvsignore, 1.36, 1.37 mesa-7.6-dri2-page-flip.patch, 1.1, 1.2 mesa.spec, 1.251, 1.252 sources, 1.38, 1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4623
Modified Files:
drm-next.patch kernel.spec
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.213.rc9.git1
- fix two bugs in r600 kms, fencing + mobile lvds
drm-next.patch:
b/drivers/gpu/drm/Kconfig | 18
b/drivers/gpu/drm/Makefile | 8
b/drivers/gpu/drm/drm_cache.c | 46
b/drivers/gpu/drm/drm_crtc.c | 77
b/drivers/gpu/drm/drm_crtc_helper.c | 220
b/drivers/gpu/drm/drm_drv.c | 4
b/drivers/gpu/drm/drm_edid.c | 504
b/drivers/gpu/drm/drm_encoder_slave.c | 116
b/drivers/gpu/drm/drm_fb_helper.c | 701
b/drivers/gpu/drm/drm_gem.c | 11
b/drivers/gpu/drm/drm_mm.c | 21
b/drivers/gpu/drm/drm_modes.c | 435
b/drivers/gpu/drm/drm_proc.c | 17
b/drivers/gpu/drm/drm_sysfs.c | 28
b/drivers/gpu/drm/i915/Makefile | 2
b/drivers/gpu/drm/i915/i915_debugfs.c | 445
b/drivers/gpu/drm/i915/i915_dma.c | 100
b/drivers/gpu/drm/i915/i915_drv.c | 9
b/drivers/gpu/drm/i915/i915_drv.h | 62
b/drivers/gpu/drm/i915/i915_gem.c | 14
b/drivers/gpu/drm/i915/i915_gem_tiling.c | 80
b/drivers/gpu/drm/i915/i915_irq.c | 21
b/drivers/gpu/drm/i915/i915_reg.h | 143
b/drivers/gpu/drm/i915/i915_suspend.c | 4
b/drivers/gpu/drm/i915/intel_bios.c | 8
b/drivers/gpu/drm/i915/intel_crt.c | 28
b/drivers/gpu/drm/i915/intel_display.c | 607
b/drivers/gpu/drm/i915/intel_drv.h | 7
b/drivers/gpu/drm/i915/intel_fb.c | 737
b/drivers/gpu/drm/i915/intel_i2c.c | 8
b/drivers/gpu/drm/i915/intel_lvds.c | 22
b/drivers/gpu/drm/i915/intel_sdvo.c | 331
b/drivers/gpu/drm/i915/intel_tv.c | 30
b/drivers/gpu/drm/mga/mga_dma.c | 4
b/drivers/gpu/drm/mga/mga_drv.h | 1
b/drivers/gpu/drm/mga/mga_warp.c | 180
b/drivers/gpu/drm/r128/r128_cce.c | 116
b/drivers/gpu/drm/r128/r128_drv.h | 8
b/drivers/gpu/drm/r128/r128_state.c | 36
b/drivers/gpu/drm/radeon/Kconfig | 1
b/drivers/gpu/drm/radeon/Makefile | 43
b/drivers/gpu/drm/radeon/atombios.h | 11
b/drivers/gpu/drm/radeon/atombios_crtc.c | 100
b/drivers/gpu/drm/radeon/avivod.h | 60
b/drivers/gpu/drm/radeon/mkregtable.c | 720
b/drivers/gpu/drm/radeon/r100.c | 1047
b/drivers/gpu/drm/radeon/r100_track.h | 124
b/drivers/gpu/drm/radeon/r100d.h | 76
b/drivers/gpu/drm/radeon/r200.c | 456
b/drivers/gpu/drm/radeon/r300.c | 411
b/drivers/gpu/drm/radeon/r300d.h | 76
b/drivers/gpu/drm/radeon/r600.c | 1714 +
b/drivers/gpu/drm/radeon/r600_blit.c | 855
b/drivers/gpu/drm/radeon/r600_blit_kms.c | 777
b/drivers/gpu/drm/radeon/r600_blit_shaders.c | 1072 +
b/drivers/gpu/drm/radeon/r600_blit_shaders.h | 14
b/drivers/gpu/drm/radeon/r600_cp.c | 541
b/drivers/gpu/drm/radeon/r600_cs.c | 658
b/drivers/gpu/drm/radeon/r600d.h | 661
b/drivers/gpu/drm/radeon/radeon.h | 126
b/drivers/gpu/drm/radeon/radeon_asic.h | 159
b/drivers/gpu/drm/radeon/radeon_atombios.c | 79
b/drivers/gpu/drm/radeon/radeon_clocks.c | 10
b/drivers/gpu/drm/radeon/radeon_connectors.c | 215
b/drivers/gpu/drm/radeon/radeon_cp.c | 128
b/drivers/gpu/drm/radeon/radeon_device.c | 340
b/drivers/gpu/drm/radeon/radeon_display.c | 18
b/drivers/gpu/drm/radeon/radeon_drv.c | 21
b/drivers/gpu/drm/radeon/radeon_drv.h | 146
b/drivers/gpu/drm/radeon/radeon_encoders.c | 125
b/drivers/gpu/drm/radeon/radeon_fb.c | 670
b/drivers/gpu/drm/radeon/radeon_fence.c | 49
b/drivers/gpu/drm/radeon/radeon_irq_kms.c | 1
b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 44
b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 339
b/drivers/gpu/drm/radeon/radeon_legacy_tv.c | 904
b/drivers/gpu/drm/radeon/radeon_mode.h | 52
b/drivers/gpu/drm/radeon/radeon_object.h | 1
b/drivers/gpu/drm/radeon/radeon_reg.h | 79
b/drivers/gpu/drm/radeon/radeon_ring.c | 119
b/drivers/gpu/drm/radeon/radeon_share.h | 77
b/drivers/gpu/drm/radeon/radeon_state.c | 18
b/drivers/gpu/drm/radeon/radeon_ttm.c | 96
b/drivers/gpu/drm/radeon/reg_srcs/r100 | 105
b/drivers/gpu/drm/radeon/reg_srcs/r200 | 184
b/drivers/gpu/drm/radeon/reg_srcs/r300 | 729
b/drivers/gpu/drm/radeon/reg_srcs/rn50 | 30
b/drivers/gpu/drm/radeon/reg_srcs/rs600 | 729
b/drivers/gpu/drm/radeon/reg_srcs/rv515 | 486
b/drivers/gpu/drm/radeon/rs400.c | 2
b/drivers/gpu/drm/radeon/rs600.c | 60
b/drivers/gpu/drm/radeon/rs690.c | 1
b/drivers/gpu/drm/radeon/rv515.c | 518
b/drivers/gpu/drm/radeon/rv515d.h | 220
b/drivers/gpu/drm/radeon/rv770.c | 987
b/drivers/gpu/drm/radeon/rv770d.h | 341
b/drivers/gpu/drm/ttm/ttm_bo.c | 295
b/drivers/gpu/drm/ttm/ttm_bo_util.c | 4
b/drivers/gpu/drm/ttm/ttm_global.c | 4
b/drivers/gpu/drm/ttm/ttm_memory.c | 508
b/drivers/gpu/drm/ttm/ttm_module.c | 58
b/drivers/gpu/drm/ttm/ttm_tt.c | 104
b/firmware/Makefile | 16
b/firmware/WHENCE | 121
b/firmware/matrox/g200_warp.H16 | 28
b/firmware/matrox/g400_warp.H16 | 44
b/firmware/r128/r128_cce.bin.ihex | 129
b/firmware/radeon/R100_cp.bin.ihex | 130
b/firmware/radeon/R200_cp.bin.ihex | 130
b/firmware/radeon/R300_cp.bin.ihex | 130
b/firmware/radeon/R420_cp.bin.ihex | 130
b/firmware/radeon/R520_cp.bin.ihex | 130
b/firmware/radeon/R600_me.bin.ihex | 1345 +
b/firmware/radeon/R600_pfp.bin.ihex | 145
b/firmware/radeon/RS600_cp.bin.ihex | 130
b/firmware/radeon/RS690_cp.bin.ihex | 130
b/firmware/radeon/RS780_me.bin.ihex | 1345 +
b/firmware/radeon/RS780_pfp.bin.ihex | 145
b/firmware/radeon/RV610_me.bin.ihex | 1345 +
b/firmware/radeon/RV610_pfp.bin.ihex | 145
b/firmware/radeon/RV620_me.bin.ihex | 1345 +
b/firmware/radeon/RV620_pfp.bin.ihex | 145
b/firmware/radeon/RV630_me.bin.ihex | 1345 +
b/firmware/radeon/RV630_pfp.bin.ihex | 145
b/firmware/radeon/RV635_me.bin.ihex | 1345 +
b/firmware/radeon/RV635_pfp.bin.ihex | 145
b/firmware/radeon/RV670_me.bin.ihex | 1345 +
b/firmware/radeon/RV670_pfp.bin.ihex | 145
b/firmware/radeon/RV710_me.bin.ihex | 341
b/firmware/radeon/RV710_pfp.bin.ihex | 213
b/firmware/radeon/RV730_me.bin.ihex | 341
b/firmware/radeon/RV730_pfp.bin.ihex | 213
b/firmware/radeon/RV770_me.bin.ihex | 341
b/firmware/radeon/RV770_pfp.bin.ihex | 213
b/include/drm/drmP.h | 54
b/include/drm/drm_cache.h | 38
b/include/drm/drm_crtc.h | 16
b/include/drm/drm_crtc_helper.h | 3
b/include/drm/drm_encoder_slave.h | 162
b/include/drm/drm_fb_helper.h | 82
b/include/drm/drm_mm.h | 7
b/include/drm/drm_mode.h | 11
b/include/drm/drm_sysfs.h | 12
b/include/drm/ttm/ttm_bo_api.h | 13
b/include/drm/ttm/ttm_bo_driver.h | 94
b/include/drm/ttm/ttm_memory.h | 43
b/include/drm/ttm/ttm_module.h | 2
drivers/gpu/drm/i915/i915_gem_debugfs.c | 396
drivers/gpu/drm/mga/mga_ucode.h |11645 ----------
drivers/gpu/drm/radeon/r300.h | 36
drivers/gpu/drm/radeon/r600_microcode.h |23297 ----------------------
drivers/gpu/drm/radeon/radeon_microcode.h | 1844 -
drivers/gpu/drm/radeon/rs780.c | 102
drivers/gpu/drm/radeon/rv515r.h | 170
154 files changed, 33674 insertions(+), 41500 deletions(-)
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- drm-next.patch 8 Sep 2009 04:57:21 -0000 1.17
+++ drm-next.patch 8 Sep 2009 22:51:11 -0000 1.18
@@ -55005,7 +55005,7 @@ index 6fa32da..c7b1859 100644
# define R600_TC_L2_SIZE(x) ((x) << 5)
# define R600_L2_DISABLE_LATE_HIT (1 << 9)
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
-index 0a92706..8a353ea 100644
+index 0a92706..9ad2035 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -126,6 +126,23 @@ radeon_link_encoder_connector(struct drm_device *dev)
@@ -55301,6 +55301,23 @@ index 0a92706..8a353ea 100644
drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs);
break;
case ENCODER_OBJECT_ID_INTERNAL_DVO1:
+@@ -1345,8 +1400,14 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
+ case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+- drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
+- radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
++ if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
++ radeon_encoder->rmx_type = RMX_FULL;
++ drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS);
++ radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);
++ } else {
++ drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
++ radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
++ }
+ drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
+ break;
+ }
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index ec383ed..ebb5895 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
@@ -56103,7 +56120,7 @@ index ec383ed..ebb5895 100644
}
EXPORT_SYMBOL(radeonfb_remove);
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
-index b4e48dd..01a8963 100644
+index b4e48dd..3beb26d 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -53,9 +53,9 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
@@ -56118,7 +56135,7 @@ index b4e48dd..01a8963 100644
fence->emited = true;
fence->timeout = jiffies + ((2000 * HZ) / 1000);
list_del(&fence->list);
-@@ -168,7 +168,47 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
+@@ -168,7 +168,38 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
return signaled;
}
@@ -56126,17 +56143,8 @@ index b4e48dd..01a8963 100644
+int r600_fence_wait(struct radeon_fence *fence, bool intr, bool lazy)
+{
+ struct radeon_device *rdev;
-+ unsigned long cur_jiffies;
-+ unsigned long timeout;
+ int ret = 0;
+
-+ cur_jiffies = jiffies;
-+ timeout = HZ / 100;
-+
-+ if (time_after(fence->timeout, cur_jiffies)) {
-+ timeout = fence->timeout - cur_jiffies;
-+ }
-+
+ rdev = fence->rdev;
+
+ __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
@@ -56145,7 +56153,7 @@ index b4e48dd..01a8963 100644
+ if (radeon_fence_signaled(fence))
+ break;
+
-+ if (time_after_eq(jiffies, timeout)) {
++ if (time_after_eq(jiffies, fence->timeout)) {
+ ret = -EBUSY;
+ break;
+ }
@@ -56167,7 +56175,7 @@ index b4e48dd..01a8963 100644
{
struct radeon_device *rdev;
unsigned long cur_jiffies;
-@@ -176,7 +216,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+@@ -176,7 +207,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
bool expired = false;
int r;
@@ -56175,7 +56183,7 @@ index b4e48dd..01a8963 100644
if (fence == NULL) {
WARN(1, "Querying an invalid fence : %p !\n", fence);
return 0;
-@@ -185,13 +224,22 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+@@ -185,13 +215,22 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
if (radeon_fence_signaled(fence)) {
return 0;
}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1775
retrieving revision 1.1776
diff -u -p -r1.1775 -r1.1776
--- kernel.spec 8 Sep 2009 07:32:14 -0000 1.1775
+++ kernel.spec 8 Sep 2009 22:51:11 -0000 1.1776
@@ -2020,6 +2020,9 @@ fi
# and build.
%changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.213.rc9.git1
+- fix two bugs in r600 kms, fencing + mobile lvds
+
* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.212.rc9.git1
- drm-nouveau.patch: fix ppc build
- Previous message: rpms/eog-plugins/devel .cvsignore, 1.2, 1.3 eog-plugins.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/mesa/devel .cvsignore, 1.36, 1.37 mesa-7.6-dri2-page-flip.patch, 1.1, 1.2 mesa.spec, 1.251, 1.252 sources, 1.38, 1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list