Module Name: src
Committed By: riastradh
Date: Fri Jan 29 21:46:03 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bios.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios:
dcb.h
Log Message:
Don't store non-enumerated values in an enum.
Found by joerg.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios/dcb.h
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_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c:1.1.1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c:1.1.1.2 Wed Aug 6 12:36:23 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c Fri Jan 29 21:46:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_bios.c,v 1.1.1.2 2014/08/06 12:36:23 riastradh Exp $ */
+/* $NetBSD: nouveau_bios.c,v 1.2 2016/01/29 21:46:03 riastradh Exp $ */
/*
* Copyright 2005-2006 Erik Waling
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_bios.c,v 1.1.1.2 2014/08/06 12:36:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_bios.c,v 1.2 2016/01/29 21:46:03 riastradh Exp $");
#include <subdev/bios.h>
@@ -1607,7 +1607,7 @@ void merge_like_dcb_entries(struct drm_d
for (j = i + 1; j < dcb->entries; j++) {
struct dcb_output *jent = &dcb->entry[j];
- if (jent->type == 100) /* already merged entry */
+ if (jent->type == DCB_OUTPUT_MERGED)
continue;
/* merge heads field when all other fields the same */
@@ -1618,14 +1618,14 @@ void merge_like_dcb_entries(struct drm_d
NV_INFO(drm, "Merging DCB entries %d and %d\n",
i, j);
ient->heads |= jent->heads;
- jent->type = 100; /* dummy value */
+ jent->type = DCB_OUTPUT_MERGED;
}
}
}
/* Compact entries merged into others out of dcb */
for (i = 0; i < dcb->entries; i++) {
- if (dcb->entry[i].type == 100)
+ if (dcb->entry[i].type == DCB_OUTPUT_MERGED)
continue;
if (newentries != i) {
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios/dcb.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios/dcb.h:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios/dcb.h:1.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios/dcb.h:1.1.1.1 Thu Jul 17 01:50:59 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bios/dcb.h Fri Jan 29 21:46:03 2016
@@ -11,6 +11,7 @@ enum dcb_output_type {
DCB_OUTPUT_DP = 0x6,
DCB_OUTPUT_EOL = 0xe,
DCB_OUTPUT_UNUSED = 0xf,
+ DCB_OUTPUT_MERGED = 100,
DCB_OUTPUT_ANY = -1,
};
