Update to drm-kmod including the patches from this port and adding makefile
toggles to disable linux compat. Fix the website address. PR: 41854,43149
This commit is contained in:
parent
7d1b547ad7
commit
a195d38572
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68174
6 changed files with 9 additions and 58 deletions
|
@ -6,11 +6,10 @@
|
|||
#
|
||||
|
||||
PORTNAME= drm-kmod
|
||||
PORTVERSION= 0.9.5
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.9.6
|
||||
CATEGORIES= graphics x11
|
||||
MASTER_SITES= http://people.freebsd.org/~anholt/dri/files/
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= anholt
|
||||
MAINTAINER= anholt@FreeBSD.org
|
||||
|
||||
USE_REINPLACE= yes
|
||||
|
@ -35,6 +34,8 @@ pre-extract:
|
|||
@${ECHO_MSG} "If you are using modules on an SMP system, use "make -DWITH_SMP" to get SMP locking"
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
@${ECHO_MSG} "If you don't want linux compatibility, use make -DDRM_NOLINUX"
|
||||
@${ECHO_MSG}
|
||||
|
||||
pre-patch:
|
||||
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/drm.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
MD5 (drm-kmod-0.9.5.tar.gz) = d231fb965f46137ae19908051bba4ad9
|
||||
MD5 (drm-kmod-0.9.6.tar.gz) = 5c39005a1a71b8b2d9e23e303b58122c
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
--- drm_os_freebsd.h.orig Thu Jan 31 13:44:39 2002
|
||||
+++ drm_os_freebsd.h Sat Apr 13 14:43:40 2002
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
#if __FreeBSD_version >= 500000
|
||||
#define DRM_OS_SPINTYPE struct mtx
|
||||
-#define DRM_OS_SPININIT(l,name) mtx_init(&l, name, MTX_DEF)
|
||||
+#define DRM_OS_SPININIT(l,name) mtx_init(&l, name, NULL, MTX_DEF)
|
||||
#define DRM_OS_SPINLOCK(l) mtx_lock(l)
|
||||
#define DRM_OS_SPINUNLOCK(u) mtx_unlock(u);
|
||||
#define DRM_OS_LOCK lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curthread)
|
||||
@@ -56,7 +56,7 @@
|
||||
#define DRM_OS_STRUCTPROC struct thread
|
||||
#define DRM_OS_CURRENTPID curthread->td_proc->p_pid
|
||||
#define DRM_OS_IOCTL dev_t kdev, u_long cmd, caddr_t data, int flags, struct thread *p
|
||||
-#define DRM_OS_CHECKSUSER suser(p->td_proc)
|
||||
+#define DRM_OS_CHECKSUSER suser(p)
|
||||
#else
|
||||
#define DRM_OS_CURPROC curproc
|
||||
#define DRM_OS_STRUCTPROC struct proc
|
|
@ -1,19 +0,0 @@
|
|||
--- r128/r128_drv.c.orig Tue Mar 19 14:03:24 2002
|
||||
+++ r128/r128_drv.c Tue Mar 19 14:03:51 2002
|
||||
@@ -72,11 +72,11 @@
|
||||
{0x1002, 0x5046, 1, "ATI Rage 128 Pro PF (AGP)"},
|
||||
{0x1002, 0x5050, 0, "ATI Rage 128 Pro PP (PCI)"},
|
||||
{0x1002, 0x5052, 0, "ATI Rage 128 Pro PR (PCI)"},
|
||||
- {0x1002, 0x5053, 0, "ATI Rage 128 RE (PCI)"},
|
||||
- {0x1002, 0x5054, 1, "ATI Rage 128 RF (AGP)"},
|
||||
- {0x1002, 0x5054, 1, "ATI Rage 128 RG (AGP)"},
|
||||
- {0x1002, 0x5055, 0, "ATI Rage 128 RK (PCI)"},
|
||||
- {0x1002, 0x5055, 1, "ATI Rage 128 RL (AGP)"},
|
||||
+ {0x1002, 0x5245, 0, "ATI Rage 128 RE (PCI)"},
|
||||
+ {0x1002, 0x5246, 1, "ATI Rage 128 RF (AGP)"},
|
||||
+ {0x1002, 0x5247, 1, "ATI Rage 128 RG (AGP)"},
|
||||
+ {0x1002, 0x524b, 0, "ATI Rage 128 RK (PCI)"},
|
||||
+ {0x1002, 0x524c, 1, "ATI Rage 128 RL (AGP)"},
|
||||
{0x1002, 0x534d, 1, "ATI Rage 128 SM (AGP)"},
|
||||
{0x1002, 0x5446, 1, "ATI Rage 128 Pro Ultra TF (AGP)"},
|
||||
{0x1002, 0x544C, 1, "ATI Rage 128 Pro Ultra TL (AGP)"},
|
|
@ -1,11 +0,0 @@
|
|||
--- radeon/radeon_state.c.orig Sat Mar 16 19:55:08 2002
|
||||
+++ radeon/radeon_state.c Sat Mar 16 19:55:26 2002
|
||||
@@ -1060,7 +1060,7 @@
|
||||
DRM_ERROR( "EFAULT on tex->image\n" );
|
||||
DRM_OS_RETURN( EFAULT );
|
||||
}
|
||||
- } else if ( size < 4 ) {
|
||||
+ } else if ( size < 4 && size > 0 ) {
|
||||
size = 4;
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ To load the drivers run (as root):
|
|||
|
||||
# %%PREFIX%%/etc/rc.d/drm.sh start
|
||||
|
||||
To unload it:
|
||||
To unload it (currently made a no-op due to panics):
|
||||
|
||||
# %%PREFIX%%/etc/rc.d/drm.sh stop
|
||||
|
||||
|
@ -14,8 +14,8 @@ It'll also load the drivers automatically when the system is started.
|
|||
Alternatively, you could add %%PREFIX%%/lib/drm to your kern.module_path sysctl
|
||||
and let XFree86 load the drivers for you.
|
||||
|
||||
Once the modules are loaded, check http://gladstone.uoregon.edu/~eanholt/dri/
|
||||
Once the modules are loaded, check http://people.freebsd.org/~anholt/dri/
|
||||
for more information on how to set up the DRI.
|
||||
|
||||
Please report problems to Eric Anholt <eanholt@gladstone.uoregon.edu>.
|
||||
Please report problems to Eric Anholt <anholt@FreeBSD.org>.
|
||||
-------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue