Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon Restore chunk of code ...



details:   https://anonhg.NetBSD.org/src/rev/1a2f9522c6a3
branches:  trunk
changeset: 992798:1a2f9522c6a3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:49:58 2018 +0000

description:
Restore chunk of code including close brace that got lost in merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r a454fad4be3c -r 1a2f9522c6a3 sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c     Mon Aug 27 07:49:47 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_object.c     Mon Aug 27 07:49:58 2018 +0000
@@ -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 @@
                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;



Home | Main Index | Thread Index | Old Index