rpms/xorg-x11-drv-i810/devel intel-2.4.2-git-diffs.patch, 1.2, 1.3 xorg-x11-drv-i810.spec, 1.110, 1.111

Dave Airlie airlied at fedoraproject.org
Tue Oct 14 03:16:20 UTC 2008 

Author: airlied

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

Modified Files:
	intel-2.4.2-git-diffs.patch xorg-x11-drv-i810.spec 
Log Message:
- rebase to latest upstream master


intel-2.4.2-git-diffs.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 intel-2.4.2-git-diffs.patch
Index: intel-2.4.2-git-diffs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-2.4.2-git-diffs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intel-2.4.2-git-diffs.patch	1 Oct 2008 05:41:26 -0000	1.2
+++ intel-2.4.2-git-diffs.patch	14 Oct 2008 03:15:49 -0000	1.3
@@ -1,18 +1,23 @@
 diff --git a/Makefile.am b/Makefile.am
-index b2398a8..5db07de 100644
+index b2398a8..896427f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,12 @@
  #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  
  AUTOMAKE_OPTIONS = foreign
 -SUBDIRS = src man
-+SUBDIRS = uxa src man
++
++if BUILD_UXA
++UXA_DIR = uxa
++endif
++
++SUBDIRS = $(UXA_DIR) src man
  
  EXTRA_DIST = README
  DISTCLEANFILES = doltcompile
 diff --git a/configure.ac b/configure.ac
-index 809e84d..e276f0e 100644
+index 809e84d..d5db3a9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -22,7 +22,7 @@
@@ -20,13 +25,16 @@
  AC_PREREQ(2.57)
  AC_INIT([xf86-video-intel],
 -        2.4.2,
-+        2.5.96.0,
++        2.4.97.0,
          [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
          xf86-video-intel)
  
-@@ -85,12 +85,17 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+@@ -84,13 +84,20 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
  # Checks for pkg-config packages
  PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
++PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=yes], [BUILD_UXA=no])
++
  sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 +drm_cflags=$(pkg-config --cflags libdrm)
  
@@ -42,29 +50,36 @@
  if test x$DRI != xno; then
          AC_CHECK_FILE([${sdkdir}/dri.h],
                        [have_dri_h="yes"], [have_dri_h="no"])
