rpms/kernel/devel drm-modesetting-radeon.patch, 1.14, 1.15 kernel.spec, 1.908, 1.909

Thu Aug 28 07:18:48 UTC 2008

Author: airlied

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

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com>
- rebase modesetting patches - add DRI2 for intel patches from krh
- no intel modesetting yet didn't have time


drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.14 -r 1.15 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15

--- drm-modesetting-radeon.patch	27 Aug 2008 05:53:03 -0000	1.14
+++ drm-modesetting-radeon.patch	28 Aug 2008 07:18:47 -0000	1.15
@@ -1,28 +1,126 @@
-commit 9d3a0f1a7aee4fa9e5083fe544c03ab3e3060736
+commit 031d3afcf12056f4e66e7ab57e84fea91f8e8ef9
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Wed Aug 20 11:26:11 2008 -0400
+
+    drm: don't set up a dummy sarea page.
+    
+    With the default lock in place, we don't need this hack.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit 1af4c1e5e807493e3114143b12c980d4ba307075
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Wed Aug 20 11:24:13 2008 -0400
+
+    drm: Set up a kernel side hw_lock, so userspace isn't required to do so.
+    
+    DRI2 doesn't use a user space lock, so don't require one to be set up.
+    Old DRI can still provide a lock containing map as before, which will
+    override the default kernel-side lock.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit 6a4538eb2aeb2df7d4f6bbf0e64da04578e378df
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Wed Aug 20 11:20:13 2008 -0400
+
+    i915: Make use of sarea_priv conditional.
+    
+    We fail ioctls that depend on the sarea_priv with EINVAL.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit 340019e6976088cadd59a6acad98560f46cfe35c
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Wed Aug 20 11:08:52 2008 -0400
+
+    i915: Add chip set ID param.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit f28df7639437fdf2bfede57d415a2e6f1afb9542
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Wed Aug 20 11:04:27 2008 -0400
+
+    i915 gem: install and uninstall irq handler in entervt and leavevt ioctls.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit 1036ef1a8412b0395fb7bd87127820f97cf7b2ed
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Tue Aug 12 22:39:54 2008 -0400
+
+    Separate user space pin count from kernel pin count.
+    
+    Using the same counter allows user space to unpin buffers pinned by
+    the kernel, maliciously or as a bug.  This change tighten the semantics:
+    only the fd through which the buffer was pinned can unpin it and only
+    as many times as it has pinned it.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit b435698b611b839bc787866a91fa354e0f19d189
+Author: Kristian HÃ¸gsberg <krh at redhat.com>
+Date:   Tue Aug 12 22:34:43 2008 -0400
+
+    Fail leave_vt ioctl if there are still pinned buffers.
+    
+    If user space fails to unpin all buffers before calling the leave_vt
+    ioctl, we get a BUG_ON().  Fail the leave_vt ioctl instead.
+    
+    Signed-off-by: Kristian HÃ¸gsberg <krh at redhat.com>
+
+commit 233c72bf97f3efaaa0518883936f6a876d6f51ef
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 16:38:49 2008 +1000
+
+    radeon: fix LVDS on atombios - typos
+
+commit 6d18d98162d75f653d3c0a199ea410b831a30a42
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 16:38:34 2008 +1000
+
+    drm: port over X crtc picking code.
+    
+    This should do a better job at picking the initial configuration crtcs
+
+commit 40aa1a22e9d5a0d3cd4036098a61b607e7e57e60
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 12:01:53 2008 +1000
+
+    radeon: limit LVDS to first CRTC for now
+
+commit bdb98668670c9025c552eaf50e41eb1d5f4986a3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 12:01:38 2008 +1000
+
+    radeon: fixup checks for crtc in dpms path
+
+commit 934903b922a3e14e4d645cd9b1a2c054dc41fc75
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 15:39:17 2008 +1000
 
     radeon: fix after rebase
 
