Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm Revert cosmetic changes.
details: https://anonhg.NetBSD.org/src/rev/55288c256c6b
branches: trunk
changeset: 744841:55288c256c6b
user: riastradh <riastradh%NetBSD.org@localhost>
date: Fri Feb 14 04:37:27 2020 +0000
description:
Revert cosmetic changes.
diffstat:
sys/external/bsd/drm2/dist/drm/drm_crtc.c | 7 ++---
sys/external/bsd/drm2/dist/drm/drm_fb_helper.c | 6 ++--
sys/external/bsd/drm2/dist/drm/drm_prime.c | 6 ++--
sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c | 10 +++++---
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c | 7 ++---
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c | 6 ++--
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c | 12 +++++-----
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c | 12 +--------
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c | 5 +--
sys/external/bsd/drm2/dist/drm/radeon/atombios.h | 10 ++++----
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c | 5 +--
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c | 7 ++---
sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c | 8 +++---
13 files changed, 45 insertions(+), 56 deletions(-)
diffs (truncated from 439 to 300 lines):
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/drm_crtc.c
--- a/sys/external/bsd/drm2/dist/drm/drm_crtc.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_crtc.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 <jesse.barnes%intel.com@localhost>
*/
#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 @@
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 */
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
--- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 <jesse.barnes%intel.com@localhost>
*/
#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 @@
.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 */
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/drm_prime.c
--- a/sys/external/bsd/drm2/dist/drm/drm_prime.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_prime.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 @@
}
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;
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_arb.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 @@
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 @@
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;
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 @@
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))
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_dport.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 @@
};
/* post-train script */
- init.offset = outp->info.script[1];
+ init.offset = outp->info.script[1],
nvbios_exec(&init);
}
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_pll.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 @@
{ PLL_MEMORY, 0x680504 },
{ PLL_VPLL0 , 0x680508 },
{ PLL_VPLL1 , 0x680520 },
- { }
+ {}
};
static struct pll_mapping
@@ -53,7 +53,7 @@
{ PLL_MEMORY, 0x004020 },
{ PLL_VPLL0 , 0x680508 },
{ PLL_VPLL1 , 0x680520 },
- { }
+ {}
};
static struct pll_mapping
@@ -67,7 +67,7 @@
{ PLL_UNK42 , 0x00e824 },
{ PLL_VPLL0 , 0x614100 },
{ PLL_VPLL1 , 0x614900 },
- { }
+ {}
};
static struct pll_mapping
@@ -79,7 +79,7 @@
{ PLL_UNK41 , 0x00e818 },
{ PLL_VPLL0 , 0x614100 },
{ PLL_VPLL1 , 0x614900 },
- { }
+ {}
};
static u16
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/devinit/nouveau_nvkm_subdev_devinit_nv04.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 @@
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 @@
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);
diff -r a28245e652de -r 55288c256c6b sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c Fri Feb 14 04:37:09 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_nv50.c Fri Feb 14 04:37:27 2020 +0000
@@ -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 $");
Home |
Main Index |
Thread Index |
Old Index