Module Name: src
Committed By: riastradh
Date: Sun Sep 8 16:38:02 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_crtc.c
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: intel_panel.c
src/sys/modules/i915drm2 [riastradh-drm2]: Makefile
Log Message:
Omit more needless #ifdef __NetBSD__.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.18 -r1.1.1.1.2.19 \
src/sys/external/bsd/drm2/dist/drm/drm_crtc.c
cvs rdiff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/modules/i915drm2/Makefile
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/drm_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.18 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.19
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.18 Sun Sep 8 16:11:29 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Sun Sep 8 16:38:02 2013
@@ -2160,12 +2160,8 @@ int drm_mode_addfb(struct drm_device *de
void *data, struct drm_file *file_priv)
{
struct drm_mode_fb_cmd *or = data;
-#ifdef __NetBSD__ /* XXX ...or just use memset. */
static const struct drm_mode_fb_cmd2 zero_fbcmd;
struct drm_mode_fb_cmd2 r = zero_fbcmd;
-#else
- struct drm_mode_fb_cmd2 r = {};
-#endif
struct drm_mode_config *config = &dev->mode_config;
struct drm_framebuffer *fb;
int ret = 0;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.1.1.1.2.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.1.1.1.2.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.1.1.1.2.5 Wed Jul 24 03:47:23 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Sun Sep 8 16:38:02 2013
@@ -166,10 +166,6 @@ static u32 i915_read_blc_pwm_ctl(struct
return val;
}
-#ifdef __NetBSD__ /* XXX max kludge */
-# define max max_hack
-#endif
-
static u32 _intel_panel_get_max_backlight(struct drm_device *dev)
{
u32 max;
@@ -288,10 +284,6 @@ static void intel_panel_actually_set_bac
I915_WRITE(BLC_PWM_CTL, tmp | level);
}
-#ifdef __NetBSD__ /* XXX max hack */
-# undef max
-#endif
-
void intel_panel_set_backlight(struct drm_device *dev, u32 level)
{
struct drm_i915_private *dev_priv = dev->dev_private;
Index: src/sys/modules/i915drm2/Makefile
diff -u src/sys/modules/i915drm2/Makefile:1.1.2.10 src/sys/modules/i915drm2/Makefile:1.1.2.11
--- src/sys/modules/i915drm2/Makefile:1.1.2.10 Sun Sep 8 15:59:47 2013
+++ src/sys/modules/i915drm2/Makefile Sun Sep 8 16:38:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.10 2013/09/08 15:59:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.11 2013/09/08 16:38:02 riastradh Exp $
.include "../Makefile.inc"
.include "../drm2/Makefile.inc"
@@ -57,6 +57,7 @@ SRCS+= i915_module.c
SRCS+= i915_pci.c
SRCS+= intel_gtt.c
+COPTS.intel_panel.c+= -Wno-shadow
COPTS.intel_pm.c+= -Wno-shadow
.include <bsd.kmodule.mk>
