rpms/kernel/devel patch-2.6.25-rc7-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.795, 1.796 kernel.spec, 1.560, 1.561 linux-2.6-drm-git-mm.patch, 1.3, 1.4 linux-2.6-drm-i915-modeset.patch, 1.6, 1.7 sources, 1.754, 1.755 upstream, 1.675, 1.676 patch-2.6.25-rc7-git5.bz2.sign, 1.1, NONE
Kyle McMartin (kyle)
fedora-extras-commits at redhat.com
Mon Mar 31 16:58:37 UTC 2008
- Previous message (by thread): rpms/kiconedit/devel .cvsignore, 1.3, 1.4 kiconedit.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message (by thread): rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.72, 1.73 gvm-nomedia.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8157
Modified Files:
.cvsignore kernel.spec linux-2.6-drm-git-mm.patch
linux-2.6-drm-i915-modeset.patch sources upstream
Added Files:
patch-2.6.25-rc7-git6.bz2.sign
Removed Files:
patch-2.6.25-rc7-git5.bz2.sign
Log Message:
* Mon Mar 31 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25-rc7-git6
--- NEW FILE patch-2.6.25-rc7-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBH8I0iyGugalF9Dw4RAhRZAJwOpd7iZ2lz/ejNy9G+Vjza+8UT6wCfeMKn
AXzSXS0xVpH9AVRkRDMrDRE=
=L9G2
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- .cvsignore 29 Mar 2008 16:55:41 -0000 1.795
+++ .cvsignore 31 Mar 2008 16:57:47 -0000 1.796
@@ -5,5 +5,4 @@
kernel-2.6.24
linux-2.6.24.tar.bz2
patch-2.6.25-rc7.bz2
-patch-2.6.25-rc6-git8.bz2
-patch-2.6.25-rc7-git5.bz2
+patch-2.6.25-rc7-git6.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- kernel.spec 31 Mar 2008 01:31:26 -0000 1.560
+++ kernel.spec 31 Mar 2008 16:57:48 -0000 1.561
@@ -45,7 +45,7 @@
# The rc snapshot level
%define rcrev 7
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1737,6 +1737,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Mon Mar 31 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25-rc7-git6
+
* Mon Mar 31 2008 Dave Airlie <airlied at redhat.com>
- add fix for radeon oops (#439656)
linux-2.6-drm-git-mm.patch:
Index: linux-2.6-drm-git-mm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-git-mm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-drm-git-mm.patch 20 Mar 2008 06:06:41 -0000 1.3
+++ linux-2.6-drm-git-mm.patch 31 Mar 2008 16:57:48 -0000 1.4
@@ -619,6 +619,7 @@
Signed-off-by: Thomas Hellstrom <thomas -at- tungstengraphics.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
+
diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
index 1283ded..85c4f9e 100644
--- a/drivers/char/drm/Makefile
@@ -642,7 +643,7 @@
sis-objs := sis_drv.o sis_mm.o
savage-objs := savage_drv.o savage_bci.o savage_state.o
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
-index e5a0e97..61d98e3 100644
+index 141f4df..c52ba6e 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -43,7 +43,6 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
@@ -653,7 +654,7 @@
return 0;
}
-@@ -150,7 +149,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -151,7 +150,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
page_base = (u32) entry->busaddr[i];
for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
@@ -662,7 +663,7 @@
case DRM_ATI_GART_IGP:
*pci_gart = cpu_to_le32((page_base) | 0xc);
break;
-@@ -175,7 +174,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -182,7 +181,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
mb();
#endif
@@ -7660,10 +7661,10 @@
*
* \param buf output buffer.
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
-index 26d8f67..56c6eaa 100644
+index b2b0f3d..3b31040 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
-@@ -179,7 +179,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
+@@ -188,7 +188,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
return 0;
@@ -8200,7 +8201,7 @@
+}
+EXPORT_SYMBOL(drm_ttm_bind);
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
-index 3d65c4d..6184b98 100644
+index 945df72..77576e3 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -40,6 +40,10 @@
@@ -8214,7 +8215,7 @@
static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
{
-@@ -214,7 +218,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
+@@ -225,7 +229,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
found_maps++;
if (pt->vma == vma) {
list_del(&pt->head);
@@ -8223,7 +8224,7 @@
}
}
-@@ -256,6 +260,9 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
+@@ -267,6 +271,9 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
dmah.size = map->size;
__drm_pci_free(dev, &dmah);
break;
@@ -8233,7 +8234,7 @@
}
drm_free(map, sizeof(*map), DRM_MEM_MAPS);
}
-@@ -398,7 +405,7 @@ static void drm_vm_open_locked(struct vm_area_struct *vma)
+@@ -409,7 +416,7 @@ static void drm_vm_open_locked(struct vm_area_struct *vma)
vma->vm_start, vma->vm_end - vma->vm_start);
atomic_inc(&dev->vma_count);
@@ -8242,7 +8243,7 @@
if (vma_entry) {
vma_entry->vma = vma;
vma_entry->pid = current->pid;
-@@ -438,7 +445,7 @@ static void drm_vm_close(struct vm_area_struct *vma)
+@@ -449,7 +456,7 @@ static void drm_vm_close(struct vm_area_struct *vma)
list_for_each_entry_safe(pt, temp, &dev->vmalist, head) {
if (pt->vma == vma) {
list_del(&pt->head);
@@ -8251,7 +8252,7 @@
break;
}
}
-@@ -637,6 +644,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
+@@ -647,6 +654,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
vma->vm_private_data = (void *)map;
vma->vm_flags |= VM_RESERVED;
break;
@@ -8260,7 +8261,7 @@
default:
return -EINVAL; /* This should never happen. */
}
-@@ -661,3 +670,186 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
+@@ -671,3 +680,186 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
return ret;
}
EXPORT_SYMBOL(drm_mmap);
@@ -8649,7 +8650,7 @@
+ DRM_MEMORYBARRIER();
+}
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
-index e9d6663..d2b7d3f 100644
+index a043bb1..eed33f7 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -36,7 +36,7 @@
@@ -9018,9 +9019,8 @@
- return 0;
+ dev_priv->sarea_priv->pf_current_page &= ~(0x3 << shift);
+ dev_priv->sarea_priv->pf_current_page |= next_page << shift;
- }
-
--static int i915_quiescent(struct drm_device * dev)
++}
++
+void i915_dispatch_flip(struct drm_device *dev, int planes, int sync)
+{
+ drm_i915_private_t *dev_priv = dev->dev_private;
@@ -9039,8 +9039,9 @@
+ i915_emit_breadcrumb(dev);
+ if (unlikely(!sync && ((dev_priv->counter & 0xFF) == 0)))
+ drm_fence_flush_old(dev, 0, dev_priv->counter);
-+}
-+
+ }
+
+-static int i915_quiescent(struct drm_device * dev)
+static int i915_quiescent(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -9477,7 +9478,7 @@
+ uint32_t fence_flags,
+ struct drm_fence_arg *fence_arg,
+ struct drm_fence_object **fence_p)
- {
++{
+ struct drm_device *dev = file_priv->head->dev;
+ int ret;
+ struct drm_fence_object *fence;
@@ -9657,7 +9658,7 @@
+}
+
+static int i915_flip_bufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
-+{
+ {
+ drm_i915_flip_t *param = data;
+
DRM_DEBUG("%s\n", __FUNCTION__);
@@ -9752,7 +9753,7 @@
static int i915_set_status_page(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
-@@ -800,17 +1582,33 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -800,20 +1582,35 @@ int i915_driver_unload(struct drm_device *dev)
return 0;
}
@@ -9761,6 +9762,9 @@
{
drm_i915_private_t *dev_priv = dev->dev_private;
+ if (!dev_priv)
+ return;
+-
+ if (drm_getsarea(dev) && dev_priv->sarea_priv)
+ i915_do_cleanup_pageflip(dev);
if (dev_priv->agp_heap)
@@ -9788,7 +9792,7 @@
{
drm_i915_private_t *dev_priv = dev->dev_private;
i915_mem_release(dev, file_priv, dev_priv->agp_heap);
-@@ -833,7 +1631,9 @@ struct drm_ioctl_desc i915_ioctls[] = {
+@@ -836,7 +1633,9 @@ struct drm_ioctl_desc i915_ioctls[] = {
DRM_IOCTL_DEF(DRM_I915_SET_VBLANK_PIPE, i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY ),
DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE, i915_vblank_pipe_get, DRM_AUTH ),
DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),
@@ -9798,7 +9802,7 @@
};
int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
-@@ -849,7 +1649,13 @@ int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
+@@ -852,7 +1651,13 @@ int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
* \returns
* A value of 1 is always retured to indictate every i9x5 is AGP.
*/
linux-2.6-drm-i915-modeset.patch:
Index: linux-2.6-drm-i915-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-i915-modeset.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-drm-i915-modeset.patch 20 Mar 2008 06:06:41 -0000 1.6
+++ linux-2.6-drm-i915-modeset.patch 31 Mar 2008 16:57:48 -0000 1.7
@@ -7848,7 +7848,7 @@
drm_i915_hws_addr_t *hws = data;
if (!I915_NEED_GFX_HWS(dev))
-@@ -1538,82 +1556,6 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
+@@ -1540,84 +1556,6 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
return 0;
}
@@ -7900,6 +7900,8 @@
-{
- drm_i915_private_t *dev_priv = dev->dev_private;
-
+- if (!dev_priv)
+- return;
- if (drm_getsarea(dev) && dev_priv->sarea_priv)
- i915_do_cleanup_pageflip(dev);
- if (dev_priv->agp_heap)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -r1.754 -r1.755
--- sources 29 Mar 2008 16:55:41 -0000 1.754
+++ sources 31 Mar 2008 16:57:48 -0000 1.755
@@ -1,3 +1,3 @@
3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2
942182dbe41b74c95bfa46fcba5ca8ec patch-2.6.25-rc7.bz2
-a34fded988d103e5eff414f4f54dfbbf patch-2.6.25-rc7-git5.bz2
+0c878963c9eecb8d841480414f12aaa8 patch-2.6.25-rc7-git6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -r1.675 -r1.676
--- upstream 29 Mar 2008 16:55:41 -0000 1.675
+++ upstream 31 Mar 2008 16:57:48 -0000 1.676
@@ -1,3 +1,3 @@
linux-2.6.24.tar.bz2
patch-2.6.25-rc7.bz2
-patch-2.6.25-rc7-git5.bz2
+patch-2.6.25-rc7-git6.bz2
--- patch-2.6.25-rc7-git5.bz2.sign DELETED ---
- Previous message (by thread): rpms/kiconedit/devel .cvsignore, 1.3, 1.4 kiconedit.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message (by thread): rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.72, 1.73 gvm-nomedia.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list