rpms/kernel/devel patch-2.6.28-rc9-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.970, 1.971 drm-next.patch, 1.4, 1.5 kernel.spec, 1.1175, 1.1176 linux-2.6-pciehp-update.patch, 1.6, 1.7 sources, 1.932, 1.933 upstream, 1.844, 1.845

Sat Dec 20 21:52:21 UTC 2008

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12598

Modified Files:
	.cvsignore drm-next.patch kernel.spec 
	linux-2.6-pciehp-update.patch sources upstream 
Added Files:
	patch-2.6.28-rc9-git1.bz2.sign 
Log Message:
* Sat Dec 20 2008 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.28-rc9-git1
  Rebased patches:
   linux-2.6-pciehp-update.patch
   drm-next.patch

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

iD8DBQBJTDZeyGugalF9Dw4RAscvAJ4+rhij85diOTZ5gifKEyOZz896FgCffjRh
OPWZXC2bt/PTvMCTqx5K6/c=
=qcLA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.970
retrieving revision 1.971
diff -u -r1.970 -r1.971
--- .cvsignore	19 Dec 2008 04:39:49 -0000	1.970
+++ .cvsignore	20 Dec 2008 21:51:49 -0000	1.971
@@ -5,3 +5,4 @@
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.28-rc9.bz2
+patch-2.6.28-rc9-git1.bz2

drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drm-next.patch	19 Dec 2008 06:21:57 -0000	1.4
+++ drm-next.patch	20 Dec 2008 21:51:49 -0000	1.5
@@ -8692,7 +8692,7 @@
 +	.destroy = tfp410_destroy,
 +};
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 553dd4b..0dee776 100644
+index afa8a12..37a9d08 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
 @@ -28,6 +28,8 @@
@@ -8880,15 +8880,6 @@
  	drm_i915_cmdbuffer_t *cmdbuf = data;
  	int ret;
  
-@@ -717,7 +721,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
- 		value = dev->pci_device;
- 		break;
- 	case I915_PARAM_HAS_GEM:
--		value = 1;
-+		value = dev_priv->has_gem;
- 		break;
- 	default:
- 		DRM_ERROR("Unknown parameter %d\n", param->param);
 @@ -774,6 +778,11 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
  		return -EINVAL;
  	}
@@ -9140,9 +9131,9 @@
 +	dev_priv->has_gem = 1;
 +#endif
  
- 	i915_gem_load(dev);
- 
-@@ -836,7 +1072,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ #ifdef CONFIG_HIGHMEM64G
+ 	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
+@@ -844,7 +1080,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  	if (!I915_NEED_GFX_HWS(dev)) {
  		ret = i915_init_phys_hws(dev);
  		if (ret != 0)
@@ -9151,7 +9142,7 @@
  	}
  
  	/* On the 945G/GM, the chipset reports the MSI capability on the
-@@ -856,6 +1092,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -864,6 +1100,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  	intel_opregion_init(dev);
  
  	spin_lock_init(&dev_priv->user_irq_lock);
@@ -9159,7 +9150,7 @@
  
  	ret = drm_vblank_init(dev, I915_NUM_PIPE);
  
-@@ -864,6 +1101,20 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -872,6 +1109,20 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  		return ret;
  	}
  
@@ -9180,7 +9171,7 @@
  	return ret;
  }
  
-@@ -871,16 +1122,29 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -879,16 +1130,29 @@ int i915_driver_unload(struct drm_device *dev)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
  
@@ -9212,7 +9203,7 @@
  	drm_free(dev->dev_private, sizeof(drm_i915_private_t),
  		 DRM_MEM_DRIVER);
  
-@@ -906,12 +1170,26 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
+@@ -914,12 +1178,26 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
  	return 0;
  }
  
@@ -9240,7 +9231,7 @@
  
  	i915_gem_lastclose(dev);
  
-@@ -924,7 +1202,8 @@ void i915_driver_lastclose(struct drm_device * dev)
+@@ -932,7 +1210,8 @@ void i915_driver_lastclose(struct drm_device * dev)
  void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -9250,7 +9241,7 @@
  }
  
  void i915_driver_postclose(struct drm_device *dev, struct drm_file *file_priv)
-@@ -964,6 +1243,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
+@@ -972,6 +1251,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_I915_GEM_PREAD, i915_gem_pread_ioctl, 0),
  	DRM_IOCTL_DEF(DRM_I915_GEM_PWRITE, i915_gem_pwrite_ioctl, 0),
  	DRM_IOCTL_DEF(DRM_I915_GEM_MMAP, i915_gem_mmap_ioctl, 0),
@@ -9348,7 +9339,7 @@
  }
  
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index adc972c..cc26605 100644
+index b3cc473..cc26605 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -31,6 +31,7 @@
@@ -9359,7 +9350,7 @@
  #include <linux/io-mapping.h>
  
  /* General customization:
-@@ -103,13 +104,23 @@ struct intel_opregion {
+@@ -103,15 +104,23 @@ struct intel_opregion {
  	int enabled;
  };
  
@@ -9376,8 +9367,8 @@
  typedef struct drm_i915_private {
  	struct drm_device *dev;
  
-+	int has_gem;
-+
+ 	int has_gem;
+ 
  	void __iomem *regs;
 -	drm_local_map_t *sarea;
  
@@ -9385,7 +9376,7 @@
  	drm_i915_ring_buffer_t ring;
  
  	drm_dma_handle_t *status_page_dmah;
-@@ -142,8 +153,30 @@ typedef struct drm_i915_private {
+@@ -144,8 +153,30 @@ typedef struct drm_i915_private {
  	unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;
  	int vblank_pipe;
  
@@ -9416,7 +9407,7 @@
  	/* Register state */
  	u8 saveLBB;
  	u32 saveDSPACNTR;
