Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Wed Aug 26 15:17:47 CEST 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-08-20 11:29:25.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-08-26 03:40:31.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 26 03:13:46 CEST 2009 - sndirsch@suse.de + +- xf86-video-intel 2.8.1 + * Align the height of untiled pixmaps to 2 lines as well. + * Replace existing EDID property blob with new one + * Only align DRI2 tiled pixmaps to the DRI2 tiled pixmap + alignment requirement (fixes bfo #21387). + * Calculate the DVO relative offset in LVDS data entry to get the + DVO timing (fixes bfo #22787 and Debian bug #538148). + * Fix sampler indexes on i965 planar video, (fixes bfo #22895 + and bfo #19856). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-intel-2.8.0.901.tar.bz2 New: ---- xf86-video-intel-2.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.j1lkPy/_old 2009-08-26 15:15:12.000000000 +0200 +++ /var/tmp/diff_new_pack.j1lkPy/_new 2009-08-26 15:15:12.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 79 +Release: 80 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -68,7 +68,7 @@ Source42: xf86-video-voodoo-1.2.3.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel-2.8.0.901.tar.bz2 +Source45: xf86-video-intel-2.8.1.tar.bz2 Source46: xf86-video-ati-6.12.2.tar.bz2 Source48: xf86-video-mga-1.9.100.tar.bz2 Source50: xf86-video-xgi-1.5.0.tar.bz2 ++++++ xf86-video-intel-2.8.0.901.tar.bz2 -> xf86-video-intel-2.8.1.tar.bz2 ++++++ ++++ 1612 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/NEWS new/xf86-video-intel-2.8.1/NEWS --- old/xf86-video-intel-2.8.0.901/NEWS 2009-08-13 22:59:20.000000000 +0200 +++ new/xf86-video-intel-2.8.1/NEWS 2009-08-26 01:54:46.000000000 +0200 @@ -1,17 +1,36 @@ -Release 2.8.0.901 (2.8.1 rc1 2009-08-13) -======================================== -We are pleased to announce this release candidate working toward the -2.8.1 maintenance release of the xf86-video-intel driver. This -snapshot contains a few, hand-picked fixes since the 2.8.0 release. +Release 2.8.0 (2009-08-25) +============================ +We are pleased to announce this 2.8.1 maintenance release of the +xf86-video-intel driver. This snapshot contains a few, hand-picked +fixes since the 2.8.0 release. Several of the bugs fixed can manifest +themselves as "random" crashing or hanging of the GPU, (so effectively +the interactive session). We recommend that all users/distributors of +2.8.0 upgrade to 2.8.1. New fixes in 2.8.1 compared to 2.8.0 ------------------------------------ +Bug numbers are relative to bugs.freedesktop.org unless otherwise +mentioned. + * Allow DRM mode setting to include transformations (also requires a fix in the X server---available in xserver 1.6.3) * Align tiled pixmap height so we don't address beyond the end of our buffers. +* Align the height of untiled pixmaps to 2 lines as well. + +* Replace existing EDID property blob with new one + +* Only align DRI2 tiled pixmaps to the DRI2 tiled pixmap alignment + requirement (fixes bug #21387). + +* Calculate the DVO relative offset in LVDS data entry to get the DVO + timing (fixes bug #22787 and Debian bug #538148). + +* Fix sampler indexes on i965 planar video, (fixes bugs #22895 and + #19856). + Release 2.8.0 (2009-07-20) ========================== We are pleased to present this major release of the xf86-video-intel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/configure.ac new/xf86-video-intel-2.8.1/configure.ac --- old/xf86-video-intel-2.8.0.901/configure.ac 2009-08-13 22:58:14.000000000 +0200 +++ new/xf86-video-intel-2.8.1/configure.ac 2009-08-26 01:56:32.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 2.8.0.901, + 2.8.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/bios_reader/bios_reader.c new/xf86-video-intel-2.8.1/src/bios_reader/bios_reader.c --- old/xf86-video-intel-2.8.0.901/src/bios_reader/bios_reader.c 2009-08-13 22:07:07.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/bios_reader/bios_reader.c 2009-08-26 01:42:46.000000000 +0200 @@ -313,11 +313,23 @@ { struct bdb_block *block; struct bdb_lvds_lfp_data *lvds_data; + struct bdb_lvds_lfp_data_ptrs *ptrs; int num_entries; int i; int hdisplay, hsyncstart, hsyncend, htotal; int vdisplay, vsyncstart, vsyncend, vtotal; float clock; + int lfp_data_size, dvo_offset; + + block = find_section(BDB_LVDS_LFP_DATA_PTRS); + if (!block) { + printf("No LVDS ptr block\n"); + return; + } + ptrs = block->data; + lfp_data_size = ptrs->ptr[1].fp_timing_offset - ptrs->ptr[0].fp_timing_offset; + dvo_offset = ptrs->ptr[0].dvo_timing_offset - ptrs->ptr[0].fp_timing_offset; + free(block); block = find_section(BDB_LVDS_LFP_DATA); if (!block) { @@ -326,14 +338,16 @@ } lvds_data = block->data; - num_entries = block->size / sizeof(struct bdb_lvds_lfp_data_entry); + num_entries = block->size / lfp_data_size; printf("LVDS panel data block (preferred block marked with '*'):\n"); printf(" Number of entries: %d\n", num_entries); for (i = 0; i < num_entries; i++) { - struct bdb_lvds_lfp_data_entry *lfp_data = &lvds_data->data[i]; - uint8_t *timing_data = (uint8_t *)&lfp_data->dvo_timing; + uint8_t *lfp_data_ptr = (uint8_t *)lvds_data->data + lfp_data_size * i; + uint8_t *timing_data = lfp_data_ptr + dvo_offset; + struct bdb_lvds_lfp_data_entry *lfp_data = + (struct bdb_lvds_flp_data_entry *)lfp_data_ptr; char marker; if (i == panel_type) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/drmmode_display.c new/xf86-video-intel-2.8.1/src/drmmode_display.c --- old/xf86-video-intel-2.8.0.901/src/drmmode_display.c 2009-08-13 22:07:21.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/drmmode_display.c 2009-08-26 01:14:28.000000000 +0200 @@ -638,8 +638,7 @@ if (!props || !(props->flags & DRM_MODE_PROP_BLOB)) continue; - if (!strcmp(props->name, "EDID") && - drmmode_output->edid_blob == NULL) { + if (!strcmp(props->name, "EDID")) { drmModeFreePropertyBlob(drmmode_output->edid_blob); drmmode_output->edid_blob = drmModeGetPropertyBlob(drmmode->fd, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/i830_accel.c new/xf86-video-intel-2.8.1/src/i830_accel.c --- old/xf86-video-intel-2.8.0.901/src/i830_accel.c 2009-08-13 22:07:07.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/i830_accel.c 2009-08-26 01:14:45.000000000 +0200 @@ -232,9 +232,6 @@ pI830->accel_max_x = 2048; pI830->accel_max_y = 2048; } - /* Bump the pitch so that we can tile any pixmap we create. */ - if (pI830->directRenderingType >= DRI_DRI2) - pI830->accel_pixmap_pitch_alignment = 512; return i830_uxa_init(pScreen); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/i830_bios.c new/xf86-video-intel-2.8.1/src/i830_bios.c --- old/xf86-video-intel-2.8.0.901/src/i830_bios.c 2009-08-13 22:07:07.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/i830_bios.c 2009-08-26 01:42:46.000000000 +0200 @@ -123,6 +123,7 @@ DisplayModePtr fixed_mode; unsigned char *timing_ptr; int lfp_data_size; + int dvo_offset; /* Defaults if we can't find VBT info */ pI830->lvds_dither = 0; @@ -146,10 +147,11 @@ lfp_data_size = lvds_lfp_data_ptrs->ptr[1].dvo_timing_offset - lvds_lfp_data_ptrs->ptr[0].dvo_timing_offset; + dvo_offset = lvds_lfp_data_ptrs->ptr[0].dvo_timing_offset - + lvds_lfp_data_ptrs->ptr[0].fp_timing_offset; entry = (struct bdb_lvds_lfp_data_entry *)((uint8_t *)lvds_data->data + (lfp_data_size * lvds_options->panel_type)); - timing_ptr = (unsigned char *)&entry->dvo_timing; - + timing_ptr = (unsigned char *)entry + dvo_offset; if (pI830->skip_panel_detect) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/i830_uxa.c new/xf86-video-intel-2.8.1/src/i830_uxa.c --- old/xf86-video-intel-2.8.0.901/src/i830_uxa.c 2009-08-13 22:09:42.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/i830_uxa.c 2009-08-26 01:43:01.000000000 +0200 @@ -597,24 +597,33 @@ { unsigned int size; uint32_t tiling = I915_TILING_NONE; + int pitch_align; - stride = ROUND_TO((w * pixmap->drawable.bitsPerPixel + 7) / 8, - i830->accel_pixmap_pitch_alignment); - - if (usage == INTEL_CREATE_PIXMAP_TILING_X) + if (usage == INTEL_CREATE_PIXMAP_TILING_X) { tiling = I915_TILING_X; - else if (usage == INTEL_CREATE_PIXMAP_TILING_Y) + pitch_align = 512; + } else if (usage == INTEL_CREATE_PIXMAP_TILING_Y) { tiling = I915_TILING_Y; + pitch_align = 512; + } else { + pitch_align = i830->accel_pixmap_pitch_alignment; + } + + stride = ROUND_TO((w * pixmap->drawable.bitsPerPixel + 7) / 8, + pitch_align); if (tiling == I915_TILING_NONE) { - size = stride * h; + /* Round the height up so that the GPU's access to a 2x2 aligned + * subspan doesn't address an invalid page offset beyond the + * end of the GTT. + */ + size = stride * ALIGN(h, 2); } else { int aligned_h = h; if (tiling == I915_TILING_X) aligned_h = ALIGN(h, 8); else aligned_h = ALIGN(h, 32); - assert(aligned_h >= h); stride = i830_get_fence_pitch(i830, stride, tiling); /* Round the object up to the size of the fence it will live in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/render_program/exa_wm_src_sample_planar.g4a new/xf86-video-intel-2.8.1/src/render_program/exa_wm_src_sample_planar.g4a --- old/xf86-video-intel-2.8.0.901/src/render_program/exa_wm_src_sample_planar.g4a 2009-08-13 22:07:07.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/render_program/exa_wm_src_sample_planar.g4a 2009-08-26 01:42:51.000000000 +0200 @@ -52,7 +52,7 @@ send (16) src_msg_ind /* msg reg index */ src_sample_r<1>UW /* readback */ g0<8,8,1>UW /* copy to msg start reg*/ - sampler (3,2,F) /* sampler message description, (binding_table,sampler_index,datatype) + sampler (3,0,F) /* sampler message description, (binding_table,sampler_index,datatype) /* here(src->dst) we should use src_sampler and src_surface */ mlen 5 rlen 2 { align1 }; /* required message len 5, readback len 8 */ @@ -60,6 +60,6 @@ send (16) src_msg_ind /* msg reg index */ src_sample_b<1>UW /* readback */ g0<8,8,1>UW /* copy to msg start reg*/ - sampler (5,4,F) /* sampler message description, (binding_table,sampler_index,datatype) + sampler (5,0,F) /* sampler message description, (binding_table,sampler_index,datatype) /* here(src->dst) we should use src_sampler and src_surface */ mlen 5 rlen 2 { align1 }; /* required message len 5, readback len 8 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/render_program/exa_wm_src_sample_planar.g4b new/xf86-video-intel-2.8.1/src/render_program/exa_wm_src_sample_planar.g4b --- old/xf86-video-intel-2.8.0.901/src/render_program/exa_wm_src_sample_planar.g4b 2009-08-13 22:07:07.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/render_program/exa_wm_src_sample_planar.g4b 2009-08-26 01:42:51.000000000 +0200 @@ -1,4 +1,4 @@ { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 }, { 0x01800031, 0x22001d29, 0x008d0000, 0x02520001 }, - { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520203 }, - { 0x01800031, 0x22401d29, 0x008d0000, 0x02520405 }, + { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520003 }, + { 0x01800031, 0x22401d29, 0x008d0000, 0x02520005 }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-intel-2.8.0.901/src/render_program/exa_wm_src_sample_planar.g4b.gen5 new/xf86-video-intel-2.8.1/src/render_program/exa_wm_src_sample_planar.g4b.gen5 --- old/xf86-video-intel-2.8.0.901/src/render_program/exa_wm_src_sample_planar.g4b.gen5 2009-08-13 22:07:07.000000000 +0200 +++ new/xf86-video-intel-2.8.1/src/render_program/exa_wm_src_sample_planar.g4b.gen5 2009-08-26 01:42:51.000000000 +0200 @@ -1,4 +1,4 @@ { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 }, { 0x01800031, 0x22001d29, 0x208d0000, 0x0a2a0001 }, - { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0203 }, - { 0x01800031, 0x22401d29, 0x208d0000, 0x0a2a0405 }, + { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0003 }, + { 0x01800031, 0x22401d29, 0x208d0000, 0x0a2a0005 }, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org