summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2015-04-06 10:03:34 +0000
committerjsg <jsg@openbsd.org>2015-04-06 10:03:34 +0000
commit6623ba9d628f1793bfd1f0d69884504daeda9218 (patch)
tree97b561eb77b099d4e925a348cef3f3b9f5dc5459
parentAdd an empty drm_sysfs_hotplug_event() function and use it (diff)
downloadwireguard-openbsd-6623ba9d628f1793bfd1f0d69884504daeda9218.tar.xz
wireguard-openbsd-6623ba9d628f1793bfd1f0d69884504daeda9218.zip
Now we have dev_priv->mm.gtt_base_addr we can set fb_base and remove
an ifdef. The code that uses fb_base itself remains #if 0'd out.
-rw-r--r--sys/dev/pci/drm/i915/intel_display.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c
index 3dbdfd69ead..023b093afed 100644
--- a/sys/dev/pci/drm/i915/intel_display.c
+++ b/sys/dev/pci/drm/i915/intel_display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intel_display.c,v 1.44 2015/04/06 05:35:29 jsg Exp $ */
+/* $OpenBSD: intel_display.c,v 1.45 2015/04/06 10:03:34 jsg Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
*
@@ -9098,6 +9098,7 @@ void intel_modeset_init_hw(struct drm_device *dev)
void intel_modeset_init(struct drm_device *dev)
{
+ struct drm_i915_private *dev_priv = dev->dev_private;
int i, ret;
drm_mode_config_init(dev);
@@ -9126,11 +9127,7 @@ void intel_modeset_init(struct drm_device *dev)
dev->mode_config.max_width = 8192;
dev->mode_config.max_height = 8192;
}
-#ifdef notyet
dev->mode_config.fb_base = dev_priv->mm.gtt_base_addr;
-#else
- DRM_DEBUG_KMS("todo set fb base\n");
-#endif
DRM_DEBUG_KMS("%d display pipe%s available.\n",
INTEL_INFO(dev)->num_pipes,