Build failure in git master

[Mark Cave-Ayland]

Hi all,

I've just tried to upgrade to the latest version of xf86-video-ati from 
git and I get the following build failure on my Debian Squeeze laptop:

mcavea at zeno:~/tmp/xf86-video-ati/xf86-video-ati$ make
make  all-recursive
make[1]: Entering directory `/home/mcavea/tmp/xf86-video-ati/xf86-video-ati'
Making all in src
make[2]: Entering directory 
`/home/mcavea/tmp/xf86-video-ati/xf86-video-ati/src'
   CC     ati.lo
   CC     atimodule.lo
   CCLD   ati_drv.la
   CC     radeon_accel.lo
   CC     radeon_cursor.lo
   CC     radeon_legacy_memory.lo
   CC     radeon_driver.lo
   CC     radeon_video.lo
radeon_video.c: In function ‘radeon_pick_best_crtc’:
radeon_video.c:155: warning: implicit declaration of function 
‘dixPrivateKeyRegistered’
   CC     radeon_bios.lo
   CC     radeon_mm_i2c.lo
   CC     radeon_vip.lo
   CC     radeon_misc.lo
   CC     radeon_probe.lo
   CC     legacy_crtc.lo
   CC     legacy_output.lo
   CC     radeon_textured_video.lo
In file included from radeon_textured_video.c:155:
radeon_textured_videofuncs.c: In function ‘RADEONPrepareTexturedVideoMMIO’:
radeon_textured_videofuncs.c:96: warning: unused variable ‘src_bo’
radeon_textured_videofuncs.c: In function ‘R200PrepareTexturedVideoMMIO’:
radeon_textured_videofuncs.c:553: warning: unused variable ‘src_bo’
radeon_textured_videofuncs.c: In function ‘R300PrepareTexturedVideoMMIO’:
radeon_textured_videofuncs.c:1181: warning: unused variable ‘src_bo’
radeon_textured_videofuncs.c: In function ‘R500PrepareTexturedVideoMMIO’:
radeon_textured_videofuncs.c:2663: warning: unused variable ‘src_bo’
   CC     radeon_xvmc.lo
   CC     radeon_pm.lo
   CC     radeon_crtc.lo
   CC     radeon_output.lo
   CC     radeon_modes.lo
   CC     radeon_tv.lo
   CC     CD_Operations.lo
   CC     Decoder.lo
   CC     hwserv_drv.lo
   CC     radeon_atombios.lo
radeon_atombios.c: In function ‘rhdAtomParseI2CRecord’:
radeon_atombios.c:1608: warning: initialization from incompatible 
pointer type
   CC     radeon_atomwrapper.lo
   CC     radeon_dri.lo
   CC     radeon_exa.lo
   CC     r600_exa.lo
