xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 configure.ac          |    9 ++-------
 src/Makefile.am       |    5 +----
 src/atombios_crtc.c   |    6 +-----
 src/atombios_output.c |   13 ++++---------
 src/radeon_atombios.c |    1 +
 5 files changed, 9 insertions(+), 25 deletions(-)

New commits:
commit 766f464dfdfccadef23e4232f2bce5db22195513
Author: Alex Deucher <alex at cube.(none)>
Date:   Thu Mar 6 13:35:43 2008 -0500

    RADEON: take 2 on proper pragma pack support for bsds
    
    See bug 14594.  Based on suggestion by Henry Zhao

diff --git a/configure.ac b/configure.ac
index 8321915..b644348 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,14 +233,9 @@ fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 case $host_os in
-  *freebsd*)
-  AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;;
-  *netbsd*)
-  AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;;
-  *openbsd*)
-  AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;;
+  *linux*)
+  AC_DEFINE(FGL_LINUX, 1, [Use linux pragma pack]) ;;
 esac
-AM_CONDITIONAL(ALT_PRAGMA_PACK, test "x$ALT_PRAGMA_PACK" = xyes)
 
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([DRI_CFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6fe0695..5333495 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,11 +66,8 @@ if USE_EXA
 RADEON_EXA_SOURCES = radeon_exa.c
 endif
 
-if ALT_PRAGMA_PACK
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
-else
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
-endif
+
 INCLUDES = -I$(srcdir)/AtomBios/includes
 
 ati_drv_la_LTLIBRARIES = ati_drv.la
diff --git a/src/atombios_output.c b/src/atombios_output.c
index 8e0776d..06e5a77 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -398,7 +398,6 @@ atombios_output_dig1_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode
 
     disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
     disp_data.usPixelClock = mode->Clock / 10;
-    // not sure on clk src...
     disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
     if (mode->Clock > 165000)
 	disp_data.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
@@ -476,7 +475,6 @@ atombios_output_dig2_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode
 
     disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
     disp_data.usPixelClock = mode->Clock / 10;
-    // not sure on clk src...
     disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
     if (mode->Clock > 165000)
 	disp_data.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
commit a842ce9ca6494e724a7828cead9b61c9ef02b6aa
Author: Alex Deucher <alex at cube.(none)>
Date:   Thu Mar 6 12:32:18 2008 -0500

    DCE3.0: Minor fixups

diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index 8f76e30..f144e42 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -1,10 +1,5 @@
  /*
  * Copyright © 2007 Red Hat, Inc.
- *
- * PLL code is:
- * Copyright 2007  Luc Verhaegen <lverhaegen at novell.com>
- * Copyright 2007  Matthias Hopf <mhopf at novell.com>
- * Copyright 2007  Egbert Eich   <eich at novell.com>
  * Copyright 2007  Advanced Micro Devices, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,6 +23,7 @@
  *
  * Authors:
  *    Dave Airlie <airlied at redhat.com>
+ *    Alex Deucher <alexander.deucher at amd.com>
  *
  */
 /*
diff --git a/src/atombios_output.c b/src/atombios_output.c
index 81740a8..8e0776d 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -474,10 +474,10 @@ atombios_output_dig2_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode
     AtomBiosArgRec data;
     unsigned char *space;
 
-    disp_data.ucAction = ATOM_TRANSMITTER_ACTION_SETUP;
+    disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
     disp_data.usPixelClock = mode->Clock / 10;
     // not sure on clk src...
-    disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
+    disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
     if (mode->Clock > 165000)
 	disp_data.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
 			       ATOM_TRANSMITTER_CONFIG_LINKA_B |
@@ -492,11 +492,8 @@ atombios_output_dig2_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode
     data.exec.pspace = &disp_data;
 
     if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
-	disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE;
-	if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
-	    ErrorF("Output DIG2 transmitter setup success\n");
-	    return ATOM_SUCCESS;
-	}
+	ErrorF("Output DIG2 transmitter setup success\n");
+	return ATOM_SUCCESS;
     }
 
     ErrorF("Output DIG2 transmitter setup failed\n");
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 3efe4c9..91160f9 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1545,6 +1545,7 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+	    case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 		info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_DFP1_INDEX);
 		info->BiosConnector[i].TMDSType = TMDS_INT;
 		break;