-@@ -362,6 +395,21 @@ struct drm_i915_gem_object {
+@@ -364,6 +395,21 @@ struct drm_i915_gem_object {
  	 * This is the same as gtt_space->start
  	 */
  	uint32_t gtt_offset;
@@ -9438,7 +9429,7 @@
  
  	/** Boolean whether this object has a valid gtt offset. */
  	int gtt_bound;
-@@ -374,6 +422,7 @@ struct drm_i915_gem_object {
+@@ -376,6 +422,7 @@ struct drm_i915_gem_object {
  
  	/** Current tiling mode for the object. */
  	uint32_t tiling_mode;
@@ -9446,7 +9437,7 @@
  
  	/** AGP mapping type (AGP_USER_MEMORY or AGP_USER_CACHED_MEMORY */
  	uint32_t agp_type;
-@@ -383,6 +432,10 @@ struct drm_i915_gem_object {
+@@ -385,6 +432,10 @@ struct drm_i915_gem_object {
  	 * flags which individual pages are valid.
  	 */
  	uint8_t *page_cpu_valid;
@@ -9457,7 +9448,7 @@
  };
  
  /**
-@@ -412,8 +465,19 @@ struct drm_i915_file_private {
+@@ -414,8 +465,19 @@ struct drm_i915_file_private {
  	} mm;
  };
  
@@ -9477,7 +9468,7 @@
  
  				/* i915_dma.c */
  extern void i915_kernel_lost_context(struct drm_device * dev);
-@@ -439,6 +503,7 @@ extern int i915_irq_wait(struct drm_device *dev, void *data,
+@@ -441,6 +503,7 @@ extern int i915_irq_wait(struct drm_device *dev, void *data,
  			 struct drm_file *file_priv);
  void i915_user_irq_get(struct drm_device *dev);
  void i915_user_irq_put(struct drm_device *dev);
@@ -9485,7 +9476,7 @@
  
  extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
  extern void i915_driver_irq_preinstall(struct drm_device * dev);
-@@ -485,6 +550,8 @@ int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
+@@ -487,6 +550,8 @@ int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
  			  struct drm_file *file_priv);
  int i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
  			struct drm_file *file_priv);
@@ -9494,7 +9485,7 @@
  int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
  			      struct drm_file *file_priv);
  int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
-@@ -521,6 +588,16 @@ uint32_t i915_get_gem_seqno(struct drm_device *dev);
+@@ -523,6 +588,16 @@ uint32_t i915_get_gem_seqno(struct drm_device *dev);
  void i915_gem_retire_requests(struct drm_device *dev);
  void i915_gem_retire_work_handler(struct work_struct *work);
  void i915_gem_clflush_object(struct drm_gem_object *obj);
@@ -9511,7 +9502,7 @@
  
  /* i915_gem_tiling.c */
  void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);
-@@ -559,6 +636,10 @@ static inline void opregion_asle_intr(struct drm_device *dev) { return; }
+@@ -561,6 +636,10 @@ static inline void opregion_asle_intr(struct drm_device *dev) { return; }
  static inline void opregion_enable_asle(struct drm_device *dev) { return; }
  #endif
  
@@ -9522,7 +9513,7 @@
  /**
   * Lock test for when it's just for synchronization of ring access.
   *
-@@ -576,6 +657,13 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
+@@ -578,6 +657,13 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
  #define I915_WRITE16(reg, val)	writel(val, dev_priv->regs + (reg))
  #define I915_READ8(reg)		readb(dev_priv->regs + (reg))
  #define I915_WRITE8(reg, val)	writeb(val, dev_priv->regs + (reg))
@@ -9536,7 +9527,7 @@
  
  #define I915_VERBOSE 0
  
-@@ -658,7 +746,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -660,7 +746,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  
  #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
  		     (dev)->pci_device == 0x2E12 || \
@@ -9547,7 +9538,7 @@
  #define IS_G33(dev)    ((dev)->pci_device == 0x29C2 ||	\
  			(dev)->pci_device == 0x29B2 ||	\
 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index ad672d8..c4ccaf3 100644
+index 24fe8c1..c4ccaf3 100644
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
 @@ -30,6 +30,7 @@
@@ -10182,23 +10173,7 @@
  
  	drm_gem_object_unreference(obj);
  	mutex_unlock(&dev->struct_mutex);
-@@ -2309,7 +2795,14 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
- 	}
- 
- 	obj_priv = obj->driver_private;
--	args->busy = obj_priv->active;
-+	/* Don't count being on the flushing list against the object being
-+	 * done.  Otherwise, a buffer left on the flushing list but not getting
-+	 * flushed (because nobody's flushing that domain) won't ever return
-+	 * unbusy and get reused by libdrm's bo cache.  The other expected
-+	 * consumer of this interface, OpenGL's occlusion queries, also specs
-+	 * that the objects get unbusy "eventually" without any interference.
-+	 */
-+	args->busy = obj_priv->active && obj_priv->last_rendering_seqno != 0;
- 
- 	drm_gem_object_unreference(obj);
- 	mutex_unlock(&dev->struct_mutex);
-@@ -2344,12 +2837,18 @@ int i915_gem_init_object(struct drm_gem_object *obj)
+@@ -2351,12 +2837,18 @@ int i915_gem_init_object(struct drm_gem_object *obj)
  
  	obj->driver_private = obj_priv;
  	obj_priv->obj = obj;
@@ -10217,7 +10192,7 @@
  	struct drm_i915_gem_object *obj_priv = obj->driver_private;
  
  	while (obj_priv->pin_count > 0)
-@@ -2357,6 +2856,20 @@ void i915_gem_free_object(struct drm_gem_object *obj)
+@@ -2364,6 +2856,20 @@ void i915_gem_free_object(struct drm_gem_object *obj)
  
  	i915_gem_object_unbind(obj);
  
@@ -10238,7 +10213,7 @@
  	drm_free(obj_priv->page_cpu_valid, 1, DRM_MEM_DRIVER);
  	drm_free(obj->driver_private, 1, DRM_MEM_DRIVER);
  }
-@@ -2425,8 +2938,7 @@ i915_gem_idle(struct drm_device *dev)
+@@ -2432,8 +2938,7 @@ i915_gem_idle(struct drm_device *dev)
  	 */
  	i915_gem_flush(dev, ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT),
  		       ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT));
@@ -10248,7 +10223,7 @@
  
  	if (seqno == 0) {
  		mutex_unlock(&dev->struct_mutex);
-@@ -2553,12 +3065,13 @@ i915_gem_init_hws(struct drm_device *dev)
+@@ -2560,12 +3065,13 @@ i915_gem_init_hws(struct drm_device *dev)
  	return 0;
  }
  
@@ -10263,7 +10238,7 @@
  	int ret;
  	u32 head;
  
-@@ -2580,24 +3093,24 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
+@@ -2587,24 +3093,24 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
  	}
  
  	/* Set up the kernel mapping for the ring. */
@@ -10299,7 +10274,7 @@
  
  	/* Stop the ring if it's running. */
  	I915_WRITE(PRB0_CTL, 0);
-@@ -2645,12 +3158,20 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
+@@ -2652,12 +3158,20 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
  	}
  
  	/* Update our cache of the ring state */
@@ -10322,7 +10297,7 @@
  i915_gem_cleanup_ringbuffer(struct drm_device *dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
-@@ -2688,6 +3209,9 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
+@@ -2695,6 +3209,9 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	int ret;
  
@@ -10332,7 +10307,7 @@
  	if (dev_priv->mm.wedged) {
  		DRM_ERROR("Reenabling wedged hardware, good luck\n");
  		dev_priv->mm.wedged = 0;
-@@ -2721,6 +3245,9 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
+@@ -2728,6 +3245,9 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	int ret;
  
@@ -10342,7 +10317,7 @@
  	ret = i915_gem_idle(dev);
  	drm_irq_uninstall(dev);
  
-@@ -2751,5 +3278,13 @@ i915_gem_load(struct drm_device *dev)
+@@ -2758,5 +3278,13 @@ i915_gem_load(struct drm_device *dev)
  			  i915_gem_retire_work_handler);
  	dev_priv->mm.next_gem_seqno = 1;
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1175
retrieving revision 1.1176
diff -u -r1.1175 -r1.1176
--- kernel.spec	19 Dec 2008 21:06:33 -0000	1.1175
+++ kernel.spec	20 Dec 2008 21:51:49 -0000	1.1176
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 9
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1768,6 +1768,12 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Dec 20 2008 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.28-rc9-git1
+  Rebased patches:
+   linux-2.6-pciehp-update.patch
+   drm-next.patch
+
 * Fri Dec 19 2008 Adam Jackson <ajax at redhat.com>
 - config-generic: FB_VIRTUAL=m
 

linux-2.6-pciehp-update.patch:

Index: linux-2.6-pciehp-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-pciehp-update.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-pciehp-update.patch	8 Dec 2008 16:38:49 -0000	1.6
+++ linux-2.6-pciehp-update.patch	20 Dec 2008 21:51:50 -0000	1.7
@@ -14,7 +14,7 @@
  }
  
 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
