 @@ -462,55 +462,59 @@ out_unlock:
+}
 static void vlv_init_dpio(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	/* Reset the DPIO config */
 	I915_WRITE(DPIO_CTL, 0);
 	POSTING_READ(DPIO_CTL);
 	I915_WRITE(DPIO_CTL, 1);
 	POSTING_READ(DPIO_CTL);
+}
 #ifndef __NetBSD__		/* XXX dmi hack */
 static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)
+{
 	DRM_INFO("Forcing lvds to dual link mode on %s\n", id->ident);
 	return 1;
+}
 static const struct dmi_system_id intel_dual_link_lvds[] = {
+	{
 		.callback = intel_dual_link_lvds_callback,
 		.ident = "Apple MacBook Pro (Core i5/i7 Series)",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
 			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"),
 		},
 	},
 	{ }	/* terminating entry */
 };
 #endif
 static bool is_dual_link_lvds(struct drm_i915_private *dev_priv,
 			      unsigned int reg)
+{
 	unsigned int val;
 	/* use the module option value if specified */
 	if (i915_lvds_channel_mode > 0)
 		return i915_lvds_channel_mode == 2;
 #ifndef __NetBSD__		/* XXX dmi hack */
 	if (dmi_check_system(intel_dual_link_lvds))
 		return true;
 #endif
 	if (dev_priv->lvds_val)
 		val = dev_priv->lvds_val;
 	else {
 		/* BIOS should set the proper LVDS register value at boot, but
 		 * in reality, it doesn't set the value when the lid is closed;
 		 * we need to check "the value to be set" in VBT when LVDS
 		 * register is uninitialized.
 		 */
 		val = I915_READ(reg);
 		if (!(val & ~(LVDS_PIPE_MASK | LVDS_DETECTED)))
 			val = dev_priv->bios_lvds_val;
 		dev_priv->lvds_val = val;
 @@ -8787,26 +8791,27 @@ static void intel_init_display(struct dr
 	case 5:
 		dev_priv->display.queue_flip = intel_gen4_queue_flip;
 		break;
 	case 6:
 		dev_priv->display.queue_flip = intel_gen6_queue_flip;
 		break;
 	case 7:
 		dev_priv->display.queue_flip = intel_gen7_queue_flip;
 		break;
+	}
+}
 #ifndef __NetBSD__		/* XXX dmi hack */
 /*
  * Some BIOSes insist on assuming the GPU's pipe A is enabled at suspend,
  * resume, or other times.  This quirk makes sure that's the case for
  * affected systems.
  */
 static void quirk_pipea_force(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	dev_priv->quirks |= QUIRK_PIPEA_FORCE;
 	DRM_INFO("applying pipe a force quirk\n");
+}
 @@ -8900,26 +8905,27 @@ static void intel_init_quirks(struct drm
 		if (d->device == q->device &&
 		    (d->subsystem_vendor == q->subsystem_vendor ||
 		     q->subsystem_vendor == PCI_ANY_ID) &&
 		    (d->subsystem_device == q->subsystem_device ||
 		     q->subsystem_device == PCI_ANY_ID))
 			q->hook(dev);
+	}
 	for (i = 0; i < ARRAY_SIZE(intel_dmi_quirks); i++) {
 		if (dmi_check_system(*intel_dmi_quirks[i].dmi_id_list) != 0)
 			intel_dmi_quirks[i].hook(dev);
+	}
+}
 #endif
 /* Disable the VGA plane that we never use */
 static void i915_disable_vga(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u8 sr1;
 	u32 vga_reg;
 	if (HAS_PCH_SPLIT(dev))
 		vga_reg = CPU_VGACNTRL;
 	else
 		vga_reg = VGACNTRL;
 @@ -8955,27 +8961,29 @@ void intel_modeset_init(struct drm_devic
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int i, ret;
 	drm_mode_config_init(dev);
 	dev->mode_config.min_width = 0;
 	dev->mode_config.min_height = 0;
 	dev->mode_config.preferred_depth = 24;
 	dev->mode_config.prefer_shadow = 1;
 	dev->mode_config.funcs = &intel_mode_funcs;
 #ifndef __NetBSD__		/* XXX dmi hack */
 	intel_init_quirks(dev);
 #endif
 	intel_init_pm(dev);
 	intel_init_display(dev);
 	if (IS_GEN2(dev)) {
 		dev->mode_config.max_width = 2048;
 		dev->mode_config.max_height = 2048;
 	} else if (IS_GEN3(dev)) {
 		dev->mode_config.max_width = 4096;
 		dev->mode_config.max_height = 4096;
 	} else {
 		dev->mode_config.max_width = 8192;