Hello community, here is the log from the commit of package xf86-video-freedreno for openSUSE:Factory checked in at 2014-08-29 17:43:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-freedreno (Old) and /work/SRC/openSUSE:Factory/.xf86-video-freedreno.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-freedreno" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-freedreno/xf86-video-freedreno.changes 2014-06-18 07:52:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-freedreno.new/xf86-video-freedreno.changes 2014-08-29 17:43:15.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Aug 23 12:52:43 UTC 2014 - afaerber@suse.de + +- Updated to v1.2.0: +* support for server managed fd's (ie. running xserver as non-root) +* platform-probe and autoconfig support, so no .conf file needed + with xserver 1.16+ +* bump libdrm requirement, and misc fixes + +------------------------------------------------------------------- Old: ---- xf86-video-freedreno-1.1.0.tar.bz2 New: ---- xf86-video-freedreno-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-freedreno.spec ++++++ --- /var/tmp/diff_new_pack.2OCnqe/_old 2014-08-29 17:43:18.000000000 +0200 +++ /var/tmp/diff_new_pack.2OCnqe/_new 2014-08-29 17:43:18.000000000 +0200 @@ -20,7 +20,7 @@ Summary: X.Org X server -- freedreno display driver License: MIT and BSD-3-Clause Group: System/X11/Servers/XF86_4 -Version: 1.1.0 +Version: 1.2.0 Release: 0.0 ExclusiveArch: %arm Url: https://github.com/freedreno/xf86-video-freedreno @@ -60,6 +60,7 @@ %dir %{_libdir}/xorg/modules/drivers %{_libdir}/xorg/modules/drivers/*.so %{_libdir}/xorg/modules/drivers/*.la -%doc /usr/share/man/man4/freedreno.4.gz +%doc %{_mandir}/man4/freedreno.4.gz +/usr/share/X11/xorg.conf.d/42-freedreno.conf %changelog ++++++ xf86-video-freedreno-1.1.0.tar.bz2 -> xf86-video-freedreno-1.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/Makefile.am new/xf86-video-freedreno-1.2.0/Makefile.am --- old/xf86-video-freedreno-1.1.0/Makefile.am 2014-03-05 14:32:05.000000000 +0100 +++ new/xf86-video-freedreno-1.2.0/Makefile.am 2014-07-14 19:52:33.000000000 +0200 @@ -19,4 +19,4 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign -SUBDIRS = src man +SUBDIRS = src man conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/Makefile.in new/xf86-video-freedreno-1.2.0/Makefile.in --- old/xf86-video-freedreno-1.1.0/Makefile.in 2014-05-06 15:10:50.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/Makefile.in 2014-07-14 19:58:13.000000000 +0200 @@ -327,6 +327,7 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -362,7 +363,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src man +SUBDIRS = src man conf all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/NEWS new/xf86-video-freedreno-1.2.0/NEWS --- old/xf86-video-freedreno-1.1.0/NEWS 2014-05-06 15:08:58.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/NEWS 2014-07-14 19:57:11.000000000 +0200 @@ -1,3 +1,13 @@ +Release 1.2.0 (2014-07-14) +========================== + + * support for server managed fd's (ie. running xserver as non-root) + + * platform-probe and autoconfig support, so no .conf file needed + with xserver 1.16+ + + * bump libdrm requirement, and misc fixes + Release 1.1.0 (2014-05-06) ========================== Overdue for another release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/conf/42-freedreno.conf new/xf86-video-freedreno-1.2.0/conf/42-freedreno.conf --- old/xf86-video-freedreno-1.1.0/conf/42-freedreno.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-freedreno-1.2.0/conf/42-freedreno.conf 2014-07-14 19:52:33.000000000 +0200 @@ -0,0 +1,5 @@ +Section "OutputClass" + Identifier "Video driver for Qualcomm processors" + MatchDriver "msm" + Driver "freedreno" +EndSection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/conf/Makefile.am new/xf86-video-freedreno-1.2.0/conf/Makefile.am --- old/xf86-video-freedreno-1.1.0/conf/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-freedreno-1.2.0/conf/Makefile.am 2014-07-14 19:52:33.000000000 +0200 @@ -0,0 +1,23 @@ +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +if HAS_XORG_CONF_DIR +dist_config_DATA = 42-freedreno.conf +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/conf/Makefile.in new/xf86-video-freedreno-1.2.0/conf/Makefile.in --- old/xf86-video-freedreno-1.1.0/conf/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-freedreno-1.2.0/conf/Makefile.in 2014-07-14 19:58:13.000000000 +0200 @@ -0,0 +1,533 @@ +# Makefile.in generated by automake 1.13.4 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Copyright 2005 Adam Jackson. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, and/or sell copies of the Software, and to permit persons to whom +# the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = conf +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(am__dist_config_DATA_DIST) +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_config_DATA_DIST = 42-freedreno.conf +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(configdir)" +DATA = $(dist_config_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +DRIVER_NAME = @DRIVER_NAME@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ +LIBUDEV_LIBS = @LIBUDEV_LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +VERSION = @VERSION@ +XATRACKER_CFLAGS = @XATRACKER_CFLAGS@ +XATRACKER_LIBS = @XATRACKER_LIBS@ +XEXT_CFLAGS = @XEXT_CFLAGS@ +XEXT_LIBS = @XEXT_LIBS@ +XORG_CFLAGS = @XORG_CFLAGS@ +XORG_LIBS = @XORG_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +configdir = @configdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@HAS_XORG_CONF_DIR_TRUE@dist_config_DATA = 42-freedreno.conf +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign conf/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign conf/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_configDATA: $(dist_config_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(configdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(configdir)" || exit $$?; \ + done + +uninstall-dist_configDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(configdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_configDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_configDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_configDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dist_configDATA + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/configure new/xf86-video-freedreno-1.2.0/configure --- old/xf86-video-freedreno-1.1.0/configure 2014-05-06 15:10:50.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/configure 2014-07-14 19:58:14.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-video-freedreno 1.1.0. +# Generated by GNU Autoconf 2.69 for xf86-video-freedreno 1.2.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-freedreno' PACKAGE_TARNAME='xf86-video-freedreno' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='xf86-video-freedreno 1.1.0' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='xf86-video-freedreno 1.2.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi' PACKAGE_URL='' @@ -638,6 +638,9 @@ LIBOBJS DRIVER_NAME moduledir +HAS_XORG_CONF_DIR_FALSE +HAS_XORG_CONF_DIR_TRUE +configdir LIBUDEV_FALSE LIBUDEV_TRUE LIBUDEV_LIBS @@ -810,6 +813,7 @@ with_sysroot enable_libtool_lock with_xorg_module_dir +with_xorg_conf_dir ' ac_precious_vars='build_alias host_alias @@ -1373,7 +1377,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-freedreno 1.1.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-freedreno 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1444,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-freedreno 1.1.0:";; + short | recursive ) echo "Configuration of xf86-video-freedreno 1.2.0:";; esac cat <<\_ACEOF @@ -1484,6 +1488,9 @@ --with-xorg-module-dir=DIR Default xorg module directory [[default=$libdir/xorg/modules]] + --with-xorg-conf-dir=DIR + Default xorg.conf.d directory [[default=from + $PKG_CONFIG xorg-server]] Some influential environment variables: CC C compiler command @@ -1580,7 +1587,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-freedreno configure 1.1.0 +xf86-video-freedreno configure 1.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1904,7 +1911,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-freedreno $as_me 1.1.0, which was +It was created by xf86-video-freedreno $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2772,7 +2779,7 @@ # Define the identity of the package. PACKAGE='xf86-video-freedreno' - VERSION='1.1.0' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -18652,12 +18659,12 @@ pkg_cv_XORG_CFLAGS="$XORG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm libdrm_freedreno xorg-server xproto libudev \$REQUIRED_MODULES\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev \$REQUIRED_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>/dev/null` + pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18669,12 +18676,12 @@ pkg_cv_XORG_LIBS="$XORG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm libdrm_freedreno xorg-server xproto libudev \$REQUIRED_MODULES\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev \$REQUIRED_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>/dev/null` + pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18695,14 +18702,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>&1` + XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>&1` else - XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>&1` + XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XORG_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES) were not met: + as_fn_error $? "Package requirements (libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES) were not met: $XORG_PKG_ERRORS @@ -18986,6 +18993,42 @@ + +# Define a configure option for an alternate X Server configuration directory +sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` + +# Check whether --with-xorg-conf-dir was given. +if test "${with_xorg_conf_dir+set}" = set; then : + withval=$with_xorg_conf_dir; configdir="$withval" +else + configdir="$sysconfigdir" +fi + + + +# Older xserver is unhappy to encounter the new OutputClass +# sections, so avoid installing them if built for older +# server: +if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.15.99.904\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.15.99.904") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + sysconfigdir="" +fi + + if test "x$sysconfigdir" != "x"; then + HAS_XORG_CONF_DIR_TRUE= + HAS_XORG_CONF_DIR_FALSE='#' +else + HAS_XORG_CONF_DIR_TRUE='#' + HAS_XORG_CONF_DIR_FALSE= +fi + + # Checks for header files. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -19135,7 +19178,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile conf/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19293,6 +19336,10 @@ as_fn_error $? "conditional \"LIBUDEV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_XORG_CONF_DIR_TRUE}" && test -z "${HAS_XORG_CONF_DIR_FALSE}"; then + as_fn_error $? "conditional \"HAS_XORG_CONF_DIR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -19690,7 +19737,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-freedreno $as_me 1.1.0, which was +This file was extended by xf86-video-freedreno $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19756,7 +19803,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-video-freedreno config.status 1.1.0 +xf86-video-freedreno config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20168,6 +20215,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/configure.ac new/xf86-video-freedreno-1.2.0/configure.ac --- old/xf86-video-freedreno-1.1.0/configure.ac 2014-05-06 15:09:30.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/configure.ac 2014-07-14 19:57:19.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-freedreno], - [1.1.0], + [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi], [xf86-video-freedreno]) @@ -60,7 +60,7 @@ #XORG_DRIVER_CHECK_EXT(XV, videoproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [libdrm libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [libdrm >= 2.4.54 libdrm_freedreno xorg-server xproto libudev $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), @@ -80,6 +80,23 @@ AC_SUBST([LIBUDEV_CFLAGS]) AC_SUBST([LIBUDEV_LIBS]) + +# Define a configure option for an alternate X Server configuration directory +sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` +AC_ARG_WITH(xorg-conf-dir, + AC_HELP_STRING([--with-xorg-conf-dir=DIR], + [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), + [configdir="$withval"], + [configdir="$sysconfigdir"]) +AC_SUBST(configdir) + +# Older xserver is unhappy to encounter the new OutputClass +# sections, so avoid installing them if built for older +# server: +PKG_CHECK_EXISTS([xorg-server >= 1.15.99.904], [], [sysconfigdir=""]) + +AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) + # Checks for header files. AC_HEADER_STDC @@ -98,4 +115,5 @@ Makefile src/Makefile man/Makefile + conf/Makefile ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/man/Makefile.in new/xf86-video-freedreno-1.2.0/man/Makefile.in --- old/xf86-video-freedreno-1.1.0/man/Makefile.in 2014-05-06 15:10:50.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/man/Makefile.in 2014-07-14 19:58:13.000000000 +0200 @@ -277,6 +277,7 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/src/Makefile.in new/xf86-video-freedreno-1.2.0/src/Makefile.in --- old/xf86-video-freedreno-1.1.0/src/Makefile.in 2014-05-06 15:10:50.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/src/Makefile.in 2014-07-14 19:58:14.000000000 +0200 @@ -320,6 +320,7 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-freedreno-1.1.0/src/msm-driver.c new/xf86-video-freedreno-1.2.0/src/msm-driver.c --- old/xf86-video-freedreno-1.1.0/src/msm-driver.c 2014-05-05 01:55:33.000000000 +0200 +++ new/xf86-video-freedreno-1.2.0/src/msm-driver.c 2014-07-08 15:47:07.000000000 +0200 @@ -129,6 +129,17 @@ dri_drm_get_perms, }; +static void +free_msm(MSMPtr pMsm) +{ + if (pMsm->drmFD) +#ifdef XF86_PDEV_SERVER_FD + if (!(pMsm->pEnt->location.type == BUS_PLATFORM && + (pMsm->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))) +#endif + drmClose(pMsm->drmFD); + free(pMsm); +} static Bool MSMInitDRM(ScrnInfoPtr pScrn) @@ -212,7 +223,7 @@ pScrn->progClock = TRUE; pScrn->chipset = MSM_DRIVER_NAME; - INFO_MSG("MSM/Qualcomm processor (video memory: %dkB)", pScrn->videoRam / 1024); + INFO_MSG("MSM/Qualcomm processor"); if (!MSMInitDRM(pScrn)) { ERROR_MSG("Unable to open DRM"); @@ -236,7 +247,7 @@ pMsm->options = malloc(sizeof(MSMOptions)); if (pMsm->options == NULL) { - free(pMsm); + free_msm(pMsm); return FALSE; } @@ -279,18 +290,18 @@ xf86SetDpi(pScrn, 0, 0); if (!xf86SetWeight(pScrn, defaultWeight, defaultWeight)) { - free(pMsm); + free_msm(pMsm); return FALSE; } /* Initialize default visual */ if (!xf86SetDefaultVisual(pScrn, -1)) { - free(pMsm); + free_msm(pMsm); return FALSE; } if (!xf86SetGamma(pScrn, zeros)) { - free(pMsm); + free_msm(pMsm); return FALSE; } @@ -545,6 +556,14 @@ } } +static void +MSMFreeScreen(FREE_SCREEN_ARGS_DECL) +{ + SCRN_INFO_PTR(arg); + MSMPtr pMsm = MSMPTR(pScrn); + free_msm(pMsm); +} + /* ------------------------------------------------------------ */ /* Following is the standard driver setup that probes for the */ /* hardware and sets up the structures. */ @@ -657,12 +676,113 @@ pScrn->SwitchMode = MSMSwitchMode; pScrn->EnterVT = MSMEnterVT; pScrn->LeaveVT = MSMLeaveVT; + pScrn->FreeScreen = MSMFreeScreen; } free(sections); return foundScreen; } +static Bool +MSMDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data) +{ + xorgHWFlags *flag; + + switch (op) { + case GET_REQUIRED_HW_INTERFACES: + flag = (CARD32 *)data; + (*flag) = 0; + return TRUE; +#ifdef XF86_PDEV_SERVER_FD + case SUPPORTS_SERVER_FDS: + return TRUE; +#endif + default: + return FALSE; + } +} + +#ifdef XSERVER_PLATFORM_BUS +static Bool probe_hw(struct xf86_platform_device *dev) +{ + int fd; + + /* NOTE: for kgsl we still need config file to find fbdev device, + * so it will always be probed through the old MSMProbe path. So + * only look for drm/msm here: + */ + +#if XF86_PDEV_SERVER_FD + if (dev && (dev->flags & XF86_PDEV_SERVER_FD)) { + drmVersionPtr version; + + fd = xf86_get_platform_device_int_attrib(dev, ODEV_ATTRIB_FD, -1); + if (fd == -1) + return FALSE; + + version = drmGetVersion(fd); + /* make sure we have the right device: */ + if (version && (strcmp(version->name, "msm") == 0)) { + drmFreeVersion(version); + return TRUE; + } + + drmFreeVersion(version); + return FALSE; + } +#endif + + fd = drmOpen("msm", NULL); + if (fd != -1) { + close(fd); + return TRUE; + } + + return FALSE; +} + +static Bool +MSMPlatformProbe(DriverPtr driver, + int entity_num, int flags, struct xf86_platform_device *dev, + intptr_t match_data) +{ + ScrnInfoPtr pScrn = NULL; + int scr_flags = 0; + + /* Note: at least for now there is no point in gpu screens.. and + * allowing them exposes a bug in older xservers that would result + * in the device probed as a gpu screen rather than regular screen + * resulting in "No screens found". + * + * If later there is actually reason to support GPU screens, track + * down the first xorg ABI # that contains the fix, and make this + * conditional on that or later ABI versions. Otherwise you will + * break things for people with older xservers. + * + if (flags & PLATFORM_PROBE_GPU_SCREEN) + scr_flags = XF86_ALLOCATE_GPU_SCREEN; + */ + + if (probe_hw(dev)) { + pScrn = xf86AllocateScreen(driver, scr_flags); + xf86AddEntityToScreen(pScrn, entity_num); + + pScrn->driverVersion = MSM_VERSION_CURRENT; + pScrn->driverName = MSM_NAME; + pScrn->name = MSM_NAME; + pScrn->Probe = MSMProbe; + pScrn->PreInit = MSMPreInit; + pScrn->ScreenInit = MSMScreenInit; + pScrn->SwitchMode = MSMSwitchMode; + pScrn->EnterVT = MSMEnterVT; + pScrn->LeaveVT = MSMLeaveVT; + pScrn->FreeScreen = MSMFreeScreen; + } + + return pScrn != NULL; +} +#endif + _X_EXPORT DriverRec freedrenoDriver = { MSM_VERSION_CURRENT, MSM_DRIVER_NAME, @@ -671,7 +791,12 @@ MSMAvailableOptions, NULL, 0, - NULL + MSMDriverFunc, + NULL, + NULL, /* pci_probe */ +#ifdef XSERVER_PLATFORM_BUS + MSMPlatformProbe, +#endif }; MODULESETUPPROTO(freedrenoSetup); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org