Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:49:58 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_object.c
Log Message:
Restore chunk of code including close brace that got lost in merge.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.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/dist/drm/radeon/radeon_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c:1.5 Mon Aug 27 07:49:47 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c Mon Aug 27 07:49:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_object.c,v 1.5 2018/08/27 07:49:47 riastradh Exp $ */
+/* $NetBSD: radeon_object.c,v 1.6 2018/08/27 07:49:58 riastradh Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
* Dave Airlie
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_object.c,v 1.5 2018/08/27 07:49:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_object.c,v 1.6 2018/08/27 07:49:58 riastradh Exp $");
#include <linux/list.h>
#include <linux/slab.h>
@@ -598,6 +598,14 @@ int radeon_bo_list_validate(struct radeo
lobj->tiling_flags = bo->tiling_flags;
}
+ list_for_each_entry(lobj, &duplicates, tv.head) {
+ lobj->gpu_offset = radeon_bo_gpu_offset(lobj->robj);
+ lobj->tiling_flags = lobj->robj->tiling_flags;
+ }
+
+ return 0;
+}
+
int radeon_bo_get_surface_reg(struct radeon_bo *bo)
{
struct radeon_device *rdev = bo->rdev;
