Module Name: src
Committed By: mrg
Date: Thu Aug 30 22:39:54 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: drm_agp_hook.c
Log Message:
if hooks init works, store the hooks in the agp. fixes start up
crash on an old radeon laptop. from @riastradh.
the console also now works, unlike previous drm2, where eg, the
problems from PR#49744 are seen.
unfortunately, i got a crash starting X, and no ddb yet, so we
can't re-enable the r100/r200 parts here yet. once this is
known to be working we can delete the old radeondrm code, and
remove the hacks to disable drm2 there.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_agp_hook.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_agp_hook.c
diff -u src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.2 src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.3
--- src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.2 Thu Aug 30 19:03:14 2018
+++ src/sys/external/bsd/drm2/drm/drm_agp_hook.c Thu Aug 30 22:39:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_agp_hook.c,v 1.2 2018/08/30 19:03:14 tnn Exp $ */
+/* $NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.2 2018/08/30 19:03:14 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -145,6 +145,8 @@ drm_agp_init(struct drm_device *dev)
agp = hooks->agph_init(dev);
if (agp == NULL)
drm_agp_hooks_release(hooks);
+ else
+ agp->hooks = hooks;
return agp;
}