-commit 79fb1ef078552b455e7bfdb60be6aa7b5de0b5d8
+commit 892f2e3e5760eae2a7d14e073537d3e5507c2baa
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 13:43:23 2008 +1000
 
     drm: fix whitespace
 
-commit 784ca5f9c619c493aec35be840baccefd731d68d
+commit 48dd305fe06443ba66057a9a9c58c93775eed3fd
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 13:43:04 2008 +1000
 
     radeon: avoid oops on encdoers with no crtc set
 
-commit db42aceda15c0762dbd7e068133cc82ad9034457
+commit 724f6629e97f640e077456b2139e5d8324b8256b
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:23:21 2008 +1000
 
     radeon: fix warning from radeon_legacy_state removal
 
-commit c251a3431163f4a08dd1da13d8589dd6d699c01a
+commit 3890caf32fa66d4c607cb3a89b2afcaaadb2ebc1
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:22:37 2008 +1000
 
@@ -31,7 +129,7 @@
     - done: primary dac, vga on tvdac
     - todo: ext dac, tv on tvdac
 
-commit 450c44cd577fc7ec6dfc547732da6a6c8768b3a8
+commit 200e5b0136079aa7c9979cd8a15b69aba19bf226
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:22:11 2008 +1000
 
@@ -39,25 +137,25 @@
     
     - todo: updated connected status
 
-commit 6cd9376cc768965342c95ff4347ee813945794c5
+commit 7ea958126880e743d5161fb2f62491fc63f2e1c3
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:20:54 2008 +1000
 
     radeon: remove unused legacy state
 
-commit afdc87faf976a30ec715d5117cb888e5434ac88f
+commit ccf6979258a3f23f6b85510598d6d97b1dbe24aa
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:20:15 2008 +1000
 
     radeon: get primary dac adj info from bios tables
 
-commit b3200c71adde06620774ce8c626655a01161ea9e
+commit b95536c48c88848605d6c7fefa6a600750b22e8c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:03:13 2008 +1000
 
     x86: export pat_enabled
 
-commit 428f0c7d0ac1820d44f36a8d9693cdbb31957674
+commit 7f2471ae885084a53d24ea9d95eb2aaec3f427c5
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:02:43 2008 +1000
 
@@ -66,7 +164,7 @@
     If PAT is enabled, enable write combining support for kernel/user mappings
     when pat is enabled. Also set memory to WC instead of uncached in ttm
 
-commit ec150348a144d9646b30a7e77fe4d24af4885df0
+commit 052f6c2b56ed030adb6db716c6afdcf55aca328d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:01:35 2008 +1000
 
@@ -75,7 +173,7 @@
     move domain validate function to separate function
     call it from correct places
 
-commit d688b522c7418ba6bc946f0fa93b19806f1be4ec
+commit 9b3eb7599abc96e9d515c4706f6049acc584f832
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:00:49 2008 +1000
 
@@ -84,37 +182,37 @@
     If a BO hasn't been dirtied, do a solid fill on VRAM instead of
     migrating pages to VRAM
[...3618 lines suppressed...]
 +	// FIXME TV
 +	//bios_5_scratch &= ~RADEON_TV1_CRTC_MASK;
-+	//bios_5_scratch |= (radeon_crtc->crtc_id << RADEON_TV1_CRTC_SHIFT);
++	//bios_5_scratch |= (crtc_id << RADEON_TV1_CRTC_SHIFT);
 +
 +	if (dev_priv->chip_family == CHIP_R200)
 +		fp2_gen_cntl = RADEON_READ(RADEON_FP2_GEN_CNTL);
@@ -46554,10 +46375,10 @@
  		struct drm_sman_mm sman_mm;
  		sman_mm.private = (void *)0xFFFFFFFF;
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 7098dfb..1518c4f 100644
+index cce2f4c..4db67c5 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
-@@ -181,13 +181,6 @@ static u64 pci_size(u64 base, u64 maxbase, u64 mask)
+@@ -203,13 +203,6 @@ static u64 pci_size(u64 base, u64 maxbase, u64 mask)
  	return size;
  }
  
