Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:38:26 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_nv50_display.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb:
nouveau_nvkm_subdev_fb_ramgk104.c
Log Message:
Mark unused variables as such.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb/nouveau_nvkm_subdev_fb_ramgk104.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/nouveau/nouveau_nv50_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.8 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.8 Mon Aug 27 07:37:28 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c Mon Aug 27 07:38:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nv50_display.c,v 1.8 2018/08/27 07:37:28 riastradh Exp $ */
+/* $NetBSD: nouveau_nv50_display.c,v 1.9 2018/08/27 07:38:26 riastradh Exp $ */
/*
* Copyright 2011 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.8 2018/08/27 07:37:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.9 2018/08/27 07:38:26 riastradh Exp $");
#include <linux/dma-mapping.h>
#include <linux/err.h>
@@ -1220,7 +1220,7 @@ nv50_crtc_mode_set(struct drm_crtc *crtc
{
struct nv50_mast *mast = nv50_mast(crtc->dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct nouveau_connector *nv_connector;
+ struct nouveau_connector *nv_connector __unused;
u32 ilace = (mode->flags & DRM_MODE_FLAG_INTERLACE) ? 2 : 1;
u32 vscan = (mode->flags & DRM_MODE_FLAG_DBLSCAN) ? 2 : 1;
u32 hactive, hsynce, hbackp, hfrontp, hblanke, hblanks;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb/nouveau_nvkm_subdev_fb_ramgk104.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb/nouveau_nvkm_subdev_fb_ramgk104.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb/nouveau_nvkm_subdev_fb_ramgk104.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb/nouveau_nvkm_subdev_fb_ramgk104.c:1.2 Mon Aug 27 04:58:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/fb/nouveau_nvkm_subdev_fb_ramgk104.c Mon Aug 27 07:38:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_fb_ramgk104.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_fb_ramgk104.c,v 1.3 2018/08/27 07:38:26 riastradh Exp $ */
/*
* Copyright 2013 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_fb_ramgk104.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_fb_ramgk104.c,v 1.3 2018/08/27 07:38:26 riastradh Exp $");
#define gk104_ram(p) container_of((p), struct gk104_ram, base)
#include "ram.h"
@@ -986,7 +986,7 @@ gk104_pll_calc_hiclk(int target_khz, int
int *N1, int *fN1, int *M1, int *P1,
int *N2, int *M2, int *P2)
{
- int best_clk = 0, best_err = target_khz, p_ref, n_ref;
+ int best_clk __unused = 0, best_err = target_khz, p_ref, n_ref;
bool upper = false;
*M1 = 1;
