rpms/xorg-x11-drv-ati/devel copy-fb-contents.patch,1.4,1.5

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15303

Modified Files:
	copy-fb-contents.patch 
Log Message:
- rebase for latest fixes and new libdrm


copy-fb-contents.patch:

Index: copy-fb-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/copy-fb-contents.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- copy-fb-contents.patch	29 Sep 2008 06:55:09 -0000	1.4
+++ copy-fb-contents.patch	1 Oct 2008 06:24:59 -0000	1.5
@@ -11,22 +11,18 @@
  
  save_CFLAGS="$CFLAGS"
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 25e6183..a22cd62 100644
+index 3073c15..17e182b 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -31,8 +31,11 @@
+@@ -31,6 +31,7 @@
  
  #ifdef XF86DRM_MODE
  #include "radeon.h"
 +#include "radeon_reg.h"
  #include "sarea.h"
  
-+#include "dri_bufmgr.h"
-+
  static Bool drmmode_resize_fb(ScrnInfoPtr scrn, drmmode_ptr drmmode, int width, int height);
- 
- static Bool
-@@ -119,6 +122,71 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
+@@ -119,6 +120,71 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
  
  }
  
@@ -98,7 +94,7 @@
  static Bool
  drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		     Rotation rotation, int x, int y)
-@@ -174,7 +242,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -174,7 +240,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	fb_id = drmmode->fb_id;
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_id;
@@ -109,7 +105,7 @@
  		       fb_id, x, y, output_ids, output_count, &kmode);
  
 diff --git a/src/radeon_bufmgr.h b/src/radeon_bufmgr.h
-index a16ad9a..b3034d7 100644
+index 3d28992..dc23438 100644
 --- a/src/radeon_bufmgr.h
 +++ b/src/radeon_bufmgr.h
 @@ -16,6 +16,8 @@ struct radeon_bufmgr {
@@ -122,10 +118,10 @@
  void radeon_bufmgr_emit_reloc(dri_bo *buf, uint32_t *head, uint32_t *count_p, uint32_t read_domains, uint32_t write_domain);
  
 diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c
-index db28edc..75cff8e 100644
+index 7fed98b..8ad1333 100644
 --- a/src/radeon_bufmgr_gem.c
 +++ b/src/radeon_bufmgr_gem.c
-@@ -353,6 +353,27 @@ void radeon_bufmgr_gem_wait_rendering(dri_bo *buf)
+@@ -352,6 +352,27 @@ void radeon_bufmgr_gem_wait_rendering(dri_bo *buf)
  	return;
  }
  
@@ -153,7 +149,7 @@
  /**
   * Returns a dri_bo wrapping the given buffer object handle.
   *
-@@ -364,32 +385,20 @@ radeon_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
+@@ -363,32 +384,20 @@ radeon_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
  			       unsigned int handle)
  {
      dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bufmgr;