Module Name: src
Committed By: riastradh
Date: Mon Aug 27 15:10:12 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
src/sys/external/bsd/drm2/pci: drm_pci_module.c files.drmkms_pci
Log Message:
Sprinkle AGP conditionals where needed.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/pci/drm_pci_module.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/pci/files.drmkms_pci
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/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.13 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.13 Mon Aug 27 07:50:54 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Mon Aug 27 15:10:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_ttm.c,v 1.13 2018/08/27 07:50:54 riastradh Exp $ */
+/* $NetBSD: radeon_ttm.c,v 1.14 2018/08/27 15:10:12 riastradh Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
* Dave Airlie
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.13 2018/08/27 07:50:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.14 2018/08/27 15:10:12 riastradh Exp $");
#include <ttm/ttm_bo_api.h>
#include <ttm/ttm_bo_driver.h>
@@ -744,7 +744,9 @@ static struct radeon_ttm_tt *radeon_ttm_
static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
{
struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(ttm);
+#if !defined(__NetBSD__) || IS_ENABLED(CONFIG_AGP)
struct radeon_device *rdev;
+#endif
#ifndef __NetBSD__
unsigned i;
int r;
@@ -779,7 +781,9 @@ static int radeon_ttm_tt_populate(struct
#endif
}
+#if !defined(__NetBSD__) || IS_ENABLED(CONFIG_AGP)
rdev = radeon_get_rdev(ttm->bdev);
+#endif
#if IS_ENABLED(CONFIG_AGP)
if (rdev->flags & RADEON_IS_AGP) {
return ttm_agp_tt_populate(ttm);
@@ -822,7 +826,9 @@ static int radeon_ttm_tt_populate(struct
static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm)
{
+#if !defined(__NetBSD__) || IS_ENABLED(CONFIG_AGP)
struct radeon_device *rdev;
+#endif
struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(ttm);
#ifndef __NetBSD__
unsigned i;
@@ -838,7 +844,9 @@ static void radeon_ttm_tt_unpopulate(str
if (slave)
return;
+#if !defined(__NetBSD__) || IS_ENABLED(CONFIG_AGP)
rdev = radeon_get_rdev(ttm->bdev);
+#endif
#if IS_ENABLED(CONFIG_AGP)
if (rdev->flags & RADEON_IS_AGP) {
ttm_agp_tt_unpopulate(ttm);
Index: src/sys/external/bsd/drm2/pci/drm_pci_module.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci_module.c:1.4 src/sys/external/bsd/drm2/pci/drm_pci_module.c:1.5
--- src/sys/external/bsd/drm2/pci/drm_pci_module.c:1.4 Fri Mar 6 01:24:24 2015
+++ src/sys/external/bsd/drm2/pci/drm_pci_module.c Mon Aug 27 15:10:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci_module.c,v 1.4 2015/03/06 01:24:24 riastradh Exp $ */
+/* $NetBSD: drm_pci_module.c,v 1.5 2018/08/27 15:10:12 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci_module.c,v 1.4 2015/03/06 01:24:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci_module.c,v 1.5 2018/08/27 15:10:12 riastradh Exp $");
#include <sys/module.h>
#include <sys/once.h>
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_pci_modu
MODULE(MODULE_CLASS_MISC, drmkms_pci, "drmkms,pci");
+#ifdef CONFIG_AGP
const struct drm_agp_hooks drmkms_pci_agp_hooks = {
.agph_acquire_ioctl = &drm_agp_acquire_ioctl,
.agph_release_ioctl = &drm_agp_release_ioctl,
@@ -51,15 +52,18 @@ const struct drm_agp_hooks drmkms_pci_ag
.agph_release = &drm_agp_release,
.agph_clear = &drm_agp_clear,
};
+#endif
static int
drmkms_pci_agp_init(void)
{
+#ifdef CONFIG_AGP
int error;
error = drm_agp_register(&drmkms_pci_agp_hooks);
if (error)
return error;
+#endif
return 0;
}
@@ -80,7 +84,9 @@ static void
drmkms_pci_agp_fini(void)
{
+#ifdef CONFIG_AGP
drm_agp_deregister(&drmkms_pci_agp_hooks);
+#endif
}
static int
Index: src/sys/external/bsd/drm2/pci/files.drmkms_pci
diff -u src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.10 src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.11
--- src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.10 Mon Aug 27 14:02:32 2018
+++ src/sys/external/bsd/drm2/pci/files.drmkms_pci Mon Aug 27 15:10:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms_pci,v 1.10 2018/08/27 14:02:32 riastradh Exp $
+# $NetBSD: files.drmkms_pci,v 1.11 2018/08/27 15:10:12 riastradh Exp $
# Attribute for kernel components supporting PCI-based real graphics
# drivers, a.k.a. `KMS' (kernel mode-setting), as opposed to the legacy
@@ -7,7 +7,7 @@
define drmkms_pci: drmkms
#file external/bsd/drm2/dist/drm/ati_pcigart.c drmkms_pci
-file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms_pci
+file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms_pci & agp
file external/bsd/drm2/pci/drm_pci.c drmkms_pci
file external/bsd/drm2/pci/drm_pci_module.c drmkms_pci
