CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Nov  6 01:26:02 UTC 2014

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: intel_acpi.c intel_opregion.c

Log Message:
Fix compilation (debug)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.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_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.3	Wed Nov  5 18:46:09 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c	Wed Nov  5 20:26:02 2014
@@ -12,6 +12,10 @@
 #ifdef CONFIG_ACPI
 
 #ifdef __NetBSD__
+#include <dev/acpi/acpireg.h>
+#define _COMPONENT ACPI_BUTTON_COMPONENT
+ACPI_MODULE_NAME("acpi_intel_brightness")
+
 static ACPI_OBJECT *
 acpi_evaluate_dsm(ACPI_HANDLE handle, const uint8_t *uuid, int rev, int func,
     ACPI_OBJECT *argv4)

Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.6	Wed Nov  5 18:46:09 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c	Wed Nov  5 20:26:02 2014
@@ -257,12 +257,12 @@ struct opregion_asle {
 static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct opregion_swsci __iomem *swsci = dev_priv->opregion.swsci;
+	struct opregion_swsci __iomem *region_swsci = dev_priv->opregion.swsci;
 	u32 main_function, sub_function, scic;
 	u16 pci_swsci;
 	u32 dslp;
 
-	if (!swsci)
+	if (!region_swsci)
 		return -ENODEV;
 
 	main_function = (function & SWSCI_SCIC_MAIN_FUNCTION_MASK) >>
@@ -282,7 +282,7 @@ static int swsci(struct drm_device *dev,
 	}
 
 	/* Driver sleep timeout in ms. */
-	dslp = ioread32(&swsci->dslp);
+	dslp = ioread32(&region_swsci->dslp);
 	if (!dslp) {
 		/* The spec says 2ms should be the default, but it's too small
 		 * for some machines. */
@@ -295,7 +295,7 @@ static int swsci(struct drm_device *dev,
 	}
 
 	/* The spec tells us to do this, but we are the only user... */
-	scic = ioread32(&swsci->scic);
+	scic = ioread32(&region_swsci->scic);
 	if (scic & SWSCI_SCIC_INDICATOR) {
 		DRM_DEBUG_DRIVER("SWSCI request already in progress\n");
 		return -EBUSY;
@@ -303,8 +303,8 @@ static int swsci(struct drm_device *dev,
 
 	scic = function | SWSCI_SCIC_INDICATOR;
 
-	iowrite32(parm, &swsci->parm);
-	iowrite32(scic, &swsci->scic);
+	iowrite32(parm, &region_swsci->parm);
+	iowrite32(scic, &region_swsci->scic);
 
 	/* Ensure SCI event is selected and event trigger is cleared. */
 	pci_read_config_word(dev->pdev, PCI_SWSCI, &pci_swsci);
@@ -319,7 +319,7 @@ static int swsci(struct drm_device *dev,
 	pci_write_config_word(dev->pdev, PCI_SWSCI, pci_swsci);
 
 	/* Poll for the result. */
-#define C (((scic = ioread32(&swsci->scic)) & SWSCI_SCIC_INDICATOR) == 0)
+#define C (((scic = ioread32(&region_swsci->scic)) & SWSCI_SCIC_INDICATOR) == 0)
 	if (wait_for(C, dslp)) {
 		DRM_DEBUG_DRIVER("SWSCI request timed out\n");
 		return -ETIMEDOUT;
@@ -335,7 +335,7 @@ static int swsci(struct drm_device *dev,
 	}
 
 	if (parm_out)
-		*parm_out = ioread32(&swsci->parm);
+		*parm_out = ioread32(&region_swsci->parm);
 
 	return 0;