CVS commit: src/sys/external/bsd/drm2

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Fri Feb 14 04:30:06 UTC 2020

Modified Files:
        src/sys/external/bsd/drm2/amdgpu: files.amdgpu
        src/sys/external/bsd/drm2/dist/drm: drm_bufs.c drm_crtc.c
            drm_dp_helper.c
        src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_atom.c
            amdgpu_atombios.c amdgpu_atombios_encoders.c amdgpu_bo_list.c
            amdgpu_ci_dpm.c amdgpu_cz_dpm.c amdgpu_cz_smc.c amdgpu_dce_v10_0.c
            amdgpu_dce_v11_0.c amdgpu_dce_v8_0.c amdgpu_dpm.c amdgpu_fence.c
            amdgpu_gmc_v7_0.c amdgpu_gmc_v8_0.c amdgpu_kv_dpm.c amdgpu_test.c
            amdgpu_ucode.c amdgpu_uvd.c
        src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c i915_gem.c
            i915_guc_submission.c intel_bios.c intel_opregion.c intel_psr.c
        src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios:
            nouveau_nvkm_subdev_bios_shadowpci.c
        src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem:
            nouveau_nvkm_subdev_instmem_base.c
            nouveau_nvkm_subdev_instmem_nv40.c
        src/sys/external/bsd/drm2/dist/drm/radeon: drm_buffer.c radeon_test.c
            radeon_uvd.c
        src/sys/external/bsd/drm2/drm: files.drmkms
        src/sys/external/bsd/drm2/i915drm: files.i915drmkms
        src/sys/external/bsd/drm2/nouveau: files.nouveau
        src/sys/external/bsd/drm2/radeon: files.radeon

Log Message:
Eliminate -Wpointer-arith patches; use -Wno-pointer-arith instead.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
cvs rdiff -u -r1.1 -r1.2 \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v8_0.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_bo_list.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v10_0.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v11_0.c \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c
cvs rdiff -u -r1.20 -r1.21 \
    src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
cvs rdiff -u -r1.56 -r1.57 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.8 -r1.9 \
    src/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c
cvs rdiff -u -r1.15 -r1.16 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c
cvs rdiff -u -r1.3 -r1.4 \
    
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c
cvs rdiff -u -r1.4 -r1.5 \
    
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c
cvs rdiff -u -r1.7 -r1.8 \
    
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_nv40.c
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/radeon/drm_buffer.c
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/drm2/dist/drm/radeon/radeon_test.c
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd.c
cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/radeon/files.radeon

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/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.7 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.8
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.7	Mon Aug 27 16:06:01 2018
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amdgpu,v 1.7 2018/08/27 16:06:01 riastradh Exp $
+#	$NetBSD: files.amdgpu,v 1.8 2020/02/14 04:30:04 riastradh Exp $
 
 version	20180827
 
@@ -19,6 +19,7 @@ makeoptions	amdgpu	CPPFLAGS+="-I$S/exter
 
 makeoptions	amdgpu	"CWARNFLAGS.amdgpu"+="-Wno-missing-field-initializers"
 makeoptions	amdgpu	"CWARNFLAGS.amdgpu"+="-Wno-shadow"
+makeoptions	amdgpu	"CWARNFLAGS.amdgpu"+="-Wno-pointer-arith"
 
 # Local additions.
 file	external/bsd/drm2/amdgpu/amdgpu_module.c	amdgpu

Index: src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.9 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.9	Mon Aug 27 06:44:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_bufs.c,v 1.9 2018/08/27 06:44:14 riastradh Exp $	*/
+/*	$NetBSD: drm_bufs.c,v 1.10 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Legacy: Generic DRM Buffer Management
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.9 2018/08/27 06:44:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.10 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
@@ -969,7 +969,7 @@ int drm_legacy_addbufs_pci(struct drm_de
 			buf->order = order;
 			buf->used = 0;
 			buf->offset = (dma->byte_count + byte_count + offset);
-			buf->address = (void *)((char *)dmah->vaddr + offset);
+			buf->address = (void *)(dmah->vaddr + offset);
 			buf->bus_address = dmah->busaddr + offset;
 			buf->next = NULL;
 			buf->waiting = 0;

Index: src/sys/external/bsd/drm2/dist/drm/drm_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.11 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.11	Mon Aug 27 14:40:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_crtc.c,v 1.11 2018/08/27 14:40:30 riastradh Exp $	*/
+/*	$NetBSD: drm_crtc.c,v 1.12 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright (c) 2006-2008 Intel Corporation
@@ -32,7 +32,7 @@
  *      Jesse Barnes <jesse.bar...@intel.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.11 2018/08/27 14:40:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.12 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/err.h>
 #include <linux/spinlock.h>
@@ -5151,13 +5151,13 @@ int drm_mode_gamma_set_ioctl(struct drm_
 		goto out;
 	}
 
-	g_base = (char *)r_base + size;
+	g_base = r_base + size;
 	if (copy_from_user(g_base, (void __user *)(unsigned long)crtc_lut->green, size)) {
 		ret = -EFAULT;
 		goto out;
 	}
 
-	b_base = (char *)g_base + size;
+	b_base = g_base + size;
 	if (copy_from_user(b_base, (void __user *)(unsigned long)crtc_lut->blue, size)) {
 		ret = -EFAULT;
 		goto out;
@@ -5218,13 +5218,13 @@ int drm_mode_gamma_get_ioctl(struct drm_
 		goto out;
 	}
 
-	g_base = (char *)r_base + size;
+	g_base = r_base + size;
 	if (copy_to_user((void __user *)(unsigned long)crtc_lut->green, g_base, size)) {
 		ret = -EFAULT;
 		goto out;
 	}
 
-	b_base = (char *)g_base + size;
+	b_base = g_base + size;
 	if (copy_to_user((void __user *)(unsigned long)crtc_lut->blue, b_base, size)) {
 		ret = -EFAULT;
 		goto out;

Index: src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.8 src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c:1.8	Mon Aug 27 06:52:45 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_dp_helper.c,v 1.8 2018/08/27 06:52:45 riastradh Exp $	*/
+/*	$NetBSD: drm_dp_helper.c,v 1.9 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright © 2009 Keith Packard
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.8 2018/08/27 06:52:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.9 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -666,7 +666,7 @@ static int drm_dp_i2c_drain_msg(struct d
 		}
 
 		msg.size -= err;
-		msg.buffer = (void *)((char *)msg.buffer + err);
+		msg.buffer = msg.buffer + err;
 	}
 
 	return ret;

Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c:1.1	Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_atom.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_atom.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atom.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atom.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -1404,7 +1404,7 @@ bool amdgpu_atom_parse_data_header(struc
 {
 	int offset = index * 2 + 4;
 	int idx = CU16(ctx->data_table + offset);
-	u16 *mdt = (u16 *)((char *)ctx->bios + ctx->data_table + 4);
+	u16 *mdt = (u16 *)(ctx->bios + ctx->data_table + 4);
 
 	if (!mdt[index])
 		return false;
@@ -1424,7 +1424,7 @@ bool amdgpu_atom_parse_cmd_header(struct
 {
 	int offset = index * 2 + 4;
 	int idx = CU16(ctx->cmd_table + offset);
-	u16 *mct = (u16 *)((char *)ctx->bios + ctx->cmd_table + 4);
+	u16 *mct = (u16 *)(ctx->bios + ctx->cmd_table + 4);
 
 	if (!mct[index])
 		return false;
@@ -1444,7 +1444,7 @@ int amdgpu_atom_allocate_fb_scratch(stru
 	struct _ATOM_VRAM_USAGE_BY_FIRMWARE *firmware_usage;
 
 	if (amdgpu_atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) {
-		firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)((char *)ctx->bios + data_offset);
+		firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset);
 
 		DRM_DEBUG("atom firmware requested %08x %dkb\n",
 			  le32_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware),
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c:1.1	Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_atombios_encoders.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_atombios_encoders.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2007-11 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
  *          Alex Deucher
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_encoders.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_encoders.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
@@ -1930,7 +1930,7 @@ amdgpu_atombios_encoder_get_lcd_info(str
 	if (amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset)) {
 		lvds_info =
-			(union lvds_info *)((char *)mode_info->atom_context->bios + data_offset);
+			(union lvds_info *)(mode_info->atom_context->bios + data_offset);
 		lvds =
 		    kzalloc(sizeof(struct amdgpu_encoder_atom_dig), GFP_KERNEL);
 
@@ -1995,11 +1995,11 @@ amdgpu_atombios_encoder_get_lcd_info(str
 
 			if ((frev == 1) && (crev < 2))
 				/* absolute */
