Module Name: src
Committed By: msaitoh
Date: Wed Jul 24 15:55:08 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_reg.h intel_atomic.c
Log Message:
Use unsigned. Found by KUBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_atomic.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/i915_reg.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h:1.6 Wed Jul 24 14:57:09 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h Wed Jul 24 15:55:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_reg.h,v 1.6 2019/07/24 14:57:09 msaitoh Exp $ */
+/* $NetBSD: i915_reg.h,v 1.7 2019/07/24 15:55:07 msaitoh Exp $ */
/* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
@@ -150,7 +150,7 @@
#define GEN8_RING_PDP_LDW(ring, n) ((ring)->mmio_base+0x270 + (n) * 8)
#define GEN8_R_PWR_CLK_STATE 0x20C8
-#define GEN8_RPCS_ENABLE (1 << 31)
+#define GEN8_RPCS_ENABLE (1UL << 31)
#define GEN8_RPCS_S_CNT_ENABLE (1 << 18)
#define GEN8_RPCS_S_CNT_SHIFT 15
#define GEN8_RPCS_S_CNT_MASK (0x7 << GEN8_RPCS_S_CNT_SHIFT)
@@ -640,7 +640,7 @@ enum skl_disp_power_wells {
};
#define SKL_POWER_WELL_STATE(pw) (1 << ((pw) * 2))
-#define SKL_POWER_WELL_REQ(pw) (1 << (((pw) * 2) + 1))
+#define SKL_POWER_WELL_REQ(pw) (1U << (((pw) * 2) + 1))
#define PUNIT_REG_PWRGT_CTRL 0x60
#define PUNIT_REG_PWRGT_STATUS 0x61
@@ -7428,7 +7428,7 @@ enum skl_disp_power_wells {
/* LCPLL_CTL */
#define LCPLL1_CTL 0x46010
#define LCPLL2_CTL 0x46014
-#define LCPLL_PLL_ENABLE (1<<31)
+#define LCPLL_PLL_ENABLE (1UL << 31)
/* DPLL control1 */
#define DPLL_CTRL1 0x6C058
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_atomic.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_atomic.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_atomic.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_atomic.c:1.2 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_atomic.c Wed Jul 24 15:55:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_atomic.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_atomic.c,v 1.3 2019/07/24 15:55:07 msaitoh Exp $ */
/*
* Copyright © 2015 Intel Corporation
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_atomic.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_atomic.c,v 1.3 2019/07/24 15:55:07 msaitoh Exp $");
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
@@ -175,7 +175,7 @@ int intel_atomic_setup_scalers(struct dr
int idx;
/* skip if scaler not required */
- if (!(scaler_state->scaler_users & (1 << i)))
+ if (!(scaler_state->scaler_users & (1U << i)))
continue;
if (i == SKL_CRTC_INDEX) {