-index 4b23bc3..c172e31 100644
+index 39cf248..ab6b016 100644
 --- a/drivers/pci/hotplug/pciehp_core.c
 +++ b/drivers/pci/hotplug/pciehp_core.c
 @@ -41,6 +41,7 @@ int pciehp_debug;
@@ -84,22 +84,16 @@
  		goto err_out_none;
  
  	ctrl = pcie_init(dev);
-@@ -435,11 +446,9 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
+@@ -436,7 +447,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
  	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
- 
- 	t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
--	if (value && pciehp_force) {
--		rc = pciehp_enable_slot(t_slot);
--		if (rc)	/* -ENODEV: shouldn't happen, but deal with it */
--			value = 0;
--	}
-+	if (value && (pciehp_force || pciehp_passive))
-+		pciehp_enable_slot(t_slot);
-+
- 	if ((POWER_CTRL(ctrl)) && !value) {
- 		rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
- 		if (rc)
-@@ -473,8 +482,11 @@ static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
+ 	t_slot->hpc_ops->get_adapter_status(t_slot, &value);
+ 	if (value) {
+-		if (pciehp_force)
++		if (pciehp_force || pciehp_passive)
+ 			pciehp_enable_slot(t_slot);
+ 	} else {
+ 		/* Power off slot if not occupied */
+@@ -474,8 +485,11 @@ static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
  
  static int pciehp_resume (struct pcie_device *dev)
  {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -r1.932 -r1.933
--- sources	19 Dec 2008 04:39:49 -0000	1.932
+++ sources	20 Dec 2008 21:51:50 -0000	1.933
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 fb92ccb6277e649f2adadfba2e023120  patch-2.6.28-rc9.bz2
+4e7417a088c76fa9157434660dfc8f24  patch-2.6.28-rc9-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- upstream	19 Dec 2008 04:39:49 -0000	1.844
+++ upstream	20 Dec 2008 21:51:50 -0000	1.845
@@ -1,2 +1,3 @@
 linux-2.6.27.tar.bz2
 patch-2.6.28-rc9.bz2
+patch-2.6.28-rc9-git1.bz2


