Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:50:55 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/ttm: files.ttm ttm_agp_backend.c
Log Message:
Fix up ttm agp.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/ttm/ttm_agp_backend.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/ttm/files.ttm
diff -u src/sys/external/bsd/drm2/ttm/files.ttm:1.4 src/sys/external/bsd/drm2/ttm/files.ttm:1.5
--- src/sys/external/bsd/drm2/ttm/files.ttm:1.4 Sun Dec 19 01:47:31 2021
+++ src/sys/external/bsd/drm2/ttm/files.ttm Sun Dec 19 01:50:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.ttm,v 1.4 2021/12/19 01:47:31 riastradh Exp $
+# $NetBSD: files.ttm,v 1.5 2021/12/19 01:50:54 riastradh Exp $
# TTM, the texture and tiling manager.
@@ -7,6 +7,7 @@ version 20180827
define drmkms_ttm: drmkms
makeoptions drmkms "CWARNFLAGS.ttm_bo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions drmkms_ttm "CPPFLAGS.drmkms_ttm"+="-DCONFIG_AGP=1"
makeoptions drmkms_ttm "CWARNFLAGS.drmkms_ttm"+="-Wno-missing-field-initializers"
makeoptions drmkms_ttm "CWARNFLAGS.drmkms_ttm"+="-Wno-shadow"
Index: src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c:1.8 src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c:1.9
--- src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c:1.8 Tue Aug 28 03:41:40 2018
+++ src/sys/external/bsd/drm2/ttm/ttm_agp_backend.c Sun Dec 19 01:50:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_agp_backend.c,v 1.8 2018/08/28 03:41:40 riastradh Exp $ */
+/* $NetBSD: ttm_agp_backend.c,v 1.9 2021/12/19 01:50:54 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_agp_backend.c,v 1.8 2018/08/28 03:41:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_agp_backend.c,v 1.9 2021/12/19 01:50:54 riastradh Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
@@ -39,10 +39,11 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_agp_back
#include <dev/pci/pcivar.h>
#include <dev/pci/agpvar.h>
+#include <drm/drm_agpsupport.h>
+
#include <ttm/ttm_bo_driver.h>
#include <ttm/ttm_page_alloc.h>
-
-#if CONFIG_AGP
+#include <ttm/ttm_tt.h>
struct ttm_agp {
struct ttm_dma_tt ttm_dma;
@@ -54,8 +55,8 @@ struct ttm_agp {
static const struct ttm_backend_func ttm_agp_backend_func;
struct ttm_tt *
-ttm_agp_tt_create(struct ttm_bo_device *bdev, struct agp_bridge_data *bridge,
- unsigned long size, uint32_t page_flags, struct page *dummy_read_page)
+ttm_agp_tt_create(struct ttm_buffer_object *bo, struct agp_bridge_data *bridge,
+ uint32_t page_flags)
{
struct ttm_agp *ttm_agp;
@@ -63,8 +64,7 @@ ttm_agp_tt_create(struct ttm_bo_device *
ttm_agp->agp = &bridge->abd_sc;
ttm_agp->ttm_dma.ttm.func = &ttm_agp_backend_func;
- if (ttm_dma_tt_init(&ttm_agp->ttm_dma, bdev, size, page_flags,
- dummy_read_page) != 0)
+ if (ttm_dma_tt_init(&ttm_agp->ttm_dma, bo, page_flags) != 0)
goto fail;
/* Success! */
@@ -75,7 +75,7 @@ fail: kmem_free(ttm_agp, sizeof(*ttm_agp
}
int
-ttm_agp_tt_populate(struct ttm_tt *ttm)
+ttm_agp_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
{
KASSERTMSG((ttm->state == tt_unpopulated),
@@ -169,5 +169,3 @@ static const struct ttm_backend_func ttm
.unbind = &ttm_agp_unbind,
.destroy = &ttm_agp_destroy,
};
-
-#endif