-				record = (u8 *)((char *)mode_info->atom_context->bios +
+				record = (u8 *)(mode_info->atom_context->bios +
 						le16_to_cpu(lvds_info->info.usModePatchTableOffset));
 			else
 				/* relative */
-				record = (u8 *)((char *)mode_info->atom_context->bios +
+				record = (u8 *)(mode_info->atom_context->bios +
 						data_offset +
 						le16_to_cpu(lvds_info->info.usModePatchTableOffset));
 			while (*record != ATOM_RECORD_END_TYPE) {
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c:1.1	Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_dpm.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_cz_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_cz_dpm.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_dpm.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_dpm.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/seq_file.h>
@@ -109,7 +109,7 @@ static int cz_parse_sys_info_table(struc
 
 	if (amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset)) {
-		igp_info = (union igp_info *)((char *)mode_info->atom_context->bios +
+		igp_info = (union igp_info *)(mode_info->atom_context->bios +
 					      data_offset);
 
 		if (crev != 9) {
@@ -322,16 +322,16 @@ static int cz_parse_power_table(struct a
 	if (!amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				    &frev, &crev, &data_offset))
 		return -EINVAL;
-	power_info = (union power_info *)((char *)mode_info->atom_context->bios + data_offset);
+	power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
 
 	state_array = (struct _StateArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		le16_to_cpu(power_info->pplib.usStateArrayOffset));
 	clock_info_array = (struct _ClockInfoArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		le16_to_cpu(power_info->pplib.usClockInfoArrayOffset));
 	non_clock_info_array = (struct _NonClockInfoArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset));
 
 	adev->pm.dpm.ps = kzalloc(sizeof(struct amdgpu_ps) *
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c:1.1	Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v7_0.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_gmc_v7_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_gmc_v7_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v7_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v7_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
@@ -490,7 +490,7 @@ static int gmc_v7_0_gart_set_pte_pde(str
 
 	value = addr & 0xFFFFFFFFFFFFF000ULL;
 	value |= flags;
-	writeq(value, (char __iomem *)ptr + (gpu_page_idx * 8));
+	writeq(value, ptr + (gpu_page_idx * 8));
 
 	return 0;
 }
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c:1.1	Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gmc_v8_0.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_gmc_v8_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_gmc_v8_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v8_0.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_gmc_v8_0.c,v 1.2 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
@@ -550,7 +550,7 @@ static int gmc_v8_0_gart_set_pte_pde(str
 	 */
 	value = addr & 0x000000FFFFFFF000ULL;
 	value |= flags;
-	writeq(value, (char __iomem *)ptr + (gpu_page_idx * 8));
+	writeq(value, ptr + (gpu_page_idx * 8));
 
 	return 0;
 }

Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c:1.3	Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_atombios.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_atombios.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
  *          Alex Deucher
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <asm/byteorder.h>
 #include <drm/drmP.h>
@@ -105,7 +105,7 @@ struct amdgpu_i2c_bus_rec amdgpu_atombio
 	i2c.valid = false;
 
 	if (amdgpu_atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) {
-		i2c_info = (struct _ATOM_GPIO_I2C_INFO *)((char *)ctx->bios + data_offset);
+		i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset);
 
 		num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
 			sizeof(ATOM_GPIO_I2C_ASSIGMENT);
@@ -139,7 +139,7 @@ void amdgpu_atombios_i2c_init(struct amd
 	char stmp[32];
 
 	if (amdgpu_atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) {
-		i2c_info = (struct _ATOM_GPIO_I2C_INFO *)((char *)ctx->bios + data_offset);
+		i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset);
 
 		num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
 			sizeof(ATOM_GPIO_I2C_ASSIGMENT);
@@ -176,7 +176,7 @@ amdgpu_atombios_lookup_gpio(struct amdgp
 	gpio.valid = false;
 
 	if (amdgpu_atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) {
-		gpio_info = (struct _ATOM_GPIO_PIN_LUT *)((char *)ctx->bios + data_offset);
+		gpio_info = (struct _ATOM_GPIO_PIN_LUT *)(ctx->bios + data_offset);
 
 		num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
 			sizeof(ATOM_GPIO_PIN_ASSIGNMENT);
@@ -301,18 +301,18 @@ bool amdgpu_atombios_get_connector_info_
 	if (crev < 2)
 		return false;
 
-	obj_header = (ATOM_OBJECT_HEADER *) ((char *)ctx->bios + data_offset);
+	obj_header = (ATOM_OBJECT_HEADER *) (ctx->bios + data_offset);
 	path_obj = (ATOM_DISPLAY_OBJECT_PATH_TABLE *)
-	    ((char *)ctx->bios + data_offset +
+	    (ctx->bios + data_offset +
 	     le16_to_cpu(obj_header->usDisplayPathTableOffset));
 	con_obj = (ATOM_CONNECTOR_OBJECT_TABLE *)
-	    ((char *)ctx->bios + data_offset +
+	    (ctx->bios + data_offset +
 	     le16_to_cpu(obj_header->usConnectorObjectTableOffset));
 	enc_obj = (ATOM_ENCODER_OBJECT_TABLE *)
-	    ((char *)ctx->bios + data_offset +
+	    (ctx->bios + data_offset +
 	     le16_to_cpu(obj_header->usEncoderObjectTableOffset));
 	router_obj = (ATOM_OBJECT_TABLE *)
-		((char *)ctx->bios + data_offset +
+		(ctx->bios + data_offset +
 		 le16_to_cpu(obj_header->usRouterObjectTableOffset));
 	device_support = le16_to_cpu(obj_header->usDeviceSupport);
 
@@ -377,7 +377,7 @@ bool amdgpu_atombios_get_connector_info_
 						u16 encoder_obj = le16_to_cpu(enc_obj->asObjects[k].usObjectID);
 						if (le16_to_cpu(path->usGraphicObjIds[j]) == encoder_obj) {
 							ATOM_COMMON_RECORD_HEADER *record = (ATOM_COMMON_RECORD_HEADER *)
-								((char *)ctx->bios + data_offset +
+								(ctx->bios + data_offset +
 								 le16_to_cpu(enc_obj->asObjects[k].usRecordOffset));
 							ATOM_ENCODER_CAP_RECORD *cap_record;
 							u16 caps = 0;
@@ -405,7 +405,7 @@ bool amdgpu_atombios_get_connector_info_
 						u16 router_obj_id = le16_to_cpu(router_obj->asObjects[k].usObjectID);
 						if (le16_to_cpu(path->usGraphicObjIds[j]) == router_obj_id) {
 							ATOM_COMMON_RECORD_HEADER *record = (ATOM_COMMON_RECORD_HEADER *)
-								((char *)ctx->bios + data_offset +
+								(ctx->bios + data_offset +
 								 le16_to_cpu(router_obj->asObjects[k].usRecordOffset));
 							ATOM_I2C_RECORD *i2c_record;
 							ATOM_I2C_ID_CONFIG_ACCESS *i2c_config;
@@ -413,7 +413,7 @@ bool amdgpu_atombios_get_connector_info_
 							ATOM_ROUTER_DATA_CLOCK_PATH_SELECT_RECORD *cd_path;
 							ATOM_SRC_DST_TABLE_FOR_ONE_OBJECT *router_src_dst_table =
 								(ATOM_SRC_DST_TABLE_FOR_ONE_OBJECT *)
-								((char *)ctx->bios + data_offset +
+								(ctx->bios + data_offset +
 								 le16_to_cpu(router_obj->asObjects[k].usSrcDstTableOffset));
 							u8 *num_dst_objs = (u8 *)
 								((u8 *)router_src_dst_table + 1 +
@@ -483,7 +483,7 @@ bool amdgpu_atombios_get_connector_info_
 						    *record =
 						    (ATOM_COMMON_RECORD_HEADER
 						     *)
-						    ((char *)ctx->bios + data_offset +
+						    (ctx->bios + data_offset +
 						     le16_to_cpu(con_obj->
 								 asObjects[j].
 								 usRecordOffset));
@@ -578,7 +578,7 @@ int amdgpu_atombios_get_clock_info(struc
 		struct amdgpu_pll *spll = &adev->clock.spll;
 		struct amdgpu_pll *mpll = &adev->clock.mpll;
 		union firmware_info *firmware_info =
-			(union firmware_info *)((char *)mode_info->atom_context->bios +
+			(union firmware_info *)(mode_info->atom_context->bios +
 						data_offset);
 		/* pixel clocks */
 		ppll->reference_freq =
@@ -737,7 +737,7 @@ static void amdgpu_atombios_get_igp_ss_o
 	if (amdgpu_atom_parse_data_header(mode_info->atom_context, index, &size,
 				   &frev, &crev, &data_offset)) {
 		igp_info = (union igp_info *)
-			((char *)mode_info->atom_context->bios + data_offset);
+			(mode_info->atom_context->bios + data_offset);
 		switch (crev) {
 		case 6:
 			switch (id) {
@@ -852,7 +852,7 @@ bool amdgpu_atombios_get_asic_ss_info(st
 				   &frev, &crev, &data_offset)) {
 
 		ss_info =
-			(union asic_ss_info *)((char *)mode_info->atom_context->bios + data_offset);
+			(union asic_ss_info *)(mode_info->atom_context->bios + data_offset);
 
 		switch (frev) {
 		case 1:
@@ -1198,7 +1198,7 @@ int amdgpu_atombios_get_leakage_vddc_bas
 		return -EINVAL;
 
 	profile = (ATOM_ASIC_PROFILING_INFO_V2_1 *)
-		((char *)adev->mode_info.atom_context->bios + data_offset);
+		(adev->mode_info.atom_context->bios + data_offset);
 
 	switch (frev) {
 	case 1:
@@ -1209,19 +1209,19 @@ int amdgpu_atombios_get_leakage_vddc_bas
 			if (size < sizeof(ATOM_ASIC_PROFILING_INFO_V2_1))
 				return -EINVAL;
 			leakage_bin = (u16 *)
-				((char *)adev->mode_info.atom_context->bios + data_offset +
+				(adev->mode_info.atom_context->bios + data_offset +
 				 le16_to_cpu(profile->usLeakageBinArrayOffset));
 			vddc_id_buf = (u16 *)
-				((char *)adev->mode_info.atom_context->bios + data_offset +
+				(adev->mode_info.atom_context->bios + data_offset +
 				 le16_to_cpu(profile->usElbVDDC_IdArrayOffset));
 			vddc_buf = (u16 *)
-				((char *)adev->mode_info.atom_context->bios + data_offset +
+				(adev->mode_info.atom_context->bios + data_offset +
 				 le16_to_cpu(profile->usElbVDDC_LevelArrayOffset));
 			vddci_id_buf = (u16 *)
-				((char *)adev->mode_info.atom_context->bios + data_offset +
+				(adev->mode_info.atom_context->bios + data_offset +
 				 le16_to_cpu(profile->usElbVDDCI_IdArrayOffset));
 			vddci_buf = (u16 *)
-				((char *)adev->mode_info.atom_context->bios + data_offset +
+				(adev->mode_info.atom_context->bios + data_offset +
 				 le16_to_cpu(profile->usElbVDDCI_LevelArrayOffset));
 
 			if (profile->ucElbVDDC_Num > 0) {
@@ -1342,7 +1342,7 @@ amdgpu_atombios_is_voltage_gpio(struct a
 	if (amdgpu_atom_parse_data_header(adev->mode_info.atom_context, index, &size,
 				   &frev, &crev, &data_offset)) {
 		voltage_info = (union voltage_object_info *)
-			((char *)adev->mode_info.atom_context->bios + data_offset);
+			(adev->mode_info.atom_context->bios + data_offset);
 
 		switch (frev) {
 		case 3:
@@ -1380,7 +1380,7 @@ int amdgpu_atombios_get_voltage_table(st
 	if (amdgpu_atom_parse_data_header(adev->mode_info.atom_context, index, &size,
 				   &frev, &crev, &data_offset)) {
 		voltage_info = (union voltage_object_info *)
-			((char *)adev->mode_info.atom_context->bios + data_offset);
+			(adev->mode_info.atom_context->bios + data_offset);
 
 		switch (frev) {
 		case 3:
@@ -1452,7 +1452,7 @@ int amdgpu_atombios_init_mc_reg_table(st
 	if (amdgpu_atom_parse_data_header(adev->mode_info.atom_context, index, &size,
 				   &frev, &crev, &data_offset)) {
 		vram_info = (union vram_info *)
-			((char *)adev->mode_info.atom_context->bios + data_offset);
+			(adev->mode_info.atom_context->bios + data_offset);
 		switch (frev) {
 		case 1:
 			DRM_ERROR("old table version %d, %d\n", frev, crev);
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c:1.3	Fri Feb 14 04:29:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ci_dpm.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_ci_dpm.c,v 1.3 2020/02/14 04:29:19 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_ci_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_dpm.c,v 1.3 2020/02/14 04:29:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
@@ -5692,18 +5692,18 @@ static int ci_parse_power_table(struct a
 	if (!amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset))
 		return -EINVAL;
-	power_info = (union power_info *)((char *)mode_info->atom_context->bios + data_offset);
+	power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
 
 	amdgpu_add_thermal_controller(adev);
 
 	state_array = (struct _StateArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		 le16_to_cpu(power_info->pplib.usStateArrayOffset));
 	clock_info_array = (struct _ClockInfoArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		 le16_to_cpu(power_info->pplib.usClockInfoArrayOffset));
 	non_clock_info_array = (struct _NonClockInfoArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		 le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset));
 
 	adev->pm.dpm.ps = kzalloc(sizeof(struct amdgpu_ps) *
@@ -5775,7 +5775,7 @@ static int ci_get_vbios_boot_values(stru
 	if (amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset)) {
 		firmware_info =
-			(ATOM_FIRMWARE_INFO_V2_2 *)((char *)mode_info->atom_context->bios +
+			(ATOM_FIRMWARE_INFO_V2_2 *)(mode_info->atom_context->bios +
 						    data_offset);
 		boot_state->mvdd_bootup_value = le16_to_cpu(firmware_info->usBootUpMVDDCVoltage);
 		boot_state->vddc_bootup_value = le16_to_cpu(firmware_info->usBootUpVDDCVoltage);
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v8_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v8_0.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v8_0.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v8_0.c:1.3	Mon Aug 27 14:39:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v8_0.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_dce_v8_0.c,v 1.3 2018/08/27 14:39:20 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_dce_v8_0.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_v8_0.c,v 1.3 2018/08/27 14:39:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_v8_0.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include "drmP.h"
 #include "amdgpu.h"
@@ -1703,7 +1703,7 @@ static void dce_v8_0_afmt_update_avi_inf
 	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
 	struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
 	uint32_t offset = dig->afmt->offset;
-	uint8_t *frame = (char *)buffer + 3;
+	uint8_t *frame = buffer + 3;
 	uint8_t *header = buffer;
 
 	WREG32(mmAFMT_AVI_INFO0 + offset,
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c:1.3	Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dpm.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_dpm.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dpm.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dpm.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <asm/byteorder.h>
 #include "drmP.h"
@@ -298,7 +298,7 @@ int amdgpu_get_platform_caps(struct amdg
 	if (!amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset))
 		return -EINVAL;
-	power_info = (union power_info *)((char *)mode_info->atom_context->bios + data_offset);
+	power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
 
 	adev->pm.dpm.platform_caps = le32_to_cpu(power_info->pplib.ulPlatformCaps);
 	adev->pm.dpm.backbias_response_time = le16_to_cpu(power_info->pplib.usBackbiasTime);
@@ -331,13 +331,13 @@ int amdgpu_parse_extended_power_table(st
 	if (!amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset))
 		return -EINVAL;
-	power_info = (union power_info *)((char *)mode_info->atom_context->bios + data_offset);
+	power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
 
 	/* fan table */
 	if (le16_to_cpu(power_info->pplib.usTableSize) >=
 	    sizeof(struct _ATOM_PPLIB_POWERPLAYTABLE3)) {
 		if (power_info->pplib3.usFanTableOffset) {
-			fan_info = (union fan_info *)((char *)mode_info->atom_context->bios + data_offset +
+			fan_info = (union fan_info *)(mode_info->atom_context->bios + data_offset +
 						      le16_to_cpu(power_info->pplib3.usFanTableOffset));
 			adev->pm.dpm.fan.t_hyst = fan_info->fan.ucTHyst;
 			adev->pm.dpm.fan.t_min = le16_to_cpu(fan_info->fan.usTMin);
@@ -368,7 +368,7 @@ int amdgpu_parse_extended_power_table(st
 	    sizeof(struct _ATOM_PPLIB_POWERPLAYTABLE4)) {
 		if (power_info->pplib4.usVddcDependencyOnSCLKOffset) {
 			dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib4.usVddcDependencyOnSCLKOffset));
 			ret = amdgpu_parse_clk_voltage_dep_table(&adev->pm.dpm.dyn_state.vddc_dependency_on_sclk,
 								 dep_table);
@@ -379,7 +379,7 @@ int amdgpu_parse_extended_power_table(st
 		}
 		if (power_info->pplib4.usVddciDependencyOnMCLKOffset) {
 			dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib4.usVddciDependencyOnMCLKOffset));
 			ret = amdgpu_parse_clk_voltage_dep_table(&adev->pm.dpm.dyn_state.vddci_dependency_on_mclk,
 								 dep_table);
@@ -390,7 +390,7 @@ int amdgpu_parse_extended_power_table(st
 		}
 		if (power_info->pplib4.usVddcDependencyOnMCLKOffset) {
 			dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib4.usVddcDependencyOnMCLKOffset));
 			ret = amdgpu_parse_clk_voltage_dep_table(&adev->pm.dpm.dyn_state.vddc_dependency_on_mclk,
 								 dep_table);
@@ -401,7 +401,7 @@ int amdgpu_parse_extended_power_table(st
 		}
 		if (power_info->pplib4.usMvddDependencyOnMCLKOffset) {
 			dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib4.usMvddDependencyOnMCLKOffset));
 			ret = amdgpu_parse_clk_voltage_dep_table(&adev->pm.dpm.dyn_state.mvdd_dependency_on_mclk,
 								 dep_table);
@@ -413,7 +413,7 @@ int amdgpu_parse_extended_power_table(st
 		if (power_info->pplib4.usMaxClockVoltageOnDCOffset) {
 			ATOM_PPLIB_Clock_Voltage_Limit_Table *clk_v =
 				(ATOM_PPLIB_Clock_Voltage_Limit_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib4.usMaxClockVoltageOnDCOffset));
 			if (clk_v->ucNumEntries) {
 				adev->pm.dpm.dyn_state.max_clock_voltage_on_dc.sclk =
@@ -431,7 +431,7 @@ int amdgpu_parse_extended_power_table(st
 		if (power_info->pplib4.usVddcPhaseShedLimitsTableOffset) {
 			ATOM_PPLIB_PhaseSheddingLimits_Table *psl =
 				(ATOM_PPLIB_PhaseSheddingLimits_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib4.usVddcPhaseShedLimitsTableOffset));
 			ATOM_PPLIB_PhaseSheddingLimits_Record *entry;
 
@@ -478,7 +478,7 @@ int amdgpu_parse_extended_power_table(st
 		if (power_info->pplib5.usCACLeakageTableOffset) {
 			ATOM_PPLIB_CAC_Leakage_Table *cac_table =
 				(ATOM_PPLIB_CAC_Leakage_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(power_info->pplib5.usCACLeakageTableOffset));
 			ATOM_PPLIB_CAC_Leakage_Record *entry;
 			u32 size = cac_table->ucNumEntries * sizeof(struct amdgpu_cac_leakage_table);
@@ -513,21 +513,21 @@ int amdgpu_parse_extended_power_table(st
 	if (le16_to_cpu(power_info->pplib.usTableSize) >=
 	    sizeof(struct _ATOM_PPLIB_POWERPLAYTABLE3)) {
 		ATOM_PPLIB_EXTENDEDHEADER *ext_hdr = (ATOM_PPLIB_EXTENDEDHEADER *)
-			((char *)mode_info->atom_context->bios + data_offset +
+			(mode_info->atom_context->bios + data_offset +
 			 le16_to_cpu(power_info->pplib3.usExtendendedHeaderOffset));
 		if ((le16_to_cpu(ext_hdr->usSize) >= SIZE_OF_ATOM_PPLIB_EXTENDEDHEADER_V2) &&
 			ext_hdr->usVCETableOffset) {
 			VCEClockInfoArray *array = (VCEClockInfoArray *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usVCETableOffset) + 1);
 			ATOM_PPLIB_VCE_Clock_Voltage_Limit_Table *limits =
 				(ATOM_PPLIB_VCE_Clock_Voltage_Limit_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usVCETableOffset) + 1 +
 				 1 + array->ucNumEntries * sizeof(VCEClockInfo));
 			ATOM_PPLIB_VCE_State_Table *states =
 				(ATOM_PPLIB_VCE_State_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usVCETableOffset) + 1 +
 				 1 + (array->ucNumEntries * sizeof (VCEClockInfo)) +
 				 1 + (limits->numEntries * sizeof(ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record)));
@@ -580,11 +580,11 @@ int amdgpu_parse_extended_power_table(st
 		if ((le16_to_cpu(ext_hdr->usSize) >= SIZE_OF_ATOM_PPLIB_EXTENDEDHEADER_V3) &&
 			ext_hdr->usUVDTableOffset) {
 			UVDClockInfoArray *array = (UVDClockInfoArray *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usUVDTableOffset) + 1);
 			ATOM_PPLIB_UVD_Clock_Voltage_Limit_Table *limits =
 				(ATOM_PPLIB_UVD_Clock_Voltage_Limit_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usUVDTableOffset) + 1 +
 				 1 + (array->ucNumEntries * sizeof (UVDClockInfo)));
 			ATOM_PPLIB_UVD_Clock_Voltage_Limit_Record *entry;
@@ -617,7 +617,7 @@ int amdgpu_parse_extended_power_table(st
 			ext_hdr->usSAMUTableOffset) {
 			ATOM_PPLIB_SAMClk_Voltage_Limit_Table *limits =
 				(ATOM_PPLIB_SAMClk_Voltage_Limit_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usSAMUTableOffset) + 1);
 			ATOM_PPLIB_SAMClk_Voltage_Limit_Record *entry;
 			u32 size = limits->numEntries *
@@ -643,7 +643,7 @@ int amdgpu_parse_extended_power_table(st
 		if ((le16_to_cpu(ext_hdr->usSize) >= SIZE_OF_ATOM_PPLIB_EXTENDEDHEADER_V5) &&
 		    ext_hdr->usPPMTableOffset) {
 			ATOM_PPLIB_PPM_Table *ppm = (ATOM_PPLIB_PPM_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usPPMTableOffset));
 			adev->pm.dpm.dyn_state.ppm_table =
 				kzalloc(sizeof(struct amdgpu_ppm_table), GFP_KERNEL);
@@ -675,7 +675,7 @@ int amdgpu_parse_extended_power_table(st
 			ext_hdr->usACPTableOffset) {
 			ATOM_PPLIB_ACPClk_Voltage_Limit_Table *limits =
 				(ATOM_PPLIB_ACPClk_Voltage_Limit_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usACPTableOffset) + 1);
 			ATOM_PPLIB_ACPClk_Voltage_Limit_Record *entry;
 			u32 size = limits->numEntries *
@@ -700,7 +700,7 @@ int amdgpu_parse_extended_power_table(st
 		}
 		if ((le16_to_cpu(ext_hdr->usSize) >= SIZE_OF_ATOM_PPLIB_EXTENDEDHEADER_V7) &&
 			ext_hdr->usPowerTuneTableOffset) {
-			u8 rev = *(u8 *)((char *)mode_info->atom_context->bios + data_offset +
+			u8 rev = *(u8 *)(mode_info->atom_context->bios + data_offset +
 					 le16_to_cpu(ext_hdr->usPowerTuneTableOffset));
 			ATOM_PowerTune_Table *pt;
 			adev->pm.dpm.dyn_state.cac_tdp_table =
@@ -711,14 +711,14 @@ int amdgpu_parse_extended_power_table(st
 			}
 			if (rev > 0) {
 				ATOM_PPLIB_POWERTUNE_Table_V1 *ppt = (ATOM_PPLIB_POWERTUNE_Table_V1 *)
-					((char *)mode_info->atom_context->bios + data_offset +
+					(mode_info->atom_context->bios + data_offset +
 					 le16_to_cpu(ext_hdr->usPowerTuneTableOffset));
 				adev->pm.dpm.dyn_state.cac_tdp_table->maximum_power_delivery_limit =
 					ppt->usMaximumPowerDeliveryLimit;
 				pt = &ppt->power_tune_table;
 			} else {
 				ATOM_PPLIB_POWERTUNE_Table *ppt = (ATOM_PPLIB_POWERTUNE_Table *)
-					((char *)mode_info->atom_context->bios + data_offset +
+					(mode_info->atom_context->bios + data_offset +
 					 le16_to_cpu(ext_hdr->usPowerTuneTableOffset));
 				adev->pm.dpm.dyn_state.cac_tdp_table->maximum_power_delivery_limit = 255;
 				pt = &ppt->power_tune_table;
@@ -739,7 +739,7 @@ int amdgpu_parse_extended_power_table(st
 		if ((le16_to_cpu(ext_hdr->usSize) >= SIZE_OF_ATOM_PPLIB_EXTENDEDHEADER_V8) &&
 				ext_hdr->usSclkVddgfxTableOffset) {
 			dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
-				((char *)mode_info->atom_context->bios + data_offset +
+				(mode_info->atom_context->bios + data_offset +
 				 le16_to_cpu(ext_hdr->usSclkVddgfxTableOffset));
 			ret = amdgpu_parse_clk_voltage_dep_table(
 					&adev->pm.dpm.dyn_state.vddgfx_dependency_on_sclk,
@@ -810,7 +810,7 @@ void amdgpu_add_thermal_controller(struc
 				   &frev, &crev, &data_offset))
 		return;
 	power_table = (ATOM_PPLIB_POWERPLAYTABLE *)
-		((char *)mode_info->atom_context->bios + data_offset);
+		(mode_info->atom_context->bios + data_offset);
 	controller = &power_table->sThermalController;
 
 	/* add the i2c bus for thermal/fan chip */
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.3	Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_fence.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_fence.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -31,7 +31,7 @@
  *    Dave Airlie
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <asm/byteorder.h>
 #include <linux/seq_file.h>
@@ -499,7 +499,7 @@ int amdgpu_fence_driver_start_ring(struc
 #else
 		index = ALIGN(adev->uvd.fw->size, 8);
 #endif
-		ring->fence_drv.cpu_addr = (void *)((char *)adev->uvd.cpu_addr + index);
+		ring->fence_drv.cpu_addr = adev->uvd.cpu_addr + index;
 		ring->fence_drv.gpu_addr = adev->uvd.gpu_addr + index;
 	}
 	amdgpu_fence_write(ring, atomic64_read(&ring->fence_drv.last_seq));
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c:1.3	Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_test.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_test.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2009 VMware, Inc.
@@ -24,7 +24,7 @@
  * Authors: Michel Dänzer
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_test.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_test.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
@@ -108,7 +108,7 @@ static void amdgpu_do_test_moves(struct 
 			goto out_lclean_unpin;
 		}
 
-		for (gtt_start = gtt_map, gtt_end = (void **)((char *)gtt_map + size);
+		for (gtt_start = gtt_map, gtt_end = gtt_map + size;
 		     gtt_start < gtt_end;
 		     gtt_start++)
 			*gtt_start = gtt_start;
@@ -137,8 +137,8 @@ static void amdgpu_do_test_moves(struct 
 			goto out_lclean_unpin;
 		}
 
-		for (gtt_start = gtt_map, gtt_end = (void **)((char *)gtt_map + size),
-		     vram_start = vram_map, vram_end = (void **)((char *)vram_map + size);
+		for (gtt_start = gtt_map, gtt_end = gtt_map + size,
+		     vram_start = vram_map, vram_end = vram_map + size;
 		     vram_start < vram_end;
 		     gtt_start++, vram_start++) {
 			if (*vram_start != gtt_start) {
@@ -148,10 +148,10 @@ static void amdgpu_do_test_moves(struct 
 					  i, *vram_start, gtt_start,
 					  (unsigned long long)
 					  (gtt_addr - adev->mc.gtt_start +
-					   (char *)gtt_start - (char *)gtt_map),
+					   (void*)gtt_start - gtt_map),
 					  (unsigned long long)
 					  (vram_addr - adev->mc.vram_start +
-					   (char *)gtt_start - (char *)gtt_map));
+					   (void*)gtt_start - gtt_map));
 				amdgpu_bo_kunmap(vram_obj);
 				goto out_lclean_unpin;
 			}
@@ -182,8 +182,8 @@ static void amdgpu_do_test_moves(struct 
 			goto out_lclean_unpin;
 		}
 
-		for (gtt_start = gtt_map, gtt_end = (void **)((char *)gtt_map + size),
-		     vram_start = vram_map, vram_end = (void **)((char *)vram_map + size);
+		for (gtt_start = gtt_map, gtt_end = gtt_map + size,
+		     vram_start = vram_map, vram_end = vram_map + size;
 		     gtt_start < gtt_end;
 		     gtt_start++, vram_start++) {
 			if (*gtt_start != vram_start) {
@@ -193,10 +193,10 @@ static void amdgpu_do_test_moves(struct 
 					  i, *gtt_start, vram_start,
 					  (unsigned long long)
 					  (vram_addr - adev->mc.vram_start +
-					   (char *)vram_start - (char *)vram_map),
+					   (void*)vram_start - vram_map),
 					  (unsigned long long)
 					  (gtt_addr - adev->mc.gtt_start +
-					   (char *)vram_start - (char *)vram_map));
+					   (void*)vram_start - vram_map));
 				amdgpu_bo_kunmap(gtt_obj[i]);
 				goto out_lclean_unpin;
 			}
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c:1.3	Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_ucode.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_ucode.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ucode.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ucode.c,v 1.4 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/slab.h>
@@ -292,7 +292,7 @@ int amdgpu_ucode_init_bo(struct amdgpu_d
 		if (ucode->fw) {
 			header = (const struct common_firmware_header *)ucode->fw->data;
 			amdgpu_ucode_init_single_fw(ucode, fw_mc_addr + fw_offset,
-						    (char *)fw_buf_ptr + fw_offset);
+						    fw_buf_ptr + fw_offset);
 #ifdef __NetBSD__		/* XXX ALIGN means something else */
 			fw_offset += round_up(le32_to_cpu(header->ucode_size_bytes), PAGE_SIZE);
 #else

Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_bo_list.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_bo_list.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_bo_list.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_bo_list.c:1.4	Mon Aug 27 14:14:28 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_bo_list.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_bo_list.c,v 1.4 2018/08/27 14:14:28 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_bo_list.c,v 1.5 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_bo_list.c,v 1.4 2018/08/27 14:14:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_bo_list.c,v 1.5 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include "amdgpu.h"
@@ -233,7 +233,7 @@ int amdgpu_bo_list_ioctl(struct drm_devi
 			if (copy_from_user(&info[i], uptr, bytes))
 				goto error_free;
 			
-			uptr = ((const char *)uptr + args->in.bo_info_size);
+			uptr += args->in.bo_info_size;
 		}
 	}
 
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.4	Tue Jan  1 08:07:47 2019
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_uvd.c,v 1.4 2019/01/01 08:07:47 maya Exp $	*/
+/*	$NetBSD: amdgpu_uvd.c,v 1.5 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.4 2019/01/01 08:07:47 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.5 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
@@ -287,7 +287,7 @@ int amdgpu_uvd_resume(struct amdgpu_devi
 	size = amdgpu_bo_size(adev->uvd.vcpu_bo);
 	size -= le32_to_cpu(hdr->ucode_size_bytes);
 	ptr = adev->uvd.cpu_addr;
-	ptr = (char *)ptr + le32_to_cpu(hdr->ucode_size_bytes);
+	ptr += le32_to_cpu(hdr->ucode_size_bytes);
 
 	memset(ptr, 0, size);
 
@@ -570,7 +570,7 @@ static int amdgpu_uvd_cs_msg(struct amdg
 		return r;
 	}
 
-	msg = (void *)((char *)ptr + offset);
+	msg = ptr + offset;
 
 	msg_type = msg[1];
 	handle = msg[2];

Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c:1.2	Sat Feb 23 19:36:15 2019
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cz_smc.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_cz_smc.c,v 1.2 2019/02/23 19:36:15 kamil Exp $	*/
+/*	$NetBSD: amdgpu_cz_smc.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_smc.c,v 1.2 2019/02/23 19:36:15 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_cz_smc.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <asm/byteorder.h>
@@ -501,7 +501,7 @@ static int cz_smu_populate_single_scratc
 
 	priv->smu_buffer_used_bytes += size_in_byte;
 	entry->data_size = size_in_byte;
-	entry->kaddr = (char *)priv->smu_buffer.kaddr + priv->smu_buffer_used_bytes;
+	entry->kaddr = priv->smu_buffer.kaddr + priv->smu_buffer_used_bytes;
 	entry->mc_addr_low = lower_32_bits(mc_addr);
 	entry->mc_addr_high = upper_32_bits(mc_addr);
 	entry->firmware_ID = scratch_type;
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v10_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v10_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v10_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v10_0.c:1.2	Mon Aug 27 14:39:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v10_0.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_dce_v10_0.c,v 1.2 2018/08/27 14:39:20 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_dce_v10_0.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_v10_0.c,v 1.2 2018/08/27 14:39:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_v10_0.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $");
 
 #include "drmP.h"
 #include "amdgpu.h"
@@ -1717,7 +1717,7 @@ static void dce_v10_0_afmt_update_avi_in
 	struct amdgpu_device *adev = dev->dev_private;
 	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
 	struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
-	uint8_t *frame = (uint8_t *)buffer + 3;
+	uint8_t *frame = buffer + 3;
 	uint8_t *header = buffer;
 
 	WREG32(mmAFMT_AVI_INFO0 + dig->afmt->offset,
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v11_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v11_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v11_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v11_0.c:1.2	Mon Aug 27 14:39:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_dce_v11_0.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_dce_v11_0.c,v 1.2 2018/08/27 14:39:20 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_dce_v11_0.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_v11_0.c,v 1.2 2018/08/27 14:39:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_v11_0.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $");
 
 #include "drmP.h"
 #include "amdgpu.h"
@@ -1705,7 +1705,7 @@ static void dce_v11_0_afmt_update_avi_in
 	struct amdgpu_device *adev = dev->dev_private;
 	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
 	struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
-	uint8_t *frame = (uint8_t *)buffer + 3;
+	uint8_t *frame = buffer + 3;
 	uint8_t *header = buffer;
 
 	WREG32(mmAFMT_AVI_INFO0 + dig->afmt->offset,
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c:1.2	Mon Aug 27 14:24:03 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_kv_dpm.c	Fri Feb 14 04:30:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_kv_dpm.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_kv_dpm.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_kv_dpm.c,v 1.2 2018/08/27 14:24:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_kv_dpm.c,v 1.3 2020/02/14 04:30:04 riastradh Exp $");
 
 #include <asm/byteorder.h>
 #include "drmP.h"
@@ -2603,7 +2603,7 @@ static int kv_parse_sys_info_table(struc
 
 	if (amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset)) {
-		igp_info = (union igp_info *)((char *)mode_info->atom_context->bios +
+		igp_info = (union igp_info *)(mode_info->atom_context->bios +
 					      data_offset);
 
 		if (crev != 8) {
@@ -2754,18 +2754,18 @@ static int kv_parse_power_table(struct a
 	if (!amdgpu_atom_parse_data_header(mode_info->atom_context, index, NULL,
 				   &frev, &crev, &data_offset))
 		return -EINVAL;
-	power_info = (union power_info *)((char *)mode_info->atom_context->bios + data_offset);
+	power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
 
 	amdgpu_add_thermal_controller(adev);
 
 	state_array = (struct _StateArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		 le16_to_cpu(power_info->pplib.usStateArrayOffset));
 	clock_info_array = (struct _ClockInfoArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		 le16_to_cpu(power_info->pplib.usClockInfoArrayOffset));
 	non_clock_info_array = (struct _NonClockInfoArray *)
-		((char *)mode_info->atom_context->bios + data_offset +
+		(mode_info->atom_context->bios + data_offset +
 		 le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset));
 
 	adev->pm.dpm.ps = kzalloc(sizeof(struct amdgpu_ps) *

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.20 src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.20	Thu Dec  5 20:25:54 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_cmd_parser.c,v 1.20 2019/12/05 20:25:54 maya Exp $	*/
+/*	$NetBSD: i915_cmd_parser.c,v 1.21 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright © 2013 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.20 2019/12/05 20:25:54 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.21 2020/02/14 04:30:05 riastradh Exp $");
 
 #include "i915_drv.h"
 #include <linux/bitmap.h>
@@ -1061,7 +1061,7 @@ static u32 *copy_batch(struct drm_i915_g
 	}
 #endif
 
-	src = (const char *)src_base + offset_in_page(batch_start_offset);
+	src = src_base + offset_in_page(batch_start_offset);
 	if (needs_clflush)
 		drm_clflush_virt_range(src, batch_len);
 

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.56 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.57
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.56	Fri Jan 17 19:56:50 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_gem.c,v 1.56 2020/01/17 19:56:50 ad Exp $	*/
+/*	$NetBSD: i915_gem.c,v 1.57 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.56 2020/01/17 19:56:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.57 2020/02/14 04:30:05 riastradh Exp $");
 
 #ifdef __NetBSD__
 #if 0				/* XXX uvmhist option?  */
@@ -404,7 +404,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem
 		     struct drm_file *file_priv)
 {
 	struct drm_device *dev = obj->base.dev;
-	void *vaddr = (char *)obj->phys_handle->vaddr + args->offset;
+	void *vaddr = obj->phys_handle->vaddr + args->offset;
 	char __user *user_data = to_user_ptr(args->data_ptr);
 	int ret = 0;
 

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c:1.8	Mon Aug 27 15:09:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_guc_submission.c,v 1.8 2018/08/27 15:09:35 riastradh Exp $	*/
+/*	$NetBSD: i915_guc_submission.c,v 1.9 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -24,7 +24,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_guc_submission.c,v 1.8 2018/08/27 15:09:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_guc_submission.c,v 1.9 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <linux/bitmap.h>
 #include <linux/firmware.h>
@@ -194,7 +194,7 @@ static void guc_init_doorbell(struct int
 	void *base;
 
 	base = kmap_atomic(i915_gem_object_get_page(client->client_obj, 0));
-	doorbell = (void *)((char *)base + client->doorbell_offset);
+	doorbell = base + client->doorbell_offset;
 
 	doorbell->db_status = 1;
 	doorbell->cookie = 0;
@@ -211,7 +211,7 @@ static int guc_ring_doorbell(struct i915
 	int attempt = 2, ret = -EAGAIN;
 
 	base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, 0));
-	desc = (void *)((char *)base + gc->proc_desc_offset);
+	desc = base + gc->proc_desc_offset;
 
 	/* Update the tail so it is visible to GuC */
 	desc->tail = gc->wq_tail;
@@ -227,7 +227,7 @@ static int guc_ring_doorbell(struct i915
 		db_exc.cookie = 1;
 
 	/* pointer of current doorbell cacheline */
-	db = (void *)((char *)base + gc->doorbell_offset);
+	db = base + gc->doorbell_offset;
 
 	while (attempt--) {
 		/* lets ring the doorbell */
@@ -270,7 +270,7 @@ static void guc_disable_doorbell(struct 
 	int value;
 
 	base = kmap_atomic(i915_gem_object_get_page(client->client_obj, 0));
-	doorbell = (void *)((char *)base + client->doorbell_offset);
+	doorbell = base + client->doorbell_offset;
 
 	doorbell->db_status = 0;
 
@@ -361,7 +361,7 @@ static void guc_init_proc_desc(struct in
 	void *base;
 
 	base = kmap_atomic(i915_gem_object_get_page(client->client_obj, 0));
-	desc = (void *)((char *)base + client->proc_desc_offset);
+	desc = base + client->proc_desc_offset;
 
 	memset(desc, 0, sizeof(*desc));
 
@@ -560,7 +560,7 @@ static int guc_get_workqueue_space(struc
 	int ret = 0, timeout_counter = 200;
 
 	base = kmap_atomic(i915_gem_object_get_page(gc->client_obj, 0));
-	desc = (void *)((char *)base + gc->proc_desc_offset);
+	desc = base + gc->proc_desc_offset;
 
 	while (timeout_counter-- > 0) {
 		ret = wait_for_atomic(CIRC_SPACE(gc->wq_tail, desc->head,

Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c:1.7	Mon Aug 27 07:19:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_bios.c,v 1.7 2018/08/27 07:19:55 riastradh Exp $	*/
+/*	$NetBSD: intel_bios.c,v 1.8 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright © 2006 Intel Corporation
@@ -27,7 +27,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_bios.c,v 1.7 2018/08/27 07:19:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_bios.c,v 1.8 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <linux/dmi.h>
 #include <drm/drm_dp_helper.h>
@@ -1256,7 +1256,7 @@ static const struct bdb_header *validate
 					     const void *_vbt,
 					     const char *source)
 {
-	size_t offset = (const char *)_vbt - (const char *)base;
+	size_t offset = _vbt - base;
 	const struct vbt_header *vbt = _vbt;
 	const struct bdb_header *bdb;
 
@@ -1276,7 +1276,7 @@ static const struct bdb_header *validate
 		return NULL;
 	}
 
-	bdb = (const void *)((const char *)base + offset);
+	bdb = base + offset;
 	if (offset + bdb->bdb_size > size) {
 		DRM_DEBUG_DRIVER("BDB incomplete\n");
 		return NULL;
@@ -1318,7 +1318,7 @@ static const struct bdb_header *find_vbt
 			 */
 			void *_bios = (void __force *) bios;
 
-			bdb = validate_vbt(_bios, size, (char *)_bios + i, "PCI ROM");
+			bdb = validate_vbt(_bios, size, _bios + i, "PCI ROM");
 			break;
 		}
 	}

Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.15 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.15	Mon Feb 10 21:54:26 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_opregion.c,v 1.15 2020/02/10 21:54:26 maya Exp $	*/
+/*	$NetBSD: intel_opregion.c,v 1.16 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright 2008 Intel Corporation <hong....@intel.com>
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.15 2020/02/10 21:54:26 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.16 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <linux/printk.h>
 #include <linux/acpi.h>
@@ -1017,24 +1017,24 @@ int intel_opregion_setup(struct drm_devi
 		goto err_out;
 	}
 	opregion->header = base;
-	opregion->vbt = (char *)base + OPREGION_VBT_OFFSET;
+	opregion->vbt = base + OPREGION_VBT_OFFSET;
 
-	opregion->lid_state = (void *)((char *)base + ACPI_CLID);
+	opregion->lid_state = base + ACPI_CLID;
 
 	mboxes = opregion->header->mboxes;
 	if (mboxes & MBOX_ACPI) {
 		DRM_DEBUG_DRIVER("Public ACPI methods supported\n");
-		opregion->acpi = (void *)((char *)base + OPREGION_ACPI_OFFSET);
+		opregion->acpi = base + OPREGION_ACPI_OFFSET;
 	}
 
 	if (mboxes & MBOX_SWSCI) {
 		DRM_DEBUG_DRIVER("SWSCI supported\n");
-		opregion->swsci = (void *)((char *)base + OPREGION_SWSCI_OFFSET);
+		opregion->swsci = base + OPREGION_SWSCI_OFFSET;
 		swsci_setup(dev);
 	}
 	if (mboxes & MBOX_ASLE) {
 		DRM_DEBUG_DRIVER("ASLE supported\n");
-		opregion->asle = (void *)((char *)base + OPREGION_ASLE_OFFSET);
+		opregion->asle = base + OPREGION_ASLE_OFFSET;
 
 		opregion->asle->ardy = ASLE_ARDY_NOT_READY;
 	}

Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.5	Mon Aug 27 07:28:57 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_psr.c,v 1.5 2018/08/27 07:28:57 riastradh Exp $	*/
+/*	$NetBSD: intel_psr.c,v 1.6 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.5 2018/08/27 07:28:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.6 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <drm/drmP.h>
 
@@ -87,7 +87,7 @@ static void intel_psr_write_vsc(struct i
 	enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
 	u32 ctl_reg = HSW_TVIDEO_DIP_CTL(cpu_transcoder);
 	uint32_t data;
-	const char *ptr = (const char *)vsc_psr;
+	const char *ptr = (const void *)vsc_psr;
 	unsigned int i;
 
 	/* As per BSPec (Pipe Video Data Island Packet), we need to disable

Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c:1.3	Mon Aug 27 07:42:02 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.3 2018/08/27 07:42:02 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.4 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -23,7 +23,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.3 2018/08/27 07:42:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.4 2020/02/14 04:30:05 riastradh Exp $");
 
 #include "priv.h"
 
@@ -44,8 +44,7 @@ pcirom_read(void *data, u32 offset, u32 
 {
 	struct priv *priv = data;
 	if (offset + length <= priv->size) {
-		memcpy_fromio(bios->data + offset,
-		    (const char __iomem *)priv->rom + offset, length);
+		memcpy_fromio(bios->data + offset, priv->rom + offset, length);
 		return length;
 	}
 	return 0;

Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c:1.4	Mon Aug 27 14:51:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_base.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.4 2018/08/27 14:51:33 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.5 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.4 2018/08/27 14:51:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_base.c,v 1.5 2020/02/14 04:30:05 riastradh Exp $");
 
 #include "priv.h"
 
@@ -118,13 +118,13 @@ iowrite32_native(uint32_t v, void __iome
 static u32
 nvkm_instobj_rd32(struct nvkm_memory *memory, u64 offset)
 {
-	return ioread32_native((const char *)nvkm_instobj(memory)->map + offset);
+	return ioread32_native(nvkm_instobj(memory)->map + offset);
 }
 
 static void
 nvkm_instobj_wr32(struct nvkm_memory *memory, u64 offset, u32 data)
 {
-	iowrite32_native(data, (char *)nvkm_instobj(memory)->map + offset);
+	iowrite32_native(data, nvkm_instobj(memory)->map + offset);
 }
 
 #ifdef __NetBSD__

Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_nv40.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_nv40.c:1.7 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_nv40.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_nv40.c:1.7	Wed Aug 29 15:52:27 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_nv40.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.7 2018/08/29 15:52:27 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.8 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.7 2018/08/29 15:52:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.8 2020/02/14 04:30:05 riastradh Exp $");
 
 #define nv40_instmem(p) container_of((p), struct nv40_instmem, base)
 #include "priv.h"
@@ -81,7 +81,7 @@ static void __iomem *
 nv40_instobj_acquire(struct nvkm_memory *memory)
 {
 	struct nv40_instobj *iobj = nv40_instobj(memory);
-	return (char __iomem *)iobj->imem->iomem + iobj->node->offset;
+	return iobj->imem->iomem + iobj->node->offset;
 }
 
 static void

Index: src/sys/external/bsd/drm2/dist/drm/radeon/drm_buffer.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/drm_buffer.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/drm_buffer.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/drm_buffer.c:1.2	Mon Aug 27 04:58:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/drm_buffer.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_buffer.c,v 1.2 2018/08/27 04:58:35 riastradh Exp $	*/
+/*	$NetBSD: drm_buffer.c,v 1.3 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /**************************************************************************
  *
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_buffer.c,v 1.2 2018/08/27 04:58:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_buffer.c,v 1.3 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <linux/export.h>
 #include "drm_buffer.h"
@@ -115,7 +115,7 @@ int drm_buffer_copy_from_user(struct drm
 	for (idx = 0; idx < nr_pages; ++idx) {
 
 		if (copy_from_user(buf->data[idx],
-			(const char *)user_data + idx * PAGE_SIZE,
+			user_data + idx * PAGE_SIZE,
 			min(PAGE_SIZE, size - idx * PAGE_SIZE))) {
 			DRM_ERROR("Failed to copy user data (%p) to drm buffer"
 					" (%p) %dth page.\n",
@@ -171,7 +171,7 @@ void *drm_buffer_read_object(struct drm_
 		int beginsz = PAGE_SIZE - idx;
 		memcpy(stack_obj, &buf->data[page][idx], beginsz);
 
-		memcpy((char *)stack_obj + beginsz, &buf->data[page + 1][0],
+		memcpy(stack_obj + beginsz, &buf->data[page + 1][0],
 				objsize - beginsz);
 
 		obj = stack_obj;

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_test.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_test.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_test.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_test.c:1.3	Mon Aug 27 04:58:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_test.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_test.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $	*/
+/*	$NetBSD: radeon_test.c,v 1.4 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright 2009 VMware, Inc.
@@ -24,7 +24,7 @@
  * Authors: Michel Dänzer
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_test.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_test.c,v 1.4 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/radeon_drm.h>
@@ -114,7 +114,7 @@ static void radeon_do_test_moves(struct 
 			goto out_lclean_unpin;
 		}
 
-		for (gtt_start = gtt_map, gtt_end = gtt_start + size;
+		for (gtt_start = gtt_map, gtt_end = gtt_map + size;
 		     gtt_start < gtt_end;
 		     gtt_start++)
 			*gtt_start = gtt_start;
@@ -149,8 +149,8 @@ static void radeon_do_test_moves(struct 
 			goto out_lclean_unpin;
 		}
 
-		for (gtt_start = gtt_map, gtt_end = gtt_start + size,
-		     vram_start = vram_map, vram_end = vram_start + size;
+		for (gtt_start = gtt_map, gtt_end = gtt_map + size,
+		     vram_start = vram_map, vram_end = vram_map + size;
 		     vram_start < vram_end;
 		     gtt_start++, vram_start++) {
 			if (*vram_start != gtt_start) {
@@ -160,10 +160,10 @@ static void radeon_do_test_moves(struct 
 					  i, *vram_start, gtt_start,
 					  (unsigned long long)
 					  (gtt_addr - rdev->mc.gtt_start +
-					   (u8*)gtt_start - (u8*)gtt_map),
+					   (void*)gtt_start - gtt_map),
 					  (unsigned long long)
 					  (vram_addr - rdev->mc.vram_start +
-					   (u8*)gtt_start - (u8*)gtt_map));
+					   (void*)gtt_start - gtt_map));
 				radeon_bo_kunmap(vram_obj);
 				goto out_lclean_unpin;
 			}
@@ -200,8 +200,8 @@ static void radeon_do_test_moves(struct 
 			goto out_lclean_unpin;
 		}
 
-		for (gtt_start = gtt_map, gtt_end = gtt_start + size,
-		     vram_start = vram_map, vram_end = vram_start + size;
+		for (gtt_start = gtt_map, gtt_end = gtt_map + size,
+		     vram_start = vram_map, vram_end = vram_map + size;
 		     gtt_start < gtt_end;
 		     gtt_start++, vram_start++) {
 			if (*gtt_start != vram_start) {
@@ -211,10 +211,10 @@ static void radeon_do_test_moves(struct 
 					  i, *gtt_start, vram_start,
 					  (unsigned long long)
 					  (vram_addr - rdev->mc.vram_start +
-					   (u8*)vram_start - (u8*)vram_map),
+					   (void*)vram_start - vram_map),
 					  (unsigned long long)
 					  (gtt_addr - rdev->mc.gtt_start +
-					   (u8*)vram_start - (u8*)vram_map));
+					   (void*)vram_start - vram_map));
 				radeon_bo_kunmap(gtt_obj[i]);
 				goto out_lclean_unpin;
 			}

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd.c:1.4	Mon Aug 27 07:50:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd.c	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_uvd.c,v 1.4 2018/08/27 07:50:30 riastradh Exp $	*/
+/*	$NetBSD: radeon_uvd.c,v 1.5 2020/02/14 04:30:05 riastradh Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_uvd.c,v 1.4 2018/08/27 07:50:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_uvd.c,v 1.5 2020/02/14 04:30:05 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
@@ -242,7 +242,7 @@ int radeon_uvd_suspend(struct radeon_dev
 int radeon_uvd_resume(struct radeon_device *rdev)
 {
 	unsigned size;
-	uint8_t *ptr;
+	void *ptr;
 
 	if (rdev->uvd.vcpu_bo == NULL)
 		return -EINVAL;
@@ -469,7 +469,7 @@ static int radeon_uvd_cs_msg(struct rade
 		return r;
 	}
 
-	msg = (int32_t *)((uint8_t *)ptr + offset);
+	msg = ptr + offset;
 
 	msg_type = msg[1];
 	handle = msg[2];
@@ -753,7 +753,7 @@ int radeon_uvd_get_create_msg(struct rad
 	uint64_t offs = radeon_bo_size(rdev->uvd.vcpu_bo) -
 		RADEON_GPU_PAGE_SIZE;
 
-	uint32_t *msg = (void *)((char *)rdev->uvd.cpu_addr + offs);
+	uint32_t *msg = rdev->uvd.cpu_addr + offs;
 	uint64_t addr = rdev->uvd.gpu_addr + offs;
 
 	int r, i;
@@ -789,7 +789,7 @@ int radeon_uvd_get_destroy_msg(struct ra
 	uint64_t offs = radeon_bo_size(rdev->uvd.vcpu_bo) -
 		RADEON_GPU_PAGE_SIZE;
 
-	uint32_t *msg = (void *)((char *)rdev->uvd.cpu_addr + offs);
+	uint32_t *msg = rdev->uvd.cpu_addr + offs;
 	uint64_t addr = rdev->uvd.gpu_addr + offs;
 
 	int r, i;

Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.33 src/sys/external/bsd/drm2/drm/files.drmkms:1.34
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.33	Mon Dec  9 15:37:26 2019
+++ src/sys/external/bsd/drm2/drm/files.drmkms	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.drmkms,v 1.33 2019/12/09 15:37:26 jakllsch Exp $
+#	$NetBSD: files.drmkms,v 1.34 2020/02/14 04:30:05 riastradh Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -52,8 +52,11 @@ file	external/bsd/drm2/drm/drmfb.c			drm
 include "external/bsd/drm2/ttm/files.ttm"
 
 makeoptions 	drmkms 	"CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
+makeoptions 	drmkms 	"CWARNFLAGS.drm_bufs.c"+="-Wno-pointer-arith"
 makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
+makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-pointer-arith"
 makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
+makeoptions 	drmkms 	"CWARNFLAGS.drm_dp_helper.c"+="-Wno-pointer-arith"
 makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"
 makeoptions 	drmkms 	"CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"
 

Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.38 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.39
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.38	Mon Sep 30 00:06:02 2019
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i915drmkms,v 1.38 2019/09/30 00:06:02 mrg Exp $
+#	$NetBSD: files.i915drmkms,v 1.39 2020/02/14 04:30:05 riastradh Exp $
 
 version	20180827
 
@@ -18,6 +18,7 @@ makeoptions	i915drmkms	CPPFLAGS+="-DCONF
 makeoptions	i915drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
 
 makeoptions	i915drmkms	"CWARNFLAGS.i915drmkms"+="-Wno-shadow"
+makeoptions	i915drmkms	"CWARNFLAGS.i915drmkms"+="-Wno-pointer-arith"
 
 makeoptions 	i915drmkms 	"CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
 makeoptions 	i915drmkms 	"CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"

Index: src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.28 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.29
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.28	Mon Sep 30 00:06:02 2019
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.nouveau,v 1.28 2019/09/30 00:06:02 mrg Exp $
+#	$NetBSD: files.nouveau,v 1.29 2020/02/14 04:30:05 riastradh Exp $
 
 version	20180827
 
@@ -31,6 +31,9 @@ makeoptions	nouveau	"CWARNFLAGS.nouveau"
 makeoptions	nouveau	"CWARNFLAGS.nouveau"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
 makeoptions	nouveau	"CWARNFLAGS.nouveau_nvkm_subdev_bios_timing.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=int-in-bool-context :}"
 makeoptions	nouveau	"CWARNFLAGS.nouveau_nvkm_subdev_clk_gt215.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=int-in-bool-context :}"
+makeoptions	nouveau	"CWARNFLAGS.nouveau_nvkm_subdev_instmem_base.c"+="-Wno-pointer-arith"
+makeoptions	nouveau	"CWARNFLAGS.nouveau_nvkm_subdev_bios_shadowpci.c"+="-Wno-pointer-arith"
+makeoptions	nouveau	"CWARNFLAGS.nouveau_nvkm_subdev_instmem_nv40.c"+="-Wno-pointer-arith"
 
 file	external/bsd/drm2/nouveau/nouveau_module.c	nouveau
 

Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.27 src/sys/external/bsd/drm2/radeon/files.radeon:1.28
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.27	Mon Sep 30 00:06:02 2019
+++ src/sys/external/bsd/drm2/radeon/files.radeon	Fri Feb 14 04:30:05 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.radeon,v 1.27 2019/09/30 00:06:02 mrg Exp $
+#	$NetBSD: files.radeon,v 1.28 2020/02/14 04:30:05 riastradh Exp $
 
 version	20180827
 
@@ -20,6 +20,7 @@ makeoptions	radeon	CPPFLAGS+="-I$S/exter
 
 makeoptions	radeon	"CWARNFLAGS.radeon"+="-Wno-missing-field-initializers"
 makeoptions	radeon	"CWARNFLAGS.radeon"+="-Wno-missing-prototypes"
+makeoptions	radeon	"CWARNFLAGS.radeon"+="-Wno-pointer-arith"
 makeoptions	radeon	"CWARNFLAGS.radeon"+="-Wno-shadow"
 makeoptions	radeon	"CWARNFLAGS.radeon"+="-Wno-unused-const-variable"