Module Name: src
Committed By: riastradh
Date: Fri Feb 14 09:39:38 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_bios.c intel_crt.c
intel_display.c intel_fbdev.c intel_lvds.c intel_pm.c intel_sdvo.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_chan.c
Log Message:
Reduce some more cosmetic diffs.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c
cvs rdiff -u -r1.30 -r1.31 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.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/i915/intel_bios.c
diff -u 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.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c:1.8 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c Fri Feb 14 09:39:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_bios.c,v 1.8 2020/02/14 04:30:05 riastradh Exp $ */
+/* $NetBSD: intel_bios.c,v 1.9 2020/02/14 09:39:37 riastradh Exp $ */
/*
* Copyright © 2006 Intel Corporation
@@ -27,7 +27,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_bios.c,v 1.8 2020/02/14 04:30:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_bios.c,v 1.9 2020/02/14 09:39:37 riastradh Exp $");
#include <linux/dmi.h>
#include <drm/drm_dp_helper.h>
@@ -1248,7 +1248,7 @@ static const struct dmi_system_id intel_
DMI_MATCH(DMI_PRODUCT_NAME, "97027RG"),
},
},
- { .callback = NULL, }
+ { }
};
static const struct bdb_header *validate_vbt(const void *base,
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.8 Fri Feb 14 04:36:12 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c Fri Feb 14 09:39:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lvds.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $ */
+/* $NetBSD: intel_lvds.c,v 1.9 2020/02/14 09:39:37 riastradh Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.9 2020/02/14 09:39:37 riastradh Exp $");
#include <acpi/button.h>
#include <linux/dmi.h>
@@ -422,7 +422,7 @@ static const struct dmi_system_id intel_
},
},
- { .callback = NULL } /* terminating entry */
+ { } /* terminating entry */
};
/*
@@ -784,7 +784,7 @@ static const struct dmi_system_id intel_
},
},
- { .callback = NULL } /* terminating entry */
+ { } /* terminating entry */
};
/*
@@ -869,7 +869,7 @@ static const struct dmi_system_id intel_
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro9,1"),
},
},
- { .callback = NULL } /* terminating entry */
+ { } /* terminating entry */
};
bool intel_is_dual_link_lvds(struct drm_device *dev)
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.7 Fri Feb 14 04:36:11 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c Fri Feb 14 09:39:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_crt.c,v 1.7 2020/02/14 04:36:11 riastradh Exp $ */
+/* $NetBSD: intel_crt.c,v 1.8 2020/02/14 09:39:37 riastradh Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_crt.c,v 1.7 2020/02/14 04:36:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_crt.c,v 1.8 2020/02/14 09:39:37 riastradh Exp $");
#include <linux/dmi.h>
#include <linux/i2c.h>
@@ -784,7 +784,7 @@ static const struct dmi_system_id intel_
DMI_MATCH(DMI_PRODUCT_NAME, "XPS 8700"),
},
},
- { .callback = NULL }
+ { }
};
void intel_crt_init(struct drm_device *dev)
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.30 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.31
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.30 Fri Feb 14 04:36:11 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Fri Feb 14 09:39:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.30 2020/02/14 04:36:11 riastradh Exp $ */
+/* $NetBSD: intel_display.c,v 1.31 2020/02/14 09:39:37 riastradh Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.30 2020/02/14 04:36:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.31 2020/02/14 09:39:37 riastradh Exp $");
#include <linux/dmi.h>
#include <linux/module.h>
@@ -2545,8 +2545,7 @@ intel_alloc_initial_plane_obj(struct int
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev);
struct drm_i915_gem_object *obj = NULL;
- static const struct drm_mode_fb_cmd2 zero_mode_cmd;
- struct drm_mode_fb_cmd2 mode_cmd = zero_mode_cmd;
+ struct drm_mode_fb_cmd2 mode_cmd = { 0 };
struct drm_framebuffer *fb = &plane_config->fb->base;
u32 base_aligned = round_down(plane_config->base, PAGE_SIZE);
u32 size_aligned = round_up(plane_config->base + plane_config->size,
@@ -8100,7 +8099,7 @@ i9xx_get_initial_plane_config(struct int
{
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- u32 val, base;
+ u32 val, base, offset __unused;
int pipe = crtc->pipe, plane = crtc->plane;
int fourcc, pixel_format;
unsigned int aligned_height;
@@ -8133,9 +8132,9 @@ i9xx_get_initial_plane_config(struct int
if (INTEL_INFO(dev)->gen >= 4) {
if (plane_config->tiling)
- (void)I915_READ(DSPTILEOFF(plane));
+ offset = I915_READ(DSPTILEOFF(plane));
else
- (void)I915_READ(DSPLINOFF(plane));
+ offset = I915_READ(DSPLINOFF(plane));
base = I915_READ(DSPSURF(plane)) & 0xfffff000;
} else {
base = I915_READ(DSPADDR(plane));
@@ -9173,7 +9172,7 @@ skylake_get_initial_plane_config(struct
{
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- u32 val, base, stride_mult, tiling;
+ u32 val, base, offset __unused, stride_mult, tiling;
int pipe = crtc->pipe;
int fourcc, pixel_format;
unsigned int aligned_height;
@@ -9222,7 +9221,7 @@ skylake_get_initial_plane_config(struct
base = I915_READ(PLANE_SURF(pipe, 0)) & 0xfffff000;
plane_config->base = base;
- (void)I915_READ(PLANE_OFFSET(pipe, 0));
+ offset = I915_READ(PLANE_OFFSET(pipe, 0));
val = I915_READ(PLANE_SIZE(pipe, 0));
fb->height = ((val >> 16) & 0xfff) + 1;
@@ -9281,7 +9280,7 @@ ironlake_get_initial_plane_config(struct
{
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- u32 val, base;
+ u32 val, base, offset __unused;
int pipe = crtc->pipe;
int fourcc, pixel_format;
unsigned int aligned_height;
@@ -9314,12 +9313,12 @@ ironlake_get_initial_plane_config(struct
base = I915_READ(DSPSURF(pipe)) & 0xfffff000;
if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
- (void)I915_READ(DSPOFFSET(pipe));
+ offset = I915_READ(DSPOFFSET(pipe));
} else {
if (plane_config->tiling)
- (void)I915_READ(DSPTILEOFF(pipe));
+ offset = I915_READ(DSPTILEOFF(pipe));
else
- (void)I915_READ(DSPLINOFF(pipe));
+ offset = I915_READ(DSPLINOFF(pipe));
}
plane_config->base = base;
@@ -10297,8 +10296,7 @@ intel_framebuffer_create_for_mode(struct
int depth, int bpp)
{
struct drm_i915_gem_object *obj;
- static const struct drm_mode_fb_cmd2 zero_mode_cmd;
- struct drm_mode_fb_cmd2 mode_cmd = zero_mode_cmd;
+ struct drm_mode_fb_cmd2 mode_cmd = { 0 };
obj = i915_gem_alloc_object(dev,
intel_framebuffer_size_for_mode(mode, bpp));
@@ -14858,7 +14856,7 @@ static const struct intel_dmi_quirk inte
DMI_MATCH(DMI_PRODUCT_NAME, ""),
},
},
- { .callback = NULL } /* terminating entry */
+ { } /* terminating entry */
},
.hook = quirk_invert_brightness,
},
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.10 Fri Feb 14 04:37:09 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Fri Feb 14 09:39:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_fbdev.c,v 1.10 2020/02/14 04:37:09 riastradh Exp $ */
+/* $NetBSD: intel_fbdev.c,v 1.11 2020/02/14 09:39:37 riastradh Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.10 2020/02/14 04:37:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.11 2020/02/14 09:39:37 riastradh Exp $");
#include <linux/async.h>
#include <linux/module.h>
@@ -134,8 +134,7 @@ static int intelfb_alloc(struct drm_fb_h
struct drm_framebuffer *fb;
struct drm_device *dev = helper->dev;
struct drm_i915_private *dev_priv = to_i915(dev);
- static const struct drm_mode_fb_cmd2 zero_mode_cmd;
- struct drm_mode_fb_cmd2 mode_cmd = zero_mode_cmd;
+ struct drm_mode_fb_cmd2 mode_cmd = {};
struct drm_i915_gem_object *obj = NULL;
int size, ret;
@@ -214,6 +213,7 @@ static int intelfb_create(struct drm_fb_
bool prealloc = false;
mutex_lock(&dev->struct_mutex);
+
if (intel_fb &&
(sizes->fb_width > intel_fb->base.width ||
sizes->fb_height > intel_fb->base.height)) {
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.22 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.23
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.22 Fri Feb 14 04:36:12 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Fri Feb 14 09:39:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_pm.c,v 1.22 2020/02/14 04:36:12 riastradh Exp $ */
+/* $NetBSD: intel_pm.c,v 1.23 2020/02/14 09:39:37 riastradh Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.22 2020/02/14 04:36:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.23 2020/02/14 09:39:37 riastradh Exp $");
#include <linux/bitops.h>
#include <linux/cpufreq.h>
@@ -3723,15 +3723,11 @@ static void ilk_update_wm(struct drm_crt
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct ilk_wm_maximums max;
- static const struct ilk_wm_values zero_values;
- struct ilk_wm_values results = zero_values;
+ struct ilk_wm_values results = {};
enum intel_ddb_partitioning partitioning;
- static const struct intel_pipe_wm zero_wm;
- struct intel_pipe_wm pipe_wm = zero_wm;
- struct intel_pipe_wm lp_wm_1_2 = zero_wm, lp_wm_5_6 = zero_wm,
- *best_lp_wm;
- static const struct intel_wm_config zero_config;
- struct intel_wm_config config = zero_config;
+ struct intel_pipe_wm pipe_wm = {};
+ struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm;
+ struct intel_wm_config config = {};
WARN_ON(cstate->base.active != intel_crtc->active);
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.13 Fri Feb 14 04:36:12 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Fri Feb 14 09:39:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sdvo.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $ */
+/* $NetBSD: intel_sdvo.c,v 1.14 2020/02/14 09:39:38 riastradh Exp $ */
/*
* Copyright 2006 Dave Airlie <[email protected]>
@@ -28,7 +28,7 @@
* Eric Anholt <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.14 2020/02/14 09:39:38 riastradh Exp $");
#include <linux/i2c.h>
#include <linux/slab.h>
@@ -654,12 +654,7 @@ intel_sdvo_get_value(struct intel_sdvo *
static bool intel_sdvo_set_target_input(struct intel_sdvo *intel_sdvo)
{
-#ifdef __NetBSD__
- static const struct intel_sdvo_set_target_input_args zero_targets;
- struct intel_sdvo_set_target_input_args targets = zero_targets;
-#else
struct intel_sdvo_set_target_input_args targets = {0};
-#endif
return intel_sdvo_set_value(intel_sdvo,
SDVO_CMD_SET_TARGET_INPUT,
&targets, sizeof(targets));
@@ -884,8 +879,7 @@ static void intel_sdvo_get_dtd_from_mode
static void intel_sdvo_get_mode_from_dtd(struct drm_display_mode *pmode,
const struct intel_sdvo_dtd *dtd)
{
- static const struct drm_display_mode zero_mode;
- struct drm_display_mode mode = zero_mode;
+ struct drm_display_mode mode = {};
mode.hdisplay = dtd->part1.h_active;
mode.hdisplay += ((dtd->part1.h_high >> 4) & 0x0f) << 8;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c:1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c:1.5 Mon Aug 27 14:48:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c Fri Feb 14 09:39:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_chan.c,v 1.5 2018/08/27 14:48:21 riastradh Exp $ */
+/* $NetBSD: nouveau_chan.c,v 1.6 2020/02/14 09:39:38 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_chan.c,v 1.5 2018/08/27 14:48:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_chan.c,v 1.6 2020/02/14 09:39:38 riastradh Exp $");
#include <nvif/os.h>
#include <nvif/class.h>
@@ -96,8 +96,7 @@ nouveau_channel_prep(struct nouveau_drm
{
struct nouveau_cli *cli = (void *)device->object.client;
struct nvkm_mmu *mmu = nvxx_mmu(device);
- static const struct nv_dma_v0 zero_args;
- struct nv_dma_v0 args = zero_args;
+ struct nv_dma_v0 args = {};
struct nouveau_channel *chan;
u32 target;
int ret;
@@ -301,8 +300,7 @@ nouveau_channel_init(struct nouveau_chan
struct nvif_device *device = chan->device;
struct nouveau_cli *cli = (void *)chan->user.client;
struct nvkm_mmu *mmu = nvxx_mmu(device);
- static const struct nv_dma_v0 zero_args;
- struct nv_dma_v0 args = zero_args;
+ struct nv_dma_v0 args = {};
int ret, i;
ret = nvif_object_map(&chan->user);
