rpms/kernel/F-12 drm-next-b390f944.patch, 1.1, 1.2 kernel.spec, 1.1953, 1.1954 crypto-via-padlock-fix-nano-aes.patch, 1.1, NONE highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch, 1.1, NONE highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch, 1.1, NONE highmem-fix-arm-powerpc-kmap_types.patch, 1.1, NONE ipv4-fix-null-ptr-deref-in-ip_fragment.patch, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Fri Dec 11 01:31:48 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27102
Modified Files:
drm-next-b390f944.patch kernel.spec
Removed Files:
crypto-via-padlock-fix-nano-aes.patch
highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
highmem-fix-arm-powerpc-kmap_types.patch
ipv4-fix-null-ptr-deref-in-ip_fragment.patch
Log Message:
* Thu Dec 10 2009 Kyle McMartin <kyle at redhat.com>
- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: upstream.
- nuke highmem patches now in stable.
- crypto-via-padlock-fix-nano-aes.patch: upstream.
- fix up drm-next-$sha.patch
drm-next-b390f944.patch:
b/drivers/gpu/drm/Kconfig | 18
b/drivers/gpu/drm/Makefile | 8
b/drivers/gpu/drm/drm_bufs.c | 4
b/drivers/gpu/drm/drm_cache.c | 46
b/drivers/gpu/drm/drm_crtc.c | 78
b/drivers/gpu/drm/drm_crtc_helper.c | 308
b/drivers/gpu/drm/drm_drv.c | 4
b/drivers/gpu/drm/drm_edid.c | 542
b/drivers/gpu/drm/drm_encoder_slave.c | 116
b/drivers/gpu/drm/drm_fb_helper.c | 1030
b/drivers/gpu/drm/drm_gem.c | 13
b/drivers/gpu/drm/drm_mm.c | 30
b/drivers/gpu/drm/drm_modes.c | 434
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 | 65
b/drivers/gpu/drm/i915/i915_irq.c | 21
b/drivers/gpu/drm/i915/i915_reg.h | 139
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 | 608
b/drivers/gpu/drm/i915/intel_drv.h | 9
b/drivers/gpu/drm/i915/intel_fb.c | 748
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 | 239
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/.gitignore | 3
b/drivers/gpu/drm/radeon/Kconfig | 1
b/drivers/gpu/drm/radeon/Makefile | 43
b/drivers/gpu/drm/radeon/atom.c | 1
b/drivers/gpu/drm/radeon/atombios.h | 13
b/drivers/gpu/drm/radeon/atombios_crtc.c | 366
b/drivers/gpu/drm/radeon/avivod.h | 60
b/drivers/gpu/drm/radeon/mkregtable.c | 720
b/drivers/gpu/drm/radeon/r100.c | 1768 +
b/drivers/gpu/drm/radeon/r100_track.h | 183
b/drivers/gpu/drm/radeon/r100d.h | 714
b/drivers/gpu/drm/radeon/r200.c | 454
b/drivers/gpu/drm/radeon/r300.c | 985
b/drivers/gpu/drm/radeon/r300d.h | 306
b/drivers/gpu/drm/radeon/r420.c | 305
b/drivers/gpu/drm/radeon/r420d.h | 249
b/drivers/gpu/drm/radeon/r500_reg.h | 12
b/drivers/gpu/drm/radeon/r520.c | 286
b/drivers/gpu/drm/radeon/r520d.h | 187
b/drivers/gpu/drm/radeon/r600.c | 1847 +
b/drivers/gpu/drm/radeon/r600_blit.c | 858
b/drivers/gpu/drm/radeon/r600_blit_kms.c | 805
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 | 783
b/drivers/gpu/drm/radeon/r600d.h | 667
b/drivers/gpu/drm/radeon/radeon.h | 454
b/drivers/gpu/drm/radeon/radeon_agp.c | 12
b/drivers/gpu/drm/radeon/radeon_asic.h | 386
b/drivers/gpu/drm/radeon/radeon_atombios.c | 434
b/drivers/gpu/drm/radeon/radeon_benchmark.c | 4
b/drivers/gpu/drm/radeon/radeon_bios.c | 46
b/drivers/gpu/drm/radeon/radeon_clocks.c | 28
b/drivers/gpu/drm/radeon/radeon_combios.c | 717
b/drivers/gpu/drm/radeon/radeon_connectors.c | 751
b/drivers/gpu/drm/radeon/radeon_cp.c | 151
b/drivers/gpu/drm/radeon/radeon_cs.c | 104
b/drivers/gpu/drm/radeon/radeon_cursor.c | 10
b/drivers/gpu/drm/radeon/radeon_device.c | 352
b/drivers/gpu/drm/radeon/radeon_display.c | 193
b/drivers/gpu/drm/radeon/radeon_drv.c | 28
b/drivers/gpu/drm/radeon/radeon_drv.h | 216
b/drivers/gpu/drm/radeon/radeon_encoders.c | 309
b/drivers/gpu/drm/radeon/radeon_family.h | 97
b/drivers/gpu/drm/radeon/radeon_fb.c | 700
b/drivers/gpu/drm/radeon/radeon_fence.c | 49
b/drivers/gpu/drm/radeon/radeon_gart.c | 29
b/drivers/gpu/drm/radeon/radeon_gem.c | 10
b/drivers/gpu/drm/radeon/radeon_i2c.c | 109
b/drivers/gpu/drm/radeon/radeon_ioc32.c | 15
b/drivers/gpu/drm/radeon/radeon_irq.c | 18
b/drivers/gpu/drm/radeon/radeon_irq_kms.c | 16
b/drivers/gpu/drm/radeon/radeon_kms.c | 74
b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 152
b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 505
b/drivers/gpu/drm/radeon/radeon_legacy_tv.c | 904
b/drivers/gpu/drm/radeon/radeon_mode.h | 170
b/drivers/gpu/drm/radeon/radeon_object.c | 28
b/drivers/gpu/drm/radeon/radeon_object.h | 1
b/drivers/gpu/drm/radeon/radeon_pm.c | 65
b/drivers/gpu/drm/radeon/radeon_reg.h | 126
b/drivers/gpu/drm/radeon/radeon_ring.c | 143
b/drivers/gpu/drm/radeon/radeon_state.c | 23
b/drivers/gpu/drm/radeon/radeon_test.c | 6
b/drivers/gpu/drm/radeon/radeon_ttm.c | 101
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/rs100d.h | 40
b/drivers/gpu/drm/radeon/rs400.c | 331
b/drivers/gpu/drm/radeon/rs400d.h | 160
b/drivers/gpu/drm/radeon/rs600.c | 610
b/drivers/gpu/drm/radeon/rs600d.h | 470
b/drivers/gpu/drm/radeon/rs690.c | 359
b/drivers/gpu/drm/radeon/rs690d.h | 307
b/drivers/gpu/drm/radeon/rv200d.h | 36
b/drivers/gpu/drm/radeon/rv250d.h | 123
b/drivers/gpu/drm/radeon/rv350d.h | 52
b/drivers/gpu/drm/radeon/rv515.c | 882
b/drivers/gpu/drm/radeon/rv515d.h | 603
b/drivers/gpu/drm/radeon/rv770.c | 1063 -
b/drivers/gpu/drm/radeon/rv770d.h | 346
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 | 6
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 | 105
b/drivers/video/fbmem.c | 2
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 | 28
b/include/drm/drm_crtc_helper.h | 10
b/include/drm/drm_encoder_slave.h | 162
b/include/drm/drm_fb_helper.h | 111
b/include/drm/drm_mm.h | 7
b/include/drm/drm_mode.h | 11
b/include/drm/drm_pciids.h | 4
b/include/drm/drm_sysfs.h | 12
b/include/drm/radeon_drm.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/radeon_share.h | 39
drivers/gpu/drm/radeon/rs690r.h | 99
drivers/gpu/drm/radeon/rs780.c | 102
drivers/gpu/drm/radeon/rv515r.h | 170
189 files changed, 42492 insertions(+), 44061 deletions(-)
Index: drm-next-b390f944.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-next-b390f944.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-next-b390f944.patch 1 Dec 2009 04:13:23 -0000 1.1
+++ drm-next-b390f944.patch 11 Dec 2009 01:31:47 -0000 1.2
@@ -1,5 +1,5 @@
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..e4d971c 100644
+index 012cf1f..bdcfedc 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
@@ -37,10 +37,10 @@ index 39b393d..e4d971c 100644
help
Choose this option if you have an ATI Radeon graphics card. There
are both PCI and AGP versions. You don't need to choose this to
-@@ -82,11 +92,10 @@ config DRM_I830
- config DRM_I915
+@@ -83,11 +93,10 @@ config DRM_I915
tristate "i915 driver"
depends on AGP_INTEL
+ select SHMEM
+ select DRM_KMS_HELPER
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
@@ -50,7 +50,7 @@ index 39b393d..e4d971c 100644
# i915 depends on ACPI_VIDEO when ACPI is enabled
# but for select to work, need to select ACPI_VIDEO's dependencies, ick
select VIDEO_OUTPUT_CONTROL if ACPI
-@@ -116,6 +125,7 @@ endchoice
+@@ -117,6 +126,7 @@ endchoice
config DRM_MGA
tristate "Matrox g200/g400"
depends on DRM
@@ -986,7 +986,7 @@ index b39d7bf..a75ca63 100644
DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 7f2728b..b54ba63 100644
+index 55fb98d..6ce18a2 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -60,6 +60,12 @@
@@ -1383,29 +1383,7 @@ index 7f2728b..b54ba63 100644
mode = drm_mode_create(dev);
if (!mode)
return NULL;
-@@ -333,6 +653,21 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- mode->vsync_end = mode->vsync_start + vsync_pulse_width;
- mode->vtotal = mode->vdisplay + vblank;
-
-+ /* perform the basic check for the detailed timing */
-+ if (mode->hsync_end > mode->htotal ||
-+ mode->vsync_end > mode->vtotal) {
-+ drm_mode_destroy(dev, mode);
-+ DRM_DEBUG_KMS("Incorrect detailed timing. "
-+ "Sync is beyond the blank.\n");
-+ return NULL;
-+ }
-+
-+ /* Some EDIDs have bogus h/vtotal values */
-+ if (mode->hsync_end > mode->htotal)
-+ mode->htotal = mode->hsync_end + 1;
-+ if (mode->vsync_end > mode->vtotal)
-+ mode->vtotal = mode->vsync_end + 1;
-+
- drm_mode_set_name(mode);
-
- if (pt->misc & DRM_EDID_PT_INTERLACED)
-@@ -451,6 +786,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
+@@ -457,6 +777,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
return modes;
}
@@ -1425,7 +1403,7 @@ index 7f2728b..b54ba63 100644
/**
* add_standard_modes - get std. modes from EDID and add them
-@@ -463,6 +811,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
+@@ -469,6 +802,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
{
struct drm_device *dev = connector->dev;
int i, modes = 0;
@@ -1435,7 +1413,7 @@ index 7f2728b..b54ba63 100644
for (i = 0; i < EDID_STD_TIMINGS; i++) {
struct std_timing *t = &edid->standard_timings[i];
-@@ -472,7 +823,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
+@@ -478,7 +814,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
if (t->hsize == 1 && t->vfreq_aspect == 1)
continue;
@@ -1445,7 +1423,7 @@ index 7f2728b..b54ba63 100644
if (newmode) {
drm_mode_probed_add(connector, newmode);
modes++;
-@@ -496,6 +848,9 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -502,6 +839,9 @@ static int add_detailed_info(struct drm_connector *connector,
{
struct drm_device *dev = connector->dev;
int i, j, modes = 0;
@@ -1455,7 +1433,7 @@ index 7f2728b..b54ba63 100644
for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
struct detailed_timing *timing = &edid->detailed_timings[i];
-@@ -519,13 +874,14 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -525,13 +865,14 @@ static int add_detailed_info(struct drm_connector *connector,
case EDID_DETAIL_MONITOR_CPDATA:
break;
case EDID_DETAIL_STD_MODES:
@@ -1473,7 +1451,7 @@ index 7f2728b..b54ba63 100644
if (newmode) {
drm_mode_probed_add(connector, newmode);
modes++;
-@@ -551,6 +907,124 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -557,6 +898,124 @@ static int add_detailed_info(struct drm_connector *connector,
return modes;
}
@@ -1598,7 +1576,7 @@ index 7f2728b..b54ba63 100644
#define DDC_ADDR 0x50
/**
-@@ -584,7 +1058,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
+@@ -590,7 +1049,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
if (i2c_transfer(adapter, msgs, 2) == 2)
return 0;
@@ -1606,7 +1584,7 @@ index 7f2728b..b54ba63 100644
return -1;
}
EXPORT_SYMBOL(drm_do_probe_ddc_edid);
-@@ -597,8 +1070,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
+@@ -603,8 +1061,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
ret = drm_do_probe_ddc_edid(adapter, buf, len);
if (ret != 0) {
@@ -1615,7 +1593,7 @@ index 7f2728b..b54ba63 100644
goto end;
}
if (!edid_is_valid((struct edid *)buf)) {
-@@ -610,7 +1081,6 @@ end:
+@@ -616,7 +1072,6 @@ end:
return ret;
}
@@ -1623,7 +1601,7 @@ index 7f2728b..b54ba63 100644
/**
* drm_get_edid - get EDID data, if available
* @connector: connector we're probing
-@@ -763,6 +1233,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+@@ -769,6 +1224,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
num_modes += add_established_modes(connector, edid);
num_modes += add_standard_modes(connector, edid);
num_modes += add_detailed_info(connector, edid, quirks);
@@ -1631,7 +1609,7 @@ index 7f2728b..b54ba63 100644
if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
edid_fixup_preferred(connector, quirks);
-@@ -788,3 +1259,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+@@ -794,3 +1250,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
return num_modes;
}
EXPORT_SYMBOL(drm_add_edid_modes);
@@ -4341,7 +4319,7 @@ index c078d99..e8cf18d 100644
.gem_init_object = i915_gem_init_object,
.gem_free_object = i915_gem_free_object,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 5b4f87e..77ed060 100644
+index 88b3eff..e5f20e4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -85,7 +85,6 @@ struct drm_i915_gem_phys_object {
@@ -4465,7 +4443,7 @@ index 5b4f87e..77ed060 100644
extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define IS_I830(dev) ((dev)->pci_device == 0x3577)
-@@ -903,6 +912,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -905,6 +914,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
/* dsparb controlled by hw only */
#define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
@@ -5095,10 +5073,10 @@ index e774a4a..200e398 100644
}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ebc84c..6c89f2f 100644
+index 9431a72..42c1709 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -565,6 +565,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -573,6 +573,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
I915_READ(PORT_HOTPLUG_STAT);
@@ -5127,7 +5105,7 @@ index 7ebc84c..6c89f2f 100644
I915_WRITE(IIR, iir);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 106a1ae..268d272 100644
+index c017fa1..1cd645e 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -55,7 +55,7 @@
@@ -5393,7 +5371,7 @@ index 5ae4c1a..212e227 100644
static int intel_crt_mode_valid(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 8b5af29..a865af5 100644
+index 318ba47..4c28f17 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -38,6 +38,7 @@
@@ -5639,7 +5617,7 @@ index 8b5af29..a865af5 100644
}
static void intel_crtc_prepare (struct drm_crtc *crtc)
-@@ -2079,6 +2138,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
+@@ -2080,6 +2139,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
return size;
}
@@ -5658,7 +5636,7 @@ index 8b5af29..a865af5 100644
static void i965_update_wm(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -2130,7 +2201,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2131,7 +2202,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
cwm = 2;
/* Calc sr entries for one plane configs */
@@ -5668,7 +5646,7 @@ index 8b5af29..a865af5 100644
/* self-refresh has much higher latency */
const static int sr_latency_ns = 6000;
-@@ -2145,8 +2217,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2146,8 +2218,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
srwm = total_size - sr_entries;
if (srwm < 0)
srwm = 1;
@@ -5678,7 +5656,7 @@ index 8b5af29..a865af5 100644
}
DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
-@@ -2220,9 +2291,6 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2221,9 +2292,6 @@ static void intel_update_watermarks(struct drm_device *dev)
unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
int enabled = 0, pixel_size = 0;
@@ -5688,7 +5666,7 @@ index 8b5af29..a865af5 100644
/* Get the clock config from both planes */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
intel_crtc = to_intel_crtc(crtc);
-@@ -2255,7 +2323,9 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2256,7 +2324,9 @@ static void intel_update_watermarks(struct drm_device *dev)
else if (IS_IGD(dev))
igd_disable_cxsr(dev);
@@ -5699,7 +5677,7 @@ index 8b5af29..a865af5 100644
i965_update_wm(dev);
else if (IS_I9XX(dev) || IS_MOBILE(dev))
i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
-@@ -2289,9 +2359,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2290,9 +2360,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
int refclk, num_outputs = 0;
@@ -5712,7 +5690,7 @@ index 8b5af29..a865af5 100644
bool is_crt = false, is_lvds = false, is_tv = false, is_dp = false;
bool is_edp = false;
struct drm_mode_config *mode_config = &dev->mode_config;
-@@ -2374,6 +2444,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2375,6 +2445,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
return -EINVAL;
}
@@ -5727,8 +5705,8 @@ index 8b5af29..a865af5 100644
/* SDVO TV has fixed PLL values depend on its clock range,
this mirrors vbios setting. */
if (is_sdvo && is_tv) {
-@@ -2419,10 +2497,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- link_bw, &m_n);
+@@ -2482,10 +2560,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+ }
}
- if (IS_IGD(dev))
@@ -5747,7 +5725,7 @@ index 8b5af29..a865af5 100644
if (!IS_IGDNG(dev))
dpll = DPLL_VGA_MODE_DIS;
-@@ -2451,6 +2536,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2514,6 +2599,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
/* also FPA1 */
if (IS_IGDNG(dev))
dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
@@ -5756,7 +5734,7 @@ index 8b5af29..a865af5 100644
}
switch (clock.p2) {
case 5:
-@@ -2598,6 +2685,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2661,6 +2748,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
udelay(150);
}
@@ -5779,7 +5757,7 @@ index 8b5af29..a865af5 100644
I915_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
((adjusted_mode->crtc_htotal - 1) << 16));
I915_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-@@ -2800,10 +2903,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
+@@ -2863,10 +2966,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -5796,7 +5774,7 @@ index 8b5af29..a865af5 100644
if (x < 0) {
temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
x = -x;
-@@ -2834,6 +2943,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
+@@ -2897,6 +3006,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
intel_crtc->lut_b[regno] = blue >> 8;
}
@@ -5813,7 +5791,7 @@ index 8b5af29..a865af5 100644
static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
u16 *blue, uint32_t size)
{
-@@ -3101,12 +3220,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
+@@ -3164,12 +3283,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
return mode;
}
@@ -6135,7 +6113,7 @@ index 8b5af29..a865af5 100644
drm_crtc_cleanup(crtc);
kfree(intel_crtc);
}
-@@ -3118,6 +3544,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
+@@ -3181,6 +3607,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
.mode_set_base = intel_pipe_set_base,
.prepare = intel_crtc_prepare,
.commit = intel_crtc_commit,
@@ -6143,7 +6121,7 @@ index 8b5af29..a865af5 100644
};
static const struct drm_crtc_funcs intel_crtc_funcs = {
-@@ -3153,15 +3580,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3216,15 +3643,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
@@ -6162,7 +6140,7 @@ index 8b5af29..a865af5 100644
}
int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-@@ -3169,30 +3591,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
+@@ -3232,30 +3654,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
{
drm_i915_private_t *dev_priv = dev->dev_private;
struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;
@@ -6201,7 +6179,7 @@ index 8b5af29..a865af5 100644
}
struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
-@@ -3393,8 +3811,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
+@@ -3456,8 +3874,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
.fb_changed = intelfb_probe,
};
@@ -6258,7 +6236,7 @@ index 8b5af29..a865af5 100644
int num_pipe;
int i;
-@@ -3429,15 +3895,47 @@ void intel_modeset_init(struct drm_device *dev)
+@@ -3492,15 +3958,47 @@ void intel_modeset_init(struct drm_device *dev)
DRM_DEBUG("%d display pipe%s available.\n",
num_pipe, num_pipe > 1 ? "s" : "");
@@ -6341,7 +6319,7 @@ index 26a6227..dcfc53c 100644
extern int intel_framebuffer_create(struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd,
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
-index 1d30802..2b0fe54 100644
+index 75a9b83..2b0fe54 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -39,339 +39,36 @@
@@ -6426,7 +6404,7 @@ index 1d30802..2b0fe54 100644
- struct drm_framebuffer *fb = &intel_fb->base;
- int depth;
-
-- if (var->pixclock == -1 || !var->pixclock)
+- if (var->pixclock != 0)
- return -EINVAL;
-
- /* Need to resize the fb object !!! */
@@ -6517,7 +6495,7 @@ index 1d30802..2b0fe54 100644
-
- DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
-
-- if (var->pixclock != -1) {
+- if (var->pixclock != 0) {
-
- DRM_ERROR("PIXEL CLOCK SET\n");
- return -EINVAL;
@@ -6941,7 +6919,7 @@ index 1d30802..2b0fe54 100644
- par->crtc_count = 1;
-
- if (new_fb) {
-- info->var.pixclock = -1;
+- info->var.pixclock = 0;
- if (register_framebuffer(info) < 0)
- return -EINVAL;
- } else
@@ -7095,7 +7073,7 @@ index 1d30802..2b0fe54 100644
- par->crtc_count = crtc_count;
-
- if (new_fb) {
-- info->var.pixclock = -1;
+- info->var.pixclock = 0;
- if (register_framebuffer(info) < 0)
- return -EINVAL;
- } else
@@ -64808,7 +64786,7 @@ index 0000000..797972e
+};
+#endif
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
-index ec383ed..cb2f16a 100644
+index f1d6d3d..fc5101a 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -28,15 +28,7 @@
@@ -64910,7 +64888,7 @@ index ec383ed..cb2f16a 100644
- struct drm_framebuffer *fb = &rfb->base;
- int depth;
-
-- if (var->pixclock == -1 || !var->pixclock) {
+- if (var->pixclock != 0) {
- return -EINVAL;
- }
- /* Need to resize the fb object !!! */
@@ -65024,7 +65002,7 @@ index ec383ed..cb2f16a 100644
- int ret;
- int i;
-
-- if (var->pixclock != -1) {
+- if (var->pixclock != 0) {
- DRM_ERROR("PIXEL CLCOK SET\n");
- return -EINVAL;
- }
@@ -65457,7 +65435,7 @@ index ec383ed..cb2f16a 100644
fb->fbdev = info;
rfbdev->rfb = rfb;
rfbdev->rdev = rdev;
-@@ -726,148 +303,33 @@ out:
+@@ -726,148 +303,34 @@ out:
return ret;
}
@@ -65567,7 +65545,7 @@ index ec383ed..cb2f16a 100644
- rfbdev->crtc_count = crtc_count;
-
- if (new_fb) {
-- info->var.pixclock = -1;
+- info->var.pixclock = 0;
- if (register_framebuffer(info) < 0)
- return -EINVAL;
- } else {
@@ -65584,7 +65562,7 @@ index ec383ed..cb2f16a 100644
- panic_mode = *modeset;
- atomic_notifier_chain_register(&panic_notifier_list, &paniced);
- printk(KERN_INFO "registered panic notifier\n");
--
+
return 0;
}
@@ -65622,7 +65600,7 @@ index ec383ed..cb2f16a 100644
int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
{
-@@ -880,16 +342,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+@@ -880,16 +343,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
}
info = fb->fbdev;
if (info) {
@@ -95950,7 +95928,7 @@ index ae304cc..1f90841 100644
struct drm_mode_get_connector {
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
-index 8535084..923361b 100644
+index 3f6e545..e6f3b12 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -80,7 +80,7 @@
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1953
retrieving revision 1.1954
diff -u -p -r1.1953 -r1.1954
--- kernel.spec 11 Dec 2009 00:24:05 -0000 1.1953
+++ kernel.spec 11 Dec 2009 01:31:47 -0000 1.1954
@@ -793,8 +793,6 @@ Patch14101: improve-resource-counter-sca
Patch14420: perf-events-fix-swevent-hrtimer-sampling.patch
Patch14421: perf-events-dont-generate-events-for-the-idle-task.patch
-Patch14430: crypto-via-padlock-fix-nano-aes.patch
-
# tg3 fixes (#527209)
Patch14451: tg3-01-delay-mdio-bus-init-until-fw-finishes.patch
Patch14452: tg3-02-fix-tso-test-against-wrong-flags-var.patch
@@ -803,15 +801,8 @@ Patch14454: tg3-04-prevent-tx-bd-corrupt
Patch14455: tg3-05-assign-flags-to-fixes-in-start_xmit_dma_bug.patch
Patch14456: tg3-06-fix-5906-transmit-hangs.patch
-Patch14460: highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-Patch14461: highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
-Patch14462: highmem-fix-arm-powerpc-kmap_types.patch
-
Patch14463: dlm-fix-connection-close-handling.patch
-# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
-Patch14464: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
# rhbz#544471
Patch14465: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
@@ -1492,9 +1483,6 @@ ApplyPatch improve-resource-counter-scal
ApplyPatch perf-events-fix-swevent-hrtimer-sampling.patch
ApplyPatch perf-events-dont-generate-events-for-the-idle-task.patch
-# Fix oops in padlock
-ApplyPatch crypto-via-padlock-fix-nano-aes.patch
-
# tg3 fixes (#527209)
ApplyPatch tg3-01-delay-mdio-bus-init-until-fw-finishes.patch
ApplyPatch tg3-02-fix-tso-test-against-wrong-flags-var.patch
@@ -1512,15 +1500,8 @@ ApplyPatch sched-retune-scheduler-latenc
# fix wakeup latency
ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
-ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
-ApplyPatch highmem-fix-arm-powerpc-kmap_types.patch
-
ApplyPatch dlm-fix-connection-close-handling.patch
-# rhbz#544144
-ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
# rhbz#544471
ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
@@ -2173,6 +2154,12 @@ fi
# and build.
%changelog
+* Thu Dec 10 2009 Kyle McMartin <kyle at redhat.com>
+- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: upstream.
+- nuke highmem patches now in stable.
+- crypto-via-padlock-fix-nano-aes.patch: upstream.
+- fix up drm-next-$sha.patch
+
* Wed Dec 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-167
- Linux 2.6.31.7
- NOTE: drm patch still needs fixing.
--- crypto-via-padlock-fix-nano-aes.patch DELETED ---
--- highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch DELETED ---
--- highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch DELETED ---
--- highmem-fix-arm-powerpc-kmap_types.patch DELETED ---
--- ipv4-fix-null-ptr-deref-in-ip_fragment.patch DELETED ---
More information about the fedora-extras-commits
mailing list