pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-video-ati6 Since this package is only used on...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8396a1221520
branches: trunk
changeset: 626047:8396a1221520
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Oct 31 00:07:23 2013 +0000
description:
Since this package is only used on NetBSD, pull over all patches from
xsrc. Bump PKGREVISION.
diffstat:
x11/xf86-video-ati6/Makefile | 3 +-
x11/xf86-video-ati6/distinfo | 11 +-
x11/xf86-video-ati6/options.mk | 4 +-
x11/xf86-video-ati6/patches/patch-src_atombios__crtc.c | 130 +++++++
x11/xf86-video-ati6/patches/patch-src_atombios__output.c | 203 ++++++++++++
x11/xf86-video-ati6/patches/patch-src_legacy__crtc.c | 24 +
x11/xf86-video-ati6/patches/patch-src_radeon__accelfuncs.c | 12 +
x11/xf86-video-ati6/patches/patch-src_radeon__crtc.c | 41 ++
x11/xf86-video-ati6/patches/patch-src_radeon__dri.c | 85 +++++
x11/xf86-video-ati6/patches/patch-src_radeon__driver.c | 23 +
x11/xf86-video-ati6/patches/patch-src_radeon__exa__render.c | 22 +
x11/xf86-video-ati6/patches/patch-src_radeon__render.c | 46 ++
12 files changed, 600 insertions(+), 4 deletions(-)
diffs (truncated from 668 to 300 lines):
diff -r 12fff818fd1b -r 8396a1221520 x11/xf86-video-ati6/Makefile
--- a/x11/xf86-video-ati6/Makefile Wed Oct 30 23:53:10 2013 +0000
+++ b/x11/xf86-video-ati6/Makefile Thu Oct 31 00:07:23 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/08/29 19:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2013/10/31 00:07:23 wiz Exp $
DISTNAME= xf86-video-ati-6.14.6
PKGNAME= ${DISTNAME:S/ati/ati6/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff -r 12fff818fd1b -r 8396a1221520 x11/xf86-video-ati6/distinfo
--- a/x11/xf86-video-ati6/distinfo Wed Oct 30 23:53:10 2013 +0000
+++ b/x11/xf86-video-ati6/distinfo Thu Oct 31 00:07:23 2013 +0000
@@ -1,5 +1,14 @@
-$NetBSD: distinfo,v 1.2 2013/06/18 17:13:11 wiz Exp $
+$NetBSD: distinfo,v 1.3 2013/10/31 00:07:23 wiz Exp $
SHA1 (xf86-video-ati-6.14.6.tar.bz2) = b30383c7e5487c1df403a3af19fce8626d617a8d
RMD160 (xf86-video-ati-6.14.6.tar.bz2) = e285bff97a23f6e6f8553f1c010c840e6df882a8
Size (xf86-video-ati-6.14.6.tar.bz2) = 1139495 bytes
+SHA1 (patch-src_atombios__crtc.c) = e6ec24fdc63e3744db9442ab5e12ffe6949eef19
+SHA1 (patch-src_atombios__output.c) = ce3720c1d1cfd1f65023cea2745259af30a59add
+SHA1 (patch-src_legacy__crtc.c) = 6be802fa29797265efeceaadec9607de334dbfc8
+SHA1 (patch-src_radeon__accelfuncs.c) = f9d0ba2a0b7f62a56eecea117c4339f0e18b1e52
+SHA1 (patch-src_radeon__crtc.c) = c22e5a9c4119a4c6aa3f64f83b326effe270c96c
+SHA1 (patch-src_radeon__dri.c) = 479f58f8493543220b931182ab105309f8c035ab
+SHA1 (patch-src_radeon__driver.c) = 16bf5852e3ad684fca9c64768822868d4a224500
+SHA1 (patch-src_radeon__exa__render.c) = 831dd1e89bce2b7d8fd323b6b714cb457d2824b2
+SHA1 (patch-src_radeon__render.c) = 919c108ba8bafdcdb4e0fba80da621674a62de8c
diff -r 12fff818fd1b -r 8396a1221520 x11/xf86-video-ati6/options.mk
--- a/x11/xf86-video-ati6/options.mk Wed Oct 30 23:53:10 2013 +0000
+++ b/x11/xf86-video-ati6/options.mk Thu Oct 31 00:07:23 2013 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2013/06/18 17:13:11 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2013/10/31 00:07:23 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xf86-video-ati6
PKG_SUPPORTED_OPTIONS= xf86-video-ati6-kms
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
diff -r 12fff818fd1b -r 8396a1221520 x11/xf86-video-ati6/patches/patch-src_atombios__crtc.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_atombios__crtc.c Thu Oct 31 00:07:23 2013 +0000
@@ -0,0 +1,130 @@
+$NetBSD: patch-src_atombios__crtc.c,v 1.1 2013/10/31 00:07:24 wiz Exp $
+
+--- src/atombios_crtc.c.orig 2012-06-25 08:19:41.000000000 +0000
++++ src/atombios_crtc.c
+@@ -87,7 +87,7 @@ atombios_lock_crtc(atomBiosHandlePtr ato
+ data.exec.pspace = &crtc_data;
+
+ if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("%s CRTC %d success\n", lock? "Lock":"Unlock", crtc);
++/* ErrorF("%s CRTC %d success\n", lock? "Lock":"Unlock", crtc); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -110,7 +110,7 @@ atombios_enable_crtc(atomBiosHandlePtr a
+ data.exec.pspace = &crtc_data;
+
+ if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("%s CRTC %d success\n", state? "Enable":"Disable", crtc);
++/* ErrorF("%s CRTC %d success\n", state? "Enable":"Disable", crtc); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -133,7 +133,7 @@ atombios_enable_crtc_memreq(atomBiosHand
+ data.exec.pspace = &crtc_data;
+
+ if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("%s CRTC memreq %d success\n", state? "Enable":"Disable", crtc);
++/* ErrorF("%s CRTC memreq %d success\n", state? "Enable":"Disable", crtc); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -157,7 +157,7 @@ atombios_blank_crtc(atomBiosHandlePtr at
+ data.exec.pspace = &crtc_data;
+
+ if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("%s CRTC %d success\n", state? "Blank":"Unblank", crtc);
++/* ErrorF("%s CRTC %d success\n", state? "Blank":"Unblank", crtc); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -231,7 +231,7 @@ atombios_set_crtc_timing(xf86CrtcPtr crt
+ data.exec.pspace = ¶m;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Set CRTC Timing success\n");
++/* ErrorF("Set CRTC Timing success\n"); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -282,7 +282,7 @@ atombios_set_crtc_dtd_timing(xf86CrtcPtr
+ data.exec.pspace = ¶m;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Set DTD CRTC Timing success\n");
++/* ErrorF("Set DTD CRTC Timing success\n"); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -336,7 +336,7 @@ atombios_pick_pll(xf86CrtcPtr crtc)
+ } else
+ radeon_crtc->pll_id = radeon_crtc->crtc_id;
+
+- ErrorF("Picked PLL %d\n", radeon_crtc->pll_id);
++/* ErrorF("Picked PLL %d\n", radeon_crtc->pll_id); */
+
+ for (o = 0; o < xf86_config->num_output; o++) {
+ output = xf86_config->output[o];
+@@ -449,11 +449,11 @@ static uint32_t atombios_adjust_pll(xf86
+ args.v1.ucTransmitterID = radeon_encoder->encoder_id;
+ args.v1.ucEncodeMode = atombios_get_encoder_mode(output);
+
+- ErrorF("before %d\n", args.v1.usPixelClock);
++/* ErrorF("before %d\n", args.v1.usPixelClock); */
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+ adjusted_clock = le16_to_cpu(args.v1.usPixelClock) * 10;
+ }
+- ErrorF("after %d\n", args.v1.usPixelClock);
++/* ErrorF("after %d\n", args.v1.usPixelClock); */
+ break;
+ case 3:
+ args.v3.sInput.usPixelClock = cpu_to_le16(adjusted_clock / 10);
+@@ -467,7 +467,7 @@ static uint32_t atombios_adjust_pll(xf86
+ // if SS
+ // args.v3.sInput.ucDispPllConfig |= DISPPLL_CONFIG_SS_ENABLE;
+
+- ErrorF("before %d 0x%x\n", args.v3.sInput.usPixelClock, args.v3.sInput.ucDispPllConfig);
++/* ErrorF("before %d 0x%x\n", args.v3.sInput.usPixelClock, args.v3.sInput.ucDispPllConfig); */
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+ adjusted_clock = args.v3.sOutput.ulDispPllFreq * 10;
+ if (args.v3.sOutput.ucRefDiv) {
+@@ -478,8 +478,8 @@ static uint32_t atombios_adjust_pll(xf86
+ pll_flags |= RADEON_PLL_USE_POST_DIV;
+ info->pll.post_div = args.v3.sOutput.ucPostDiv;
+ }
+- ErrorF("after %d %d %d\n", args.v3.sOutput.ulDispPllFreq,
+- args.v3.sOutput.ucRefDiv, args.v3.sOutput.ucPostDiv);
++/* ErrorF("after %d %d %d\n", args.v3.sOutput.ulDispPllFreq,
++ args.v3.sOutput.ucRefDiv, args.v3.sOutput.ucPostDiv); */
+ }
+ break;
+ default:
+@@ -568,7 +568,7 @@ atombios_crtc_set_dcpll(xf86CrtcPtr crtc
+ data.exec.pspace = &args;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Set DCPLL success\n");
++/* ErrorF("Set DCPLL success\n"); */
+ return;
+ }
+
+@@ -710,7 +710,7 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc,
+ data.exec.pspace = &args;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Set CRTC %d PLL success\n", radeon_crtc->crtc_id);
++/* ErrorF("Set CRTC %d PLL success\n", radeon_crtc->crtc_id); */
+ return;
+ }
+
+@@ -991,8 +991,8 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
+ tilingChanged = RADEONSetTiling(pScrn);
+ }
+
+- ErrorF("Mode %dx%d - %d %d %d\n", adjusted_mode->CrtcHDisplay, adjusted_mode->CrtcVDisplay,
+- adjusted_mode->CrtcHTotal, adjusted_mode->CrtcVTotal, adjusted_mode->Flags);
++/* ErrorF("Mode %dx%d - %d %d %d\n", adjusted_mode->CrtcHDisplay, adjusted_mode->CrtcVDisplay,
++ adjusted_mode->CrtcHTotal, adjusted_mode->CrtcVTotal, adjusted_mode->Flags); */
+
+ RADEONInitMemMapRegisters(pScrn, info->ModeReg, info);
+ RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
diff -r 12fff818fd1b -r 8396a1221520 x11/xf86-video-ati6/patches/patch-src_atombios__output.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_atombios__output.c Thu Oct 31 00:07:23 2013 +0000
@@ -0,0 +1,203 @@
+$NetBSD: patch-src_atombios__output.c,v 1.1 2013/10/31 00:07:24 wiz Exp $
+
+--- src/atombios_output.c.orig 2012-06-25 08:19:41.000000000 +0000
++++ src/atombios_output.c
+@@ -234,7 +234,7 @@ atombios_output_dac_setup(xf86OutputPtr
+ data.exec.pspace = &disp_data;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Output DAC%d setup success\n", num);
++/* ErrorF("Output DAC%d setup success\n", num); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -298,7 +298,7 @@ atombios_output_tv_setup(xf86OutputPtr o
+ data.exec.pspace = &disp_data;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Output TV setup success\n");
++/* ErrorF("Output TV setup success\n"); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -333,7 +333,7 @@ atombios_external_tmds_setup(xf86OutputP
+ data.exec.pspace = &disp_data;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("External TMDS setup success\n");
++/* ErrorF("External TMDS setup success\n"); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -364,7 +364,7 @@ atombios_output_ddia_setup(xf86OutputPtr
+ data.exec.pspace = &disp_data;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("DDIA setup success\n");
++/* ErrorF("DDIA setup success\n"); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -503,7 +503,7 @@ atombios_output_digital_setup(xf86Output
+ data.exec.dataSpace = (void *)&space;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Output digital setup success\n");
++/* ErrorF("Output digital setup success\n"); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -826,7 +826,7 @@ atombios_output_dig_encoder_setup(xf86Ou
+ data.exec.pspace = &disp_data;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Output DIG%d encoder setup success\n", radeon_output->dig_encoder);
++/* ErrorF("Output DIG%d encoder setup success\n", radeon_output->dig_encoder); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -1011,10 +1011,12 @@ atombios_output_dig_transmitter_setup(xf
+ data.exec.pspace = &disp_data;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
++/*
+ if (IS_DCE32_VARIANT)
+ ErrorF("Output UNIPHY%d transmitter setup success\n", num);
+ else
+ ErrorF("Output DIG%d transmitter setup success\n", num);
++*/
+ return ATOM_SUCCESS;
+ }
+
+@@ -1299,7 +1301,7 @@ atombios_output_yuv_setup(xf86OutputPtr
+
+ OUTREG(reg, temp);
+
+- ErrorF("crtc %d YUV %s setup success\n", radeon_crtc->crtc_id, enable ? "enable" : "disable");
++/* ErrorF("crtc %d YUV %s setup success\n", radeon_crtc->crtc_id, enable ? "enable" : "disable"); */
+ return ATOM_SUCCESS;
+ }
+
+@@ -1357,7 +1359,7 @@ atombios_output_overscan_setup(xf86Outpu
+ data.exec.pspace = &overscan_param;
+
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+- ErrorF("Set CRTC %d Overscan success\n", radeon_crtc->crtc_id);
++/* ErrorF("Set CRTC %d Overscan success\n", radeon_crtc->crtc_id); */
+ return ATOM_SUCCESS ;
+ }
+
+@@ -1414,13 +1416,13 @@ atombios_output_scaler_setup(xf86OutputP
+ break;
+ }
+ disp_data.ucEnable = SCALER_ENABLE_MULTITAP_MODE;
+- ErrorF("Using TV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable);
++/* ErrorF("Using TV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable); */
+ } else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT)) {
+ disp_data.ucTVStandard = ATOM_TV_CV;
+ disp_data.ucEnable = SCALER_ENABLE_MULTITAP_MODE;
+- ErrorF("Using CV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable);
++/* ErrorF("Using CV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable); */
+ } else if (radeon_output->Flags & RADEON_USE_RMX) {
+- ErrorF("Using RMX\n");
++/* ErrorF("Using RMX\n"); */
+ if (radeon_output->rmx_type == RMX_FULL)
+ disp_data.ucEnable = ATOM_SCALER_EXPANSION;
+ else if (radeon_output->rmx_type == RMX_CENTER)
+@@ -1428,7 +1430,7 @@ atombios_output_scaler_setup(xf86OutputP
+ else if (radeon_output->rmx_type == RMX_ASPECT)
+ disp_data.ucEnable = ATOM_SCALER_EXPANSION;
+ } else {
+- ErrorF("Not using RMX\n");
++/* ErrorF("Not using RMX\n"); */
+ if (IS_AVIVO_VARIANT)
+ disp_data.ucEnable = ATOM_SCALER_DISABLE;
+ else
+@@ -1442,10 +1444,10 @@ atombios_output_scaler_setup(xf86OutputP
Home |
Main Index |
Thread Index |
Old Index