r600_exa.c: In function ‘R600SetAccelState’:
r600_exa.c:70: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c:95: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c:119: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c: In function ‘R600PrepareSolid’:
r600_exa.c:258: error: ‘cb_config_t’ has no member named ‘surface’
r600_exa.c:258: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c: In function ‘R600DoPrepareCopy’:
r600_exa.c:438: error: ‘tex_resource_t’ has no member named ‘surface’
r600_exa.c:438: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c:483: error: ‘cb_config_t’ has no member named ‘surface’
r600_exa.c:483: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c: In function ‘R600PrepareCopy’:
r600_exa.c:648: warning: unused variable ‘align’
r600_exa.c: In function ‘R600TextureSetup’:
r600_exa.c:999: error: ‘tex_resource_t’ has no member named ‘surface’
r600_exa.c:999: error: ‘struct r600_accel_object’ has no member named 
‘surface’
r600_exa.c: In function ‘R600PrepareComposite’:
r600_exa.c:1467: error: ‘cb_config_t’ has no member named ‘surface’
r600_exa.c:1467: error: ‘struct r600_accel_object’ has no member named 
‘surface’
make[2]: *** [r600_exa.lo] Error 1
make[2]: Leaving directory 
`/home/mcavea/tmp/xf86-video-ati/xf86-video-ati/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/mcavea/tmp/xf86-video-ati/xf86-video-ati'
make: *** [all] Error 2

A little bit of work with git bisect shows that the following commit 
introduced this error:

mcavea at zeno:~/tmp/xf86-video-ati/xf86-video-ati$ git bisect bad
615033f2b5e3817e335e9d022fc9fdcf8ac8b11a is the first bad commit
commit 615033f2b5e3817e335e9d022fc9fdcf8ac8b11a
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Tue Dec 13 11:08:19 2011 -0500

     r600-evergreen: use common surface allocator for tiling v11

     Use libdrm common surface code so mesa,ddx have same idea
     about tiling surface and what their pitch should be and
     the alignment constraint.

For reference, Squeeze comes with the following X/libdrm versions:

mcavea at zeno:~/tmp/xf86-video-ati/xf86-video-ati$ pkg-config --modversion 
xorg-server
1.7.7
mcavea at zeno:~/tmp/xf86-video-ati/xf86-video-ati$ pkg-config --modversion 
libdrm
2.4.21

And the configure output looks like this:

mcavea at zeno:~/tmp/xf86-video-ati/xf86-video-ati$ ./configure
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking for gcc option to accept ISO C99... -std=gnu99
checking how to run the C preprocessor... gcc -std=gnu99 -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking dependency style of gcc -std=gnu99... gcc3
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking whether to enable maintainer-specific portions of Makefiles... no
checking for a sed that does not truncate output... (cached) /bin/sed
checking for fgrep... /bin/grep -F
checking for ld used by gcc -std=gnu99... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc -std=gnu99 
object... ok
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc -std=gnu99 supports -fno-rtti -fno-exceptions... no
checking for gcc -std=gnu99 option to produce PIC... -fPIC -DPIC
checking if gcc -std=gnu99 PIC flag -fPIC -DPIC works... yes
checking if gcc -std=gnu99 static flag -static works... yes
checking if gcc -std=gnu99 supports -c -o file.o... yes
checking if gcc -std=gnu99 supports -c -o file.o... (cached) yes
checking whether the gcc -std=gnu99 linker (/usr/bin/ld -m elf_x86_64) 
supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
checking whether gcc -std=gnu99 and cc understand -c and -o together... yes
checking if RANDR is defined... yes
checking if RENDER is defined... yes
checking if XV is defined... yes
checking if DPMSExtension is defined... yes
checking for XORG... yes
checking for XEXT... yes
checking for DRI... yes
checking for dri.h... yes
checking for sarea.h... yes
checking for damage.h... yes
checking whether to include DRI support... yes
checking for xf86drmMode.h... yes
checking for LIBDRM_RADEON... no
checking for LIBUDEV... no
checking whether to enable EXA support... yes
checking exa.h usability... yes
checking exa.h presence... yes
checking for exa.h... yes
checking whether EXA version is at least 2.0.0... yes
checking whether xf86XVFillKeyHelperDrawable is declared... yes
checking whether xf86ModeBandwidth is declared... yes
checking whether xf86_crtc_clip_video_helper is declared... yes
checking whether xf86RotateFreeShadow is declared... yes
checking whether pci_device_enable is declared... yes
checking whether XSERVER_LIBPCIACCESS is declared... yes
checking for list.h... no
checking for PCIACCESS... yes
checking byteswap.h usability... yes
checking byteswap.h presence... yes
checking for byteswap.h... yes
checking sys/endian.h usability... no
checking sys/endian.h presence... no
checking for sys/endian.h... no
configure: The atimisc sub-driver has been split out to xf86-video-mach64:
     git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mach64
Please install that driver as well for mach64-based cards.

configure: The r128 sub-driver has been split out to xf86-video-r128:
     git://anongit.freedesktop.org/git/xorg/driver/xf86-video-r128
Please install that driver as well for rage128-based cards.

configure: creating ./config.status
config.status: creating Makefile
config.status: creating src/Makefile
config.status: creating man/Makefile
config.status: creating config.h
config.status: config.h is unchanged
config.status: executing depfiles commands
config.status: executing libtool commands

         prefix:              /usr/local
         exec_prefix:         ${prefix}
         libdir:              ${exec_prefix}/lib
         includedir:          ${prefix}/include

         Kernel modesetting:  no

         CFLAGS:              -g -O2
         CXXFLAGS:
         Macros:

         Run 'make' to build xf86-video-ati


If any other information is required, please ask and I will do my best 
to provide it.


Many thanks,

Mark.

-- 
Mark Cave-Ayland - Senior Technical Architect
PostgreSQL - PostGIS
Sirius Corporation plc - control through freedom
http://www.siriusit.co.uk
t: +44 870 608 0063

Sirius Labs: http://www.siriusit.co.uk/labs