@@ -46571,7 +46392,7 @@
  static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar)
  {
  	if ((bar & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
-@@ -300,6 +293,46 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+@@ -322,6 +315,46 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
  	goto out;
  }
  
@@ -47031,7 +46852,7 @@
   * Device specific ioctls should only be in their respective headers
   * The device specific ioctl range is from 0x40 to 0x99.
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 1c1b13e..5c73d4d 100644
+index 1c1b13e..6a533a5 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -87,6 +87,7 @@ struct drm_device;
@@ -47305,18 +47126,19 @@
  
  	/** \name Context handle management */
  	/*@{ */
-@@ -700,7 +825,9 @@ struct drm_device {
+@@ -700,7 +825,10 @@ struct drm_device {
  	struct idr ctx_idr;
  
  	struct list_head vmalist;	/**< List of vmas (for debugging) */
 -	struct drm_lock_data lock;	/**< Information on hardware lock */
++	struct drm_hw_lock default_lock;
 +
 +	struct list_head filelist;
 +
  	/*@} */
  
  	/** \name DMA queues (contexts) */
-@@ -764,15 +891,58 @@ struct drm_device {
+@@ -764,15 +892,58 @@ struct drm_device {
  	struct drm_driver *driver;
  	drm_local_map_t *agp_buffer_map;
  	unsigned int agp_buffer_token;
@@ -47375,7 +47197,7 @@
  static __inline__ int drm_core_check_feature(struct drm_device *dev,
  					     int feature)
  {
-@@ -867,8 +1037,23 @@ extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
+@@ -867,8 +1038,23 @@ extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
  extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
  extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
  extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
@@ -47399,7 +47221,7 @@
  				/* Misc. IOCTL support (drm_ioctl.h) */
  extern int drm_irq_by_busid(struct drm_device *dev, void *data,
  			    struct drm_file *file_priv);
-@@ -929,6 +1114,9 @@ extern int drm_getmagic(struct drm_device *dev, void *data,
+@@ -929,6 +1115,9 @@ extern int drm_getmagic(struct drm_device *dev, void *data,
  extern int drm_authmagic(struct drm_device *dev, void *data,
  			 struct drm_file *file_priv);
  
@@ -47409,7 +47231,7 @@
  				/* Locking IOCTL support (drm_lock.h) */
  extern int drm_lock(struct drm_device *dev, void *data,
  		    struct drm_file *file_priv);
-@@ -985,6 +1173,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev,
+@@ -985,6 +1174,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev,
  extern int drm_control(struct drm_device *dev, void *data,
  		       struct drm_file *file_priv);
  extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
@@ -47417,7 +47239,7 @@
  extern int drm_irq_uninstall(struct drm_device *dev);
  extern void drm_driver_irq_preinstall(struct drm_device *dev);
  extern void drm_driver_irq_postinstall(struct drm_device *dev);
-@@ -1026,12 +1215,21 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
+@@ -1026,12 +1216,21 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
  extern int drm_agp_free_memory(DRM_AGP_MEM * handle);
  extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);
  extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
@@ -47440,7 +47262,7 @@
  extern unsigned int drm_debug;
  
  extern struct class *drm_class;
-@@ -1059,6 +1257,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
+@@ -1059,6 +1258,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
  				struct drm_ati_pcigart_info * gart_info);
  extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
  				   struct drm_ati_pcigart_info * gart_info);
@@ -47449,7 +47271,7 @@
  
  extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
  				       size_t align, dma_addr_t maxaddr);
-@@ -1070,7 +1270,11 @@ struct drm_sysfs_class;
+@@ -1070,7 +1271,11 @@ struct drm_sysfs_class;
  extern struct class *drm_sysfs_create(struct module *owner, char *name);
  extern void drm_sysfs_destroy(void);
  extern int drm_sysfs_device_add(struct drm_minor *minor);
@@ -47461,7 +47283,7 @@
  
  /*
   * Basic memory manager support (drm_mm.c)
-@@ -1088,6 +1292,66 @@ extern unsigned long drm_mm_tail_space(struct drm_mm *mm);
+@@ -1088,6 +1293,66 @@ extern unsigned long drm_mm_tail_space(struct drm_mm *mm);
  extern int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size);
  extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);
  
@@ -47528,7 +47350,7 @@
  extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);
  extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev);
  extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);
-@@ -1148,6 +1412,39 @@ extern void drm_free(void *pt, size_t size, int area);
+@@ -1148,6 +1413,39 @@ extern void drm_free(void *pt, size_t size, int area);
  extern void *drm_calloc(size_t nmemb, size_t size, int area);
  #endif
  
@@ -47570,10 +47392,10 @@
  #endif				/* __KERNEL__ */
 diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
 new file mode 100644
-index 0000000..3a3a09a
+index 0000000..5f63dc2
 --- /dev/null
 +++ b/include/drm/drm_crtc.h
-@@ -0,0 +1,712 @@
+@@ -0,0 +1,714 @@
 +/*
 + * Copyright Â© 2006 Keith Packard
 + * Copyright Â© 2007 Intel Corporation
@@ -48180,6 +48002,8 @@
 +extern void drm_mode_config_cleanup(struct drm_device *dev);
 +extern void drm_mode_set_name(struct drm_display_mode *mode);
 +extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
++extern int drm_mode_width(struct drm_display_mode *mode);
++extern int drm_mode_height(struct drm_display_mode *mode);
 +
 +/* for us by fb module */
 +extern int drm_mode_attachmode_crtc(struct drm_device *dev,
@@ -49493,7 +49317,7 @@
  
  /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 05c66cf..3c1f545 100644
+index 05c66cf..2195856 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
 @@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
@@ -49592,15 +49416,16 @@
  	int start;		/* agp offset */
  	int used;		/* nr bytes in use */
  	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-@@ -200,6 +244,7 @@ typedef struct drm_i915_irq_wait {
+@@ -200,6 +244,8 @@ typedef struct drm_i915_irq_wait {
  #define I915_PARAM_IRQ_ACTIVE            1
  #define I915_PARAM_ALLOW_BATCHBUFFER     2
  #define I915_PARAM_LAST_DISPATCH         3
++#define I915_PARAM_CHIPSET_ID            4
 +#define I915_PARAM_HAS_GEM               5
  
  typedef struct drm_i915_getparam {
  	int param;
-@@ -267,4 +312,305 @@ typedef struct drm_i915_hws_addr {
+@@ -267,4 +313,305 @@ typedef struct drm_i915_hws_addr {
  	uint64_t addr;
  } drm_i915_hws_addr_t;
  
@@ -50098,7 +49923,7 @@
 +
  #endif /* _LINUX_CONSOLE_H */
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 335288b..dca69f9 100644
+index 72a15dc..86db8ae 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -715,6 +715,17 @@ static inline int shmem_lock(struct file *file, int lock,
@@ -50120,7 +49945,7 @@
  
  #ifndef CONFIG_MMU
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 825be38..fa7e10a 100644
+index c0e1400..5094fb3 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -312,6 +312,16 @@ struct pci_bus {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- kernel.spec	28 Aug 2008 00:55:51 -0000	1.908
+++ kernel.spec	28 Aug 2008 07:18:47 -0000	1.909
@@ -1146,7 +1146,7 @@
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 # Nouveau DRM + drm fixes
-#ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-modesetting-radeon.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1739,6 +1739,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com>
+- rebase modesetting patches - add DRI2 for intel patches from krh
+- no intel modesetting yet didn't have time
+
 * Wed Aug 27 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc4-git7
 


