Module Name: src
Committed By: riastradh
Date: Fri Feb 14 04:37:29 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_crtc.c drm_fb_helper.c
drm_prime.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_abi16.c
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04:
nouveau_dispnv04_arb.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp:
nouveau_nvkm_engine_disp_dport.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios:
nouveau_nvkm_subdev_bios_pll.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit:
nouveau_nvkm_subdev_devinit_nv04.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm:
nouveau_nvkm_subdev_mxm_nv50.c
src/sys/external/bsd/drm2/dist/drm/radeon: atombios.h
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c ttm_bo_util.c
src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_kms.c
Log Message:
Revert cosmetic changes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c \
src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/drm_prime.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c \
src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.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/drm_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.14 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.14 Fri Feb 14 04:36:55 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Fri Feb 14 04:37:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_crtc.c,v 1.14 2020/02/14 04:36:55 riastradh Exp $ */
+/* $NetBSD: drm_crtc.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $ */
/*
* Copyright (c) 2006-2008 Intel Corporation
@@ -32,7 +32,7 @@
* Jesse Barnes <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.14 2020/02/14 04:36:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $");
#include <linux/err.h>
#include <linux/spinlock.h>
@@ -3065,8 +3065,7 @@ int drm_mode_addfb(struct drm_device *de
void *data, struct drm_file *file_priv)
{
struct drm_mode_fb_cmd *or = data;
- static const struct drm_mode_fb_cmd2 zero_fbcmd;
- struct drm_mode_fb_cmd2 r = zero_fbcmd;
+ struct drm_mode_fb_cmd2 r = {};
int ret;
/* convert to new format and call new ioctl */
Index: src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.14 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.14 Fri Feb 14 04:37:09 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Fri Feb 14 04:37:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.14 2020/02/14 04:37:09 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
* Jesse Barnes <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.14 2020/02/14 04:37:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.15 2020/02/14 04:37:27 riastradh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -584,7 +584,7 @@ static struct sysrq_key_op sysrq_drm_fb_
.action_msg = "Restore framebuffer console",
};
#else
-static struct sysrq_key_op sysrq_drm_fb_helper_restore_op;
+static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { };
#endif
#ifndef __NetBSD__ /* XXX fb info */
Index: src/sys/external/bsd/drm2/dist/drm/drm_prime.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.8 src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.8 Fri Feb 14 04:35:19 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_prime.c Fri Feb 14 04:37:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_prime.c,v 1.8 2020/02/14 04:35:19 riastradh Exp $ */
+/* $NetBSD: drm_prime.c,v 1.9 2020/02/14 04:37:27 riastradh Exp $ */
/*
* Copyright © 2012 Red Hat
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.8 2020/02/14 04:35:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.9 2020/02/14 04:37:27 riastradh Exp $");
#include <linux/export.h>
#include <linux/dma-buf.h>
@@ -284,7 +284,7 @@ void drm_prime_remove_buf_handle_locked(
}
static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
- enum dma_data_direction dir)
+ enum dma_data_direction dir)
{
struct drm_prime_attachment *prime_attach = attach->priv;
struct drm_gem_object *obj = attach->dmabuf->priv;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c:1.4 Mon Aug 27 07:31:29 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_abi16.c,v 1.4 2018/08/27 07:31:29 riastradh Exp $ */
+/* $NetBSD: nouveau_abi16.c,v 1.5 2020/02/14 04:37:28 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_abi16.c,v 1.4 2018/08/27 07:31:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_abi16.c,v 1.5 2020/02/14 04:37:28 riastradh Exp $");
#include <nvif/client.h>
#include <nvif/driver.h>
@@ -509,8 +509,7 @@ nouveau_abi16_ioctl_notifierobj_alloc(AB
struct nouveau_abi16_ntfy *ntfy;
struct nvif_device *device = &abi16->device;
struct nvif_client *client;
- static const struct nv_dma_v0 zero_args;
- struct nv_dma_v0 args = zero_args;
+ struct nv_dma_v0 args = {};
int ret;
if (unlikely(!abi16))
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c:1.3 Mon Aug 27 04:58:29 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_dispnv04_arb.c,v 1.3 2018/08/27 04:58:29 riastradh Exp $ */
+/* $NetBSD: nouveau_dispnv04_arb.c,v 1.4 2020/02/14 04:37:28 riastradh Exp $ */
/*
* Copyright 1993-2003 NVIDIA, Corporation
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_arb.c,v 1.3 2018/08/27 04:58:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv04_arb.c,v 1.4 2020/02/14 04:37:28 riastradh Exp $");
#include <drm/drmP.h>
@@ -60,8 +60,8 @@ struct nv_sim_state {
static void
nv04_calc_arb(struct nv_fifo_info *fifo, struct nv_sim_state *arb)
{
- int pagemiss, cas, bpp;
- int nvclks, mclks, crtpagemiss;
+ int pagemiss, cas, width __unused, bpp;
+ int nvclks, mclks, pclks __unused, crtpagemiss;
int found, mclk_extra, mclk_loop, cbs, m1, p1;
int mclk_freq, pclk_freq, nvclk_freq;
int us_m, us_n, us_p, crtc_drain_rate;
@@ -72,9 +72,11 @@ nv04_calc_arb(struct nv_fifo_info *fifo,
nvclk_freq = arb->nvclk_khz;
pagemiss = arb->mem_page_miss;
cas = arb->mem_latency;
+ width = arb->memory_width >> 6;
bpp = arb->bpp;
cbs = 128;
+ pclks = 2;
nvclks = 10;
mclks = 13 + cas;
mclk_extra = 3;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c:1.3 Mon Aug 27 07:43:38 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_disp_dport.c,v 1.3 2018/08/27 07:43:38 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_disp_dport.c,v 1.4 2020/02/14 04:37:28 riastradh Exp $ */
/*
* Copyright 2013 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_dport.c,v 1.3 2018/08/27 07:43:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_disp_dport.c,v 1.4 2020/02/14 04:37:28 riastradh Exp $");
#include "dport.h"
#include "outpdp.h"
@@ -302,7 +302,7 @@ dp_link_train_fini(struct dp_state *dp)
};
/* post-train script */
- init.offset = outp->info.script[1];
+ init.offset = outp->info.script[1],
nvbios_exec(&init);
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c:1.2 Mon Aug 27 04:58:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_bios_pll.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_bios_pll.c,v 1.3 2020/02/14 04:37:28 riastradh Exp $ */
/*
* Copyright 2005-2006 Erik Waling
@@ -24,7 +24,7 @@
* SOFTWARE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_pll.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_pll.c,v 1.3 2020/02/14 04:37:28 riastradh Exp $");
#include <subdev/bios.h>
#include <subdev/bios/bit.h>
@@ -44,7 +44,7 @@ nv04_pll_mapping[] = {
{ PLL_MEMORY, 0x680504 },
{ PLL_VPLL0 , 0x680508 },
{ PLL_VPLL1 , 0x680520 },
- { }
+ {}
};
static struct pll_mapping
@@ -53,7 +53,7 @@ nv40_pll_mapping[] = {
{ PLL_MEMORY, 0x004020 },
{ PLL_VPLL0 , 0x680508 },
{ PLL_VPLL1 , 0x680520 },
- { }
+ {}
};
static struct pll_mapping
@@ -67,7 +67,7 @@ nv50_pll_mapping[] = {
{ PLL_UNK42 , 0x00e824 },
{ PLL_VPLL0 , 0x614100 },
{ PLL_VPLL1 , 0x614900 },
- { }
+ {}
};
static struct pll_mapping
@@ -79,7 +79,7 @@ g84_pll_mapping[] = {
{ PLL_UNK41 , 0x00e818 },
{ PLL_VPLL0 , 0x614100 },
{ PLL_VPLL1 , 0x614900 },
- { }
+ {}
};
static u16
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c:1.2 Mon Aug 27 04:58:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_devinit_nv04.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_devinit_nv04.c,v 1.3 2020/02/14 04:37:28 riastradh Exp $ */
/*
* Copyright (C) 2010 Francisco Jerez.
@@ -26,7 +26,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_devinit_nv04.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_devinit_nv04.c,v 1.3 2020/02/14 04:37:28 riastradh Exp $");
#include "nv04.h"
#include "fbmem.h"
@@ -125,16 +125,12 @@ powerctrl_1_shift(int chip_version, int
switch (reg) {
case 0x680520:
shift += 4;
- /*FALLTHROUGH*/
case 0x680508:
shift += 4;
- /*FALLTHROUGH*/
case 0x680504:
shift += 4;
- /*FALLTHROUGH*/
case 0x680500:
shift += 4;
- /*FALLTHROUGH*/
}
/*
@@ -255,16 +251,12 @@ setPLL_double_highregs(struct nvkm_devin
switch (reg1) {
case 0x680504:
shift_c040 += 2;
- /*FALLTHROUGH*/
case 0x680500:
shift_c040 += 2;
- /*FALLTHROUGH*/
case 0x680520:
shift_c040 += 2;
- /*FALLTHROUGH*/
case 0x680508:
shift_c040 += 2;
- /*FALLTHROUGH*/
}
savedc040 = nvkm_rd32(device, 0xc040);
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c:1.2 Mon Aug 27 04:58:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_mxm_nv50.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_mxm_nv50.c,v 1.3 2020/02/14 04:37:28 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_nv50.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mxm_nv50.c,v 1.3 2020/02/14 04:37:28 riastradh Exp $");
#include "mxms.h"
@@ -164,7 +164,6 @@ mxm_dcb_sanitise_entry(struct nvkm_bios
break;
case 0x0e: /* eDP, falls through to DPint */
ctx.outp[1] |= 0x00010000;
- /*FALLTHROUGH*/
case 0x07: /* DP internal, wtf is this?? HP8670w */
ctx.outp[1] |= 0x00000004; /* use_power_scripts? */
type = DCB_CONNECTOR_eDP;
Index: src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h:1.3 Mon Aug 27 04:58:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/atombios.h Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atombios.h,v 1.3 2018/08/27 04:58:35 riastradh Exp $ */
+/* $NetBSD: atombios.h,v 1.4 2020/02/14 04:37:28 riastradh Exp $ */
/*
* Copyright 2006-2007 Advanced Micro Devices, Inc.
@@ -1713,9 +1713,9 @@ typedef struct _PIXEL_CLOCK_PARAMETERS_V
#define PIXEL_CLOCK_V6_MISC_HDMI_BPP_MASK 0x0c
#define PIXEL_CLOCK_V6_MISC_HDMI_24BPP 0x00
#define PIXEL_CLOCK_V6_MISC_HDMI_36BPP 0x04
-#define PIXEL_CLOCK_V6_MISC_HDMI_36BPP_V6 0x08 //for V6, the correct definition for 36bpp should be 2 for 36bpp(2:1)
+#define PIXEL_CLOCK_V6_MISC_HDMI_36BPP_V6 0x08 //for V6, the correct defintion for 36bpp should be 2 for 36bpp(2:1)
#define PIXEL_CLOCK_V6_MISC_HDMI_30BPP 0x08
-#define PIXEL_CLOCK_V6_MISC_HDMI_30BPP_V6 0x04 //for V6, the correct definition for 30bpp should be 1 for 36bpp(5:4)
+#define PIXEL_CLOCK_V6_MISC_HDMI_30BPP_V6 0x04 //for V6, the correct defintion for 30bpp should be 1 for 36bpp(5:4)
#define PIXEL_CLOCK_V6_MISC_HDMI_48BPP 0x0c
#define PIXEL_CLOCK_V6_MISC_REF_DIV_SRC 0x10
#define PIXEL_CLOCK_V6_MISC_GEN_DPREFCLK 0x40
@@ -2038,7 +2038,7 @@ typedef struct _LVDS_ENCODER_CONTROL_PAR
typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS_V2
{
USHORT usPixelClock; // in 10KHz; for bios convenient
- UCHAR ucMisc; // see PANEL_ENCODER_MISC_xx definitions below
+ UCHAR ucMisc; // see PANEL_ENCODER_MISC_xx defintions below
UCHAR ucAction; // 0: turn off encoder
// 1: setup and turn on encoder
UCHAR ucTruncate; // bit0=0: Disable truncate
@@ -3734,7 +3734,7 @@ typedef struct _ATOM_DPCD_INFO
#define ATOM_DPCD_MAX_LANE_MASK 0x1F
/**************************************************************************/
-// VRAM usage and their definitions
+// VRAM usage and their defintions
// One chunk of VRAM used by Bios are for HWICON surfaces,EDID data.
// Current Mode timing and Dail Timing and/or STD timing data EACH device. They can be broken down as below.
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.17 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.17 Fri Feb 14 04:35:20 2020
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.17 2020/02/14 04:35:20 riastradh Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $ */
/**************************************************************************
*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.17 2020/02/14 04:35:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -271,7 +271,6 @@ static int ttm_bo_add_ttm(struct ttm_buf
case ttm_bo_type_device:
if (zero_alloc)
page_flags |= TTM_PAGE_FLAG_ZERO_ALLOC;
- /* FALLTHROUGH */
case ttm_bo_type_kernel:
bo->ttm = bdev->driver->ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT,
page_flags, glob->dummy_read_page);
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.17 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.17 Fri Feb 14 04:36:56 2020
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_util.c,v 1.17 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: ttm_bo_util.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $ */
/**************************************************************************
*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.17 2020/02/14 04:36:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.18 2020/02/14 04:37:28 riastradh Exp $");
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
@@ -637,8 +637,7 @@ static int ttm_bo_kmap_ttm(struct ttm_bu
unsigned long num_pages,
struct ttm_bo_kmap_obj *map)
{
- struct ttm_mem_reg *mem = &bo->mem;
- pgprot_t prot;
+ struct ttm_mem_reg *mem = &bo->mem; pgprot_t prot;
struct ttm_tt *ttm = bo->ttm;
int ret;
Index: src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c
diff -u src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c:1.5 src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c:1.5 Wed Dec 4 09:34:12 2019
+++ src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c Fri Feb 14 04:37:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmwgfx_kms.c,v 1.5 2019/12/04 09:34:12 wiz Exp $ */
+/* $NetBSD: vmwgfx_kms.c,v 1.6 2020/02/14 04:37:28 riastradh Exp $ */
/**************************************************************************
*
@@ -28,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmwgfx_kms.c,v 1.5 2019/12/04 09:34:12 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmwgfx_kms.c,v 1.6 2020/02/14 04:37:28 riastradh Exp $");
#include "vmwgfx_kms.h"
@@ -309,7 +309,7 @@ void vmw_kms_cursor_snoop(struct vmw_sur
box->d != 1 || box_count != 1) {
/* TODO handle none page aligned offsets */
/* TODO handle more dst & src != 0 */
- /* TODO handle more than one copy */
+ /* TODO handle more then one copy */
DRM_ERROR("Cant snoop dma request for cursor!\n");
DRM_ERROR("(%u, %u, %u) (%u, %u, %u) (%ux%ux%u) %u %u\n",
box->srcx, box->srcy, box->srcz,
@@ -1671,7 +1671,7 @@ int vmw_kms_update_layout_ioctl(struct d
if (dev_priv->active_display_unit == vmw_du_screen_target) {
/*
- * For Screen Targets, the limits for a topology are:
+ * For Screen Targets, the limits for a toplogy are:
* 1. Bounding box (assuming 32bpp) must be < prim_bb_mem
* 2. Total pixels (assuming 32bpp) must be < prim_bb_mem
*/
