diff --git a/x11-drivers/xf86-video-ast/Makefile b/x11-drivers/xf86-video-ast/Makefile index b9bfc30f72ee..d9c83f9a74d3 100644 --- a/x11-drivers/xf86-video-ast/Makefile +++ b/x11-drivers/xf86-video-ast/Makefile @@ -1,18 +1,16 @@ PORTNAME= xf86-video-ast -PORTVERSION= 1.1.5 -PORTREVISION= 6 +DISTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ASPEED display driver -WWW= https://www.x.org/ +WWW= https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= xorg-cat:driver -INSTALL_TARGET= install-strip +USES= tar:xz xorg-cat:driver PLIST_FILES= lib/xorg/modules/drivers/ast_drv.so .include diff --git a/x11-drivers/xf86-video-ast/distinfo b/x11-drivers/xf86-video-ast/distinfo index c50662023881..ec78c6d4961b 100644 --- a/x11-drivers/xf86-video-ast/distinfo +++ b/x11-drivers/xf86-video-ast/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485310562 -SHA256 (xorg/driver/xf86-video-ast-1.1.5.tar.bz2) = 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de -SIZE (xorg/driver/xf86-video-ast-1.1.5.tar.bz2) = 339848 +TIMESTAMP = 1782445809 +SHA256 (xorg/driver/xf86-video-ast-1.2.1.tar.xz) = df6b630e193c32972a20b02fa6db7fd38d026e835464e26d469de32e31c87cb6 +SIZE (xorg/driver/xf86-video-ast-1.2.1.tar.xz) = 322180 diff --git a/x11-drivers/xf86-video-ast/files/patch-ast_vgatool.c b/x11-drivers/xf86-video-ast/files/patch-ast_vgatool.c deleted file mode 100644 index 72a69b1594b2..000000000000 --- a/x11-drivers/xf86-video-ast/files/patch-ast_vgatool.c +++ /dev/null @@ -1,33 +0,0 @@ ---- src/ast_vgatool.c.orig 2015-08-19 01:24:48.000000000 +0000 -+++ src/ast_vgatool.c 2020-09-17 14:19:18.843298000 +0000 -@@ -432,11 +432,27 @@ - *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; - *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; - -+ /* Based on the Linux DRM driver we might not be able to access this -+ * If we can't just use some sane defaults. -+ * -+ * See drm/drivers/gpu/drm/ast/ast_main.c line 295. -+ */ -+ - *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000) = 0xFC600309; -- do { -- ; -- } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) != 0x01); -+ for (ulData = 10000; ulData > 0; ulData--) -+ if (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) == 0x01) -+ break; - -+ if (ulData == 0) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Unable to read DRAM information, using defaults\n"); -+ pAST->ulDRAMBusWidth = 16; -+ pAST->jDRAMType = DRAMTYPE_1Gx16; -+ if (pAST->jChipType == AST2500) -+ pAST->ulMCLK = 800; -+ else -+ pAST->ulMCLK = 396; -+ return; -+ } - ulData = *(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10004); - - /* Get BusWidth */ diff --git a/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c b/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c index 172e8a4ed7a3..d87717d04398 100644 --- a/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c +++ b/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c @@ -1,19 +1,19 @@ ---- src/ast_driver.c.orig 2024-08-01 13:20:24 UTC +--- src/ast_driver.c.orig 2025-08-09 00:45:40 UTC +++ src/ast_driver.c -@@ -273,6 +273,8 @@ ASTProbe(DriverPtr drv, int flags) +@@ -259,6 +259,8 @@ ASTProbe(DriverPtr drv, int flags) #ifdef XSERVER_LIBPCIACCESS { +#ifndef __FreeBSD__ + /* FreeBSD always has vgapci driver attached. */ struct pci_device *pPci = xf86GetPciInfoForEntity(usedChips[i]); if (pci_device_has_kernel_driver(pPci)) { -@@ -289,6 +291,7 @@ ASTProbe(DriverPtr drv, int flags) +@@ -271,6 +273,7 @@ ASTProbe(DriverPtr drv, int flags) free(devSections); return FALSE; } +#endif } #endif diff --git a/x11-drivers/xf86-video-ast/pkg-descr b/x11-drivers/xf86-video-ast/pkg-descr index 3561cbeee10a..b04eb02442c5 100644 --- a/x11-drivers/xf86-video-ast/pkg-descr +++ b/x11-drivers/xf86-video-ast/pkg-descr @@ -1 +1 @@ -This package contains the X.Org xf86-video-ast driver. +This is the ASpeed Technologies graphics driver for the Xorg X server.