Module Name: src
Committed By: skrll
Date: Thu Aug 20 21:41:12 UTC 2015
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
src/sys/external/bsd/drm2/dist/drm/radeon: atombios_encoders.c
radeon_legacy_encoders.c
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Tweak IS_ENABLED to allow CONFIG_FOO values.
No functional change to drm2.
LGTM from riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/common/include/linux/kernel.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.7 src/sys/external/bsd/common/include/linux/kernel.h:1.8
--- src/sys/external/bsd/common/include/linux/kernel.h:1.7 Mon Apr 20 15:22:18 2015
+++ src/sys/external/bsd/common/include/linux/kernel.h Thu Aug 20 21:41:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.7 2015/04/20 15:22:18 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.8 2015/08/20 21:41:12 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#define oops_in_progress (panicstr != NULL)
-#define IS_ENABLED(option) 0 /* XXX Hmm... */
+#define IS_ENABLED(option) (option)
#define __printf __printflike
#define __user
Index: src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c Thu Aug 20 21:41:12 2015
@@ -133,7 +133,7 @@ atombios_set_backlight_level(struct rade
}
}
-#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) || IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
static u8 radeon_atom_bl_level(struct backlight_device *bd)
{
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c:1.1.1.1 Wed Jul 16 19:35:28 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c Thu Aug 20 21:41:12 2015
@@ -310,7 +310,7 @@ radeon_legacy_set_backlight_level(struct
radeon_legacy_lvds_update(&radeon_encoder->base, dpms_mode);
}
-#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) || IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
static uint8_t radeon_legacy_lvds_level(struct backlight_device *bd)
{
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.11 src/sys/external/bsd/drm2/drm/files.drmkms:1.12
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.11 Thu Mar 5 17:50:41 2015
+++ src/sys/external/bsd/drm2/drm/files.drmkms Thu Aug 20 21:41:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.11 2015/03/05 17:50:41 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.12 2015/08/20 21:41:12 skrll Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -26,6 +26,10 @@ makeoptions drmkms "CWARNFLAGS.drm_edi
# XXX Should probably be in a header file. opt_drmkms.h?
makeoptions drmkms CPPFLAGS+="-D__KERNEL__"
+makeoptions drmkms CPPFLAGS+="-DCONFIG_FB=0"
+makeoptions drmkms CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
+makeoptions drmkms CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
+
file external/bsd/drm2/dist/drm/drm_auth.c drmkms
file external/bsd/drm2/dist/drm/drm_buffer.c drmkms
file external/bsd/drm2/dist/drm/drm_bufs.c drmkms
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.10 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.11
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.10 Thu Mar 5 17:50:41 2015
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Thu Aug 20 21:41:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.10 2015/03/05 17:50:41 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.11 2015/08/20 21:41:12 skrll Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -17,7 +17,8 @@ makeoptions i915drmkms "CWARNFLAGS.int
makeoptions i915drmkms "CWARNFLAGS.intel_pm.c"+="-Wno-shadow"
# XXX x86 kludge.
-makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV"
+makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
+makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
file external/bsd/drm2/dist/drm/i915/dvo_ch7017.c i915drmkms
file external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c i915drmkms