-@@ -100,6 +105,12 @@ if test x$DRI != xno; then
+@@ -100,6 +107,14 @@ if test x$DRI != xno; then
                        [have_dristruct_h="yes"], [have_dristruct_h="no"])
  	AC_CHECK_FILE([${sdkdir}/damage.h],
                        [have_damage_h="yes"], [have_damage_h="no"])
 +	AC_CHECK_HEADER(xf86drmMode.h,
 +			[DRM_MODE=yes],[DRM_MODE=no]
 +			[#include "stdint.h"])
++	dnl exaGetPixmapDriverPrivate required for DRM_MODE.
++	PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
 +	if test "x$DRM_MODE" = xyes; then
 +	   	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
 +	fi
  fi
  AC_MSG_CHECKING([whether to include DRI support])
  if test x$DRI = xauto; then
-@@ -113,8 +124,6 @@ if test x$DRI = xauto; then
+@@ -113,8 +128,11 @@ if test x$DRI = xauto; then
  fi
  AC_MSG_RESULT([$DRI])
  
 -save_CFLAGS="$CFLAGS"
 -CFLAGS="$XORG_CFLAGS"
++AM_CONDITIONAL(BUILD_UXA, test $BUILD_UXA = yes)
++if test "$BUILD_UXA" = yes; then
++	AC_DEFINE(I830_USE_UXA, 1, [UMA Acceleration Architecture support])
++fi
++
  AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
  AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
  	      [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
-@@ -174,6 +183,8 @@ else
+@@ -174,6 +192,8 @@ else
  fi
  
  AC_SUBST([XMODES_CFLAGS])
@@ -73,7 +88,7 @@
  
  SAVE_CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-@@ -197,9 +208,10 @@ if test "x$GCC" = "xyes"; then
+@@ -197,9 +217,10 @@ if test "x$GCC" = "xyes"; then
  	-Wnested-externs -fno-strict-aliasing"
  fi
  
@@ -85,7 +100,7 @@
          AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
          AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
  	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
-@@ -209,17 +221,6 @@ if test "$DRI" = yes; then
+@@ -209,17 +230,6 @@ if test "$DRI" = yes; then
  	if test "$have_damage_h" = yes; then
  		AC_DEFINE(DAMAGE,1,[Use Damage extension])
  	fi
@@ -103,7 +118,7 @@
  fi
  
  AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
-@@ -262,6 +263,7 @@ XORG_CHECK_LINUXDOC
+@@ -262,6 +272,7 @@ XORG_CHECK_LINUXDOC
  
  AC_OUTPUT([
  	Makefile
@@ -169,31 +184,33 @@
  .SH OUTPUT CONFIGURATION
  On 830M and better chipsets, the driver supports runtime configuration of
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 594416d..8966bd6 100644
+index 594416d..9b32215 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -30,15 +30,16 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
+@@ -30,15 +30,19 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
  # _ladir passes a dummy rpath to libtool so the thing will actually link
  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
  
 -AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \
--	@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
 +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 +	@PCIACCESS_CFLAGS@ @UXA_CFLAGS@ \
-+	@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA	-DI830_USE_UXA
+ 	@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
  
  intel_drv_la_LTLIBRARIES = intel_drv.la
  intel_drv_la_LDFLAGS = -module -avoid-version
  intel_drv_ladir = @moduledir@/drivers
 -intel_drv_la_LIBADD =
-+intel_drv_la_LIBADD = -lm ../uxa/libuxa.la
++intel_drv_la_LIBADD = -lm -ldrm_intel
++if BUILD_UXA
++intel_drv_la_LIBADD += ../uxa/libuxa.la
++endif
  if XSERVER_LIBPCIACCESS
 -intel_drv_la_LIBADD += @PCIACCESS_LIBS@
-+intel_drv_la_LIBADD += @PCIACCESS_LIBS@ @DRM_LIBS@ -ldrm_intel
++intel_drv_la_LIBADD += @PCIACCESS_LIBS@ @DRM_LIBS@
  endif
  
  XMODE_SRCS=\
-@@ -93,6 +94,8 @@ intel_drv_la_SOURCES = \
+@@ -93,6 +97,8 @@ intel_drv_la_SOURCES = \
           i830_accel.c \
           i830_bios.c \
           i830_bios.h \
@@ -202,7 +219,7 @@
           i830_common.h \
  	 i830_crt.c \
           i830_cursor.c \
-@@ -127,7 +130,9 @@ intel_drv_la_SOURCES = \
+@@ -127,7 +133,9 @@ intel_drv_la_SOURCES = \
  	 i830_xaa.c \
  	 i830_render.c \
  	 i915_render.c \
@@ -213,7 +230,7 @@
  
  INTEL_G4A =				\
  	packed_yuv_sf.g4a		\
-@@ -154,7 +159,6 @@ INTEL_G4I =				\
+@@ -154,7 +162,6 @@ INTEL_G4I =				\
  	exa_wm.g4i			\
  	exa_wm_affine.g4i		\
  	exa_wm_projective.g4i
@@ -221,7 +238,7 @@
  
  INTEL_G4B = 				\
  	packed_yuv_sf.g4b		\
-@@ -176,7 +180,7 @@ INTEL_G4B = 				\
+@@ -176,7 +183,7 @@ INTEL_G4B = 				\
  	exa_wm_write.g4b 		\
  	exa_wm_yuv_rgb.g4b		\
  	exa_wm_xy.g4b
@@ -231,18 +248,20 @@
  	$(XMODE_SRCS)	\
  	$(INTEL_G4A)	\
 diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am
-index c4da957..c85081e 100644
+index c4da957..9f1c45a 100644
 --- a/src/bios_reader/Makefile.am
 +++ b/src/bios_reader/Makefile.am
-@@ -1,6 +1,6 @@
- AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@
[...2344 lines suppressed...]
+@@ -209,7 +209,7 @@ static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
+         I830FALLBACK("Unsupported picture format 0x%x\n",
+ 		     (int)pPict->format);
+ 
+-    if (pPict->repeat && pPict->repeatType != RepeatNormal)
++    if (pPict->repeatType > RepeatReflect)
+ 	I830FALLBACK("extended repeat (%d) not supported\n",
+ 		     pPict->repeatType);
+ 
+@@ -427,6 +427,8 @@ typedef enum {
+ typedef enum {
+     SAMPLER_STATE_EXTEND_NONE,
+     SAMPLER_STATE_EXTEND_REPEAT,
++    SAMPLER_STATE_EXTEND_PAD,
++    SAMPLER_STATE_EXTEND_REFLECT,
+     SAMPLER_STATE_EXTEND_COUNT
+ } sampler_state_extend_t;
+ 
+@@ -494,8 +496,8 @@ typedef struct _gen4_state {
+ 					  [SAMPLER_STATE_FILTER_COUNT]
+ 					  [SAMPLER_STATE_EXTEND_COUNT][2];
+ 
+-    struct brw_sampler_default_color sampler_default_color;
+-    PAD64 (brw_sampler_default_color, 0);
++    struct brw_sampler_legacy_border_color sampler_border_color;
++    PAD64 (brw_sampler_legacy_border_color, 0);
+ 
+     /* Index by [src_blend][dst_blend] */
+     brw_cc_unit_state_padded cc_state[BRW_BLENDFACTOR_COUNT]
+@@ -564,13 +566,16 @@ static void
+ sampler_state_init (struct brw_sampler_state *sampler_state,
+ 		    sampler_state_filter_t filter,
+ 		    sampler_state_extend_t extend,
+-		    int default_color_offset)
++		    int border_color_offset)
+ {
+     /* PS kernel use this sampler */
+     memset(sampler_state, 0, sizeof(*sampler_state));
+ 
+     sampler_state->ss0.lod_preclamp = 1; /* GL mode */
+-    sampler_state->ss0.default_color_mode = 0; /* GL mode */
++
++    /* We use the legacy mode to get the semantics specified by
++     * the Render extension. */
++    sampler_state->ss0.border_color_mode = BRW_BORDER_COLOR_MODE_LEGACY;
+ 
+     switch(filter) {
+     default:
+@@ -596,10 +601,20 @@ sampler_state_init (struct brw_sampler_state *sampler_state,
+ 	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_WRAP;
+ 	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_WRAP;
+ 	break;
++    case SAMPLER_STATE_EXTEND_PAD:
++	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
++	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
++	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
++	break;
++    case SAMPLER_STATE_EXTEND_REFLECT:
++	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
++	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
++	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
++	break;
+     }
+ 
+-    assert((default_color_offset & 31) == 0);
+-    sampler_state->ss2.default_color_pointer = default_color_offset >> 5;
++    assert((border_color_offset & 31) == 0);
++    sampler_state->ss2.border_color_pointer = border_color_offset >> 5;
+ 
+     sampler_state->ss3.chroma_key_enable = 0; /* disable chromakey */
+ }
+@@ -722,13 +737,13 @@ gen4_state_init (struct gen4_render_state *render_state)
+     card_state->vs_state.vs6.vs_enable = 0;
+     card_state->vs_state.vs6.vert_cache_disable = 1;
+ 
+-    /* Set up the sampler default color (always transparent black) */
+-    memset(&card_state->sampler_default_color, 0,
+-	   sizeof(card_state->sampler_default_color));
+-    card_state->sampler_default_color.color[0] = 0.0; /* R */
+-    card_state->sampler_default_color.color[1] = 0.0; /* G */
+-    card_state->sampler_default_color.color[2] = 0.0; /* B */
+-    card_state->sampler_default_color.color[3] = 0.0; /* A */
++    /* Set up the sampler border color (always transparent black) */
++    memset(&card_state->sampler_border_color, 0,
++	   sizeof(card_state->sampler_border_color));
++    card_state->sampler_border_color.color[0] = 0; /* R */
++    card_state->sampler_border_color.color[1] = 0; /* G */
++    card_state->sampler_border_color.color[2] = 0; /* B */
++    card_state->sampler_border_color.color[3] = 0; /* A */
+ 
+     card_state->cc_viewport.min_depth = -1.e35;
+     card_state->cc_viewport.max_depth = 1.e35;
+@@ -748,12 +763,12 @@ gen4_state_init (struct gen4_render_state *render_state)
+ 					i, j,
+ 					state_base_offset +
+ 					offsetof (gen4_state_t,
+-						  sampler_default_color));
++						  sampler_border_color));
+ 		    sampler_state_init (&card_state->sampler_state[i][j][k][l][1],
+ 					k, l,
+ 					state_base_offset +
+ 					offsetof (gen4_state_t,
+-						  sampler_default_color));
++						  sampler_border_color));
+ 		}
+ 	    }
+ 	}
+@@ -828,13 +843,17 @@ sampler_state_filter_from_picture (int filter)
+ }
+ 
+ static sampler_state_extend_t
+-sampler_state_extend_from_picture (int repeat)
++sampler_state_extend_from_picture (int repeat_type)
+ {
+-    switch (repeat) {
++    switch (repeat_type) {
+     case RepeatNone:
+ 	return SAMPLER_STATE_EXTEND_NONE;
+     case RepeatNormal:
+ 	return SAMPLER_STATE_EXTEND_REPEAT;
++    case RepeatPad:
++	return SAMPLER_STATE_EXTEND_PAD;
++    case RepeatReflect:
++	return SAMPLER_STATE_EXTEND_REFLECT;
+     default:
+ 	return -1;
+     }
+@@ -1010,17 +1029,17 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
+     src_filter = sampler_state_filter_from_picture (pSrcPicture->filter);
+     if (src_filter < 0)
+ 	I830FALLBACK ("Bad src filter 0x%x\n", pSrcPicture->filter);
+-    src_extend = sampler_state_extend_from_picture (pSrcPicture->repeat);
++    src_extend = sampler_state_extend_from_picture (pSrcPicture->repeatType);
+     if (src_extend < 0)
+-	I830FALLBACK ("Bad src repeat 0x%x\n", pSrcPicture->repeat);
++	I830FALLBACK ("Bad src repeat 0x%x\n", pSrcPicture->repeatType);
+ 
+     if (pMaskPicture) {
+ 	mask_filter = sampler_state_filter_from_picture (pMaskPicture->filter);
+ 	if (mask_filter < 0)
+ 	    I830FALLBACK ("Bad mask filter 0x%x\n", pMaskPicture->filter);
+-	mask_extend = sampler_state_extend_from_picture (pMaskPicture->repeat);
++	mask_extend = sampler_state_extend_from_picture (pMaskPicture->repeatType);
+ 	if (mask_extend < 0)
+-	    I830FALLBACK ("Bad mask repeat 0x%x\n", pMaskPicture->repeat);
++	    I830FALLBACK ("Bad mask repeat 0x%x\n", pMaskPicture->repeatType);
+     } else {
+ 	mask_filter = SAMPLER_STATE_FILTER_NEAREST;
+ 	mask_extend = SAMPLER_STATE_EXTEND_NONE;
+@@ -1431,26 +1450,6 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
      ErrorF("sync after 3dprimitive\n");
      I830Sync(pScrn);
  #endif
@@ -7202,7 +8056,7 @@
  }
  
  /**
-@@ -1461,6 +1441,7 @@ gen4_render_state_init(ScrnInfoPtr pScrn)
+@@ -1461,6 +1460,7 @@ gen4_render_state_init(ScrnInfoPtr pScrn)
  {
      I830Ptr pI830 = I830PTR(pScrn);
      struct gen4_render_state *render_state;
@@ -7210,7 +8064,7 @@
  
      if (pI830->gen4_render_state == NULL)
  	pI830->gen4_render_state = calloc(sizeof(*render_state), 1);
-@@ -1468,8 +1449,19 @@ gen4_render_state_init(ScrnInfoPtr pScrn)
+@@ -1468,8 +1468,19 @@ gen4_render_state_init(ScrnInfoPtr pScrn)
      render_state = pI830->gen4_render_state;
  
      render_state->card_state_offset = pI830->gen4_render_state_mem->offset;
@@ -7232,7 +8086,7 @@
  
      gen4_state_init(render_state);
  }
-@@ -1482,6 +1474,10 @@ gen4_render_state_cleanup(ScrnInfoPtr pScrn)
+@@ -1482,6 +1493,10 @@ gen4_render_state_cleanup(ScrnInfoPtr pScrn)
  {
      I830Ptr pI830 = I830PTR(pScrn);
  
@@ -7243,6 +8097,19 @@
      pI830->gen4_render_state->card_state = NULL;
  }
  
+diff --git a/src/i965_video.c b/src/i965_video.c
+index 4c79259..78f69ee 100644
+--- a/src/i965_video.c
++++ b/src/i965_video.c
+@@ -254,7 +254,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
+ 	ps_kernel_static = &ps_kernel_planar_static[0][0];
+ 	ps_kernel_static_size = sizeof (ps_kernel_planar_static);
+ 	src_width[1] = src_width[0] = width;
+-	src_width[1] = src_height[0] = height;
++	src_height[1] = src_height[0] = height;
+ 	src_pitch[1] = src_pitch[0] = video_pitch * 2;
+ 	src_width[4] = src_width[5] = src_width[2] = src_width[3] = width / 2;
+ 	src_height[4] = src_height[5] = src_height[2] = src_height[3] = height / 2;
 diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am
 index d49a59b..1127581 100644
 --- a/src/reg_dumper/Makefile.am


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- xorg-x11-drv-i810.spec	1 Oct 2008 05:41:26 -0000	1.110
+++ xorg-x11-drv-i810.spec	14 Oct 2008 03:15:49 -0000	1.111
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -99,6 +99,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Oct 14 2008 Dave Airlie <airlied at redhat.com> 2.4.2-10
+- rebase to latest upstream master
+
 * Wed Oct 01 2008 Dave Airlie <airlied at redhat.com> 2.4.2-9
 - rebase to upstream for new libdrm interfaces

More information about the scm-commits mailing list