Module Name: src Committed By: riastradh Date: Mon Aug 27 06:45:07 UTC 2018
Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: radeon_kfd.c radeon_kfd.h Log Message: Revert "Add volatile to the second argument of radeon_kfd_interrupt to appease" This reverts commit 1692f7bf1e9f150093b3c238f6706301bb243295. Stack of things that must change is too deep -- let's just use __UNVOLATILE here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.h 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_kfd.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c:1.3 Mon Aug 27 06:43:35 2018 +++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.c Mon Aug 27 06:45:07 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: radeon_kfd.c,v 1.3 2018/08/27 06:43:35 riastradh Exp $ */ +/* $NetBSD: radeon_kfd.c,v 1.4 2018/08/27 06:45:07 riastradh Exp $ */ /* * Copyright 2014 Advanced Micro Devices, Inc. @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeon_kfd.c,v 1.3 2018/08/27 06:43:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeon_kfd.c,v 1.4 2018/08/27 06:45:07 riastradh Exp $"); #include <linux/module.h> #include <linux/fdtable.h> @@ -210,7 +210,7 @@ void radeon_kfd_device_fini(struct radeo } } -void radeon_kfd_interrupt(struct radeon_device *rdev, const volatile void *ih_ring_entry) +void radeon_kfd_interrupt(struct radeon_device *rdev, const void *ih_ring_entry) { if (rdev->kfd) kgd2kfd->interrupt(rdev->kfd, ih_ring_entry); Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.h diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.h:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.h:1.4 --- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.h:1.3 Mon Aug 27 06:43:35 2018 +++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kfd.h Mon Aug 27 06:45:07 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: radeon_kfd.h,v 1.3 2018/08/27 06:43:35 riastradh Exp $ */ +/* $NetBSD: radeon_kfd.h,v 1.4 2018/08/27 06:45:07 riastradh Exp $ */ /* * Copyright 2014 Advanced Micro Devices, Inc. @@ -41,7 +41,7 @@ void radeon_kfd_fini(void); void radeon_kfd_suspend(struct radeon_device *rdev); int radeon_kfd_resume(struct radeon_device *rdev); void radeon_kfd_interrupt(struct radeon_device *rdev, - const volatile void *ih_ring_entry); + const void *ih_ring_entry); void radeon_kfd_device_probe(struct radeon_device *rdev); void radeon_kfd_device_init(struct radeon_device *rdev); void radeon_kfd_device_fini(struct radeon_device *rdev);