Module Name: src
Committed By: chs
Date: Sat Sep 28 16:14:52 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_lrc.c intel_ringbuffer.c
Log Message:
initialize a local variable to avoid a gcc warning with
certain optimization options.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.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_lrc.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.9 Mon Aug 27 15:09:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c Sat Sep 28 16:14:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lrc.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $ */
+/* $NetBSD: intel_lrc.c,v 1.10 2019/09/28 16:14:52 chs Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.10 2019/09/28 16:14:52 chs Exp $");
#include <drm/drmP.h>
#include <drm/i915_drm.h>
@@ -684,6 +684,8 @@ static int logical_ring_wait_for_space(s
unsigned space;
int ret;
+ space = 0; /* XXX gcc -Wuninitialized */
+
if (intel_ring_space(ringbuf) >= bytes)
return 0;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.9 Thu Sep 13 08:25:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c Sat Sep 28 16:14:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ringbuffer.c,v 1.9 2018/09/13 08:25:55 mrg Exp $ */
+/* $NetBSD: intel_ringbuffer.c,v 1.10 2019/09/28 16:14:52 chs Exp $ */
/*
* Copyright © 2008-2010 Intel Corporation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.9 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.10 2019/09/28 16:14:52 chs Exp $");
#include <asm/param.h>
#include <drm/drmP.h>
@@ -2323,6 +2323,8 @@ static int ring_wait_for_space(struct in
unsigned space;
int ret;
+ space = 0; /* XXX gcc -Wuninitialized */
+
if (intel_ring_space(ringbuf) >= n)
return 0;
