Module Name: src
Committed By: riastradh
Date: Sun Feb 27 14:24:27 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_acpi.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_acpi.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm:
nouveau_nvkm_subdev_mxm_base.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_acpi.c radeon_bios.c
Log Message:
drm: Use ACPI_FREE, not kfree, for ACPI_ALLOCATE_BUFFER result.
Most of this code is not currently enabled, but it might be enabled
soon.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.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/amd/amdgpu/amdgpu_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c:1.4 Sat Dec 18 23:44:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c Sun Feb 27 14:24:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_acpi.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $ */
+/* $NetBSD: amdgpu_acpi.c,v 1.5 2022/02/27 14:24:26 riastradh Exp $ */
/*
* Copyright 2012 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_acpi.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_acpi.c,v 1.5 2022/02/27 14:24:26 riastradh Exp $");
#include <linux/pci.h>
#include <linux/acpi.h>
@@ -117,7 +117,7 @@ static union acpi_object *amdgpu_atif_ca
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
DRM_DEBUG_DRIVER("failed to evaluate ATIF got %s\n",
acpi_format_exception(status));
- kfree(buffer.pointer);
+ ACPI_FREE(buffer.pointer);
return NULL;
}
@@ -206,7 +206,7 @@ static int amdgpu_atif_verify_interface(
amdgpu_atif_parse_functions(&atif->functions, output.function_bits);
out:
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -299,7 +299,7 @@ out:
DRM_DEBUG_DRIVER("Notification %s, command code = %#x\n",
(n->enabled ? "enabled" : "disabled"),
n->command_code);
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -358,7 +358,7 @@ static int amdgpu_atif_query_backlight_c
atif->backlight_caps.max_input_signal =
characteristics.max_input_signal;
out:
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -399,7 +399,7 @@ static int amdgpu_atif_get_sbios_request
count = hweight32(req->pending);
out:
- kfree(info);
+ ACPI_FREE(info);
return count;
}
@@ -530,7 +530,7 @@ static union acpi_object *amdgpu_atcs_ca
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
DRM_DEBUG_DRIVER("failed to evaluate ATCS got %s\n",
acpi_format_exception(status));
- kfree(buffer.pointer);
+ ACPI_FREE(buffer.pointer);
return NULL;
}
@@ -596,7 +596,7 @@ static int amdgpu_atcs_verify_interface(
amdgpu_atcs_parse_functions(&atcs->functions, output.function_bits);
out:
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -646,7 +646,7 @@ int amdgpu_acpi_pcie_notify_device_ready
if (!info)
return -EIO;
- kfree(info);
+ ACPI_FREE(info);
return 0;
}
@@ -708,14 +708,14 @@ int amdgpu_acpi_pcie_performance_request
size = *(u16 *) info->buffer.pointer;
if (size < 3) {
DRM_INFO("ATCS buffer is too small: %zu\n", size);
- kfree(info);
+ ACPI_FREE(info);
return -EINVAL;
}
size = min(sizeof(atcs_output), size);
memcpy(&atcs_output, info->buffer.pointer, size);
- kfree(info);
+ ACPI_FREE(info);
switch (atcs_output.ret_val) {
case ATCS_REQUEST_REFUSED:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c:1.3 Sat Dec 18 23:45:32 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c Sun Feb 27 14:24:27 2022
@@ -1,8 +1,8 @@
-/* $NetBSD: nouveau_acpi.c,v 1.3 2021/12/18 23:45:32 riastradh Exp $ */
+/* $NetBSD: nouveau_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $ */
// SPDX-License-Identifier: MIT
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_acpi.c,v 1.3 2021/12/18 23:45:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $");
#include <linux/pci.h>
#include <linux/acpi.h>
@@ -417,7 +417,7 @@ static int nouveau_rom_call(acpi_handle
obj = (union acpi_object *)buffer.pointer;
len = min(len, (int)obj->buffer.length);
memcpy(bios+offset, obj->buffer.pointer, len);
- kfree(buffer.pointer);
+ ACPI_FREE(buffer.pointer);
return len;
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c:1.3 Sat Dec 18 23:45:41 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c Sun Feb 27 14:24:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.3 2021/12/18 23:45:41 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $ */
/*
* Copyright 2011 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.3 2021/12/18 23:45:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $");
#include "mxms.h"
@@ -158,7 +158,7 @@ wmi_wmmx_mxmi(struct nvkm_mxm *mxm, u8 v
nvkm_debug(subdev, "WMMX MXMI returned non-integer\n");
}
- kfree(obj);
+ ACPI_FREE(obj);
return version;
}
@@ -195,7 +195,7 @@ mxm_shadow_wmi(struct nvkm_mxm *mxm, u8
obj->buffer.length, GFP_KERNEL);
}
- kfree(obj);
+ ACPI_FREE(obj);
return mxm->mxms != NULL;
}
#endif
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c:1.3 Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c Sun Feb 27 14:24:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_acpi.c,v 1.3 2021/12/18 23:45:43 riastradh Exp $ */
+/* $NetBSD: radeon_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $ */
/*
* Copyright 2012 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_acpi.c,v 1.3 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/pci.h>
@@ -147,7 +147,7 @@ static union acpi_object *radeon_atif_ca
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
DRM_DEBUG_DRIVER("failed to evaluate ATIF got %s\n",
acpi_format_exception(status));
- kfree(buffer.pointer);
+ ACPI_FREE(buffer.pointer);
return NULL;
}
@@ -243,7 +243,7 @@ static int radeon_atif_verify_interface(
radeon_atif_parse_functions(&atif->functions, output.function_bits);
out:
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -306,7 +306,7 @@ out:
DRM_DEBUG_DRIVER("Notification %s, command code = %#x\n",
(n->enabled ? "enabled" : "disabled"),
n->command_code);
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -346,7 +346,7 @@ static int radeon_atif_get_sbios_request
count = hweight32(req->pending);
out:
- kfree(info);
+ ACPI_FREE(info);
return count;
}
@@ -472,7 +472,7 @@ static union acpi_object *radeon_atcs_ca
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
DRM_DEBUG_DRIVER("failed to evaluate ATCS got %s\n",
acpi_format_exception(status));
- kfree(buffer.pointer);
+ ACPI_FREE(buffer.pointer);
return NULL;
}
@@ -538,7 +538,7 @@ static int radeon_atcs_verify_interface(
radeon_atcs_parse_functions(&atcs->functions, output.function_bits);
out:
- kfree(info);
+ ACPI_FREE(info);
return err;
}
@@ -588,7 +588,7 @@ int radeon_acpi_pcie_notify_device_ready
if (!info)
return -EIO;
- kfree(info);
+ ACPI_FREE(info);
return 0;
}
@@ -647,14 +647,14 @@ int radeon_acpi_pcie_performance_request
size = *(u16 *) info->buffer.pointer;
if (size < 3) {
DRM_INFO("ATCS buffer is too small: %zu\n", size);
- kfree(info);
+ ACPI_FREE(info);
return -EINVAL;
}
size = min(sizeof(atcs_output), size);
memcpy(&atcs_output, info->buffer.pointer, size);
- kfree(info);
+ ACPI_FREE(info);
switch (atcs_output.ret_val) {
case ATCS_REQUEST_REFUSED:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.9 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.9 Sun Feb 27 14:23:16 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Sun Feb 27 14:24:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_bios.c,v 1.9 2022/02/27 14:23:16 riastradh Exp $ */
+/* $NetBSD: radeon_bios.c,v 1.10 2022/02/27 14:24:27 riastradh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.9 2022/02/27 14:23:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.10 2022/02/27 14:24:27 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/pci.h>
@@ -229,7 +229,7 @@ static int radeon_atrm_call(acpi_handle
obj = (union acpi_object *)buffer.pointer;
memcpy(bios+offset, obj->buffer.pointer, obj->buffer.length);
len = obj->buffer.length;
- kfree(buffer.pointer);
+ ACPI_FREE(buffer.pointer);
return len;
}
