Author: dumbbell
Date: Mon Feb 15 07:35:40 2016
New Revision: 295623
URL: https://svnweb.freebsd.org/changeset/base/295623
Log:
drm/i915: Restore pci_enable_busmaster() call in the init path
This fixes a GPU hang on i945GM.
While here, merge some minor fixes to DRM core and i915:
* Remove obsolete drm_agp_*_memory() prototypes
* Fix comment in drm_fops.c (outisde -> outside)
* Fix some formatting issues in drm_stub.c (spaces -> tabs)
Approved by: re (marius)
MFC of: r288653, r288952, r293851
Submitted by: <[email protected]>
Differential Revision: https://reviews.freebsd.org/D3413
Modified:
stable/10/sys/dev/drm2/drmP.h
stable/10/sys/dev/drm2/drm_fops.c
stable/10/sys/dev/drm2/drm_stub.c
stable/10/sys/dev/drm2/i915/i915_dma.c
stable/10/sys/dev/drm2/i915/intel_opregion.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/drm2/drmP.h
==============================================================================
--- stable/10/sys/dev/drm2/drmP.h Sun Feb 14 23:51:13 2016
(r295622)
+++ stable/10/sys/dev/drm2/drmP.h Mon Feb 15 07:35:40 2016
(r295623)
@@ -1757,12 +1757,6 @@ void drm_driver_irq_preinstall(struct dr
void drm_driver_irq_postinstall(struct drm_device *dev);
void drm_driver_irq_uninstall(struct drm_device *dev);
-/* AGP/PCI Express/GART support (drm_agpsupport.c) */
-void *drm_agp_allocate_memory(size_t pages, u32 type);
-int drm_agp_free_memory(void *handle);
-int drm_agp_bind_memory(void *handle, off_t start);
-int drm_agp_unbind_memory(void *handle);
-
/* sysctl support (drm_sysctl.h) */
extern int drm_sysctl_init(struct drm_device *dev);
extern int drm_sysctl_cleanup(struct drm_device *dev);
Modified: stable/10/sys/dev/drm2/drm_fops.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_fops.c Sun Feb 14 23:51:13 2016
(r295622)
+++ stable/10/sys/dev/drm2/drm_fops.c Mon Feb 15 07:35:40 2016
(r295623)
@@ -136,7 +136,7 @@ int drm_open(struct cdev *kdev, int flag
sx_xlock(&drm_global_mutex);
/*
- * FIXME Linux<->FreeBSD: On Linux, counter updated outisde
+ * FIXME Linux<->FreeBSD: On Linux, counter updated outside
* global mutex.
*/
if (!dev->open_count++)
Modified: stable/10/sys/dev/drm2/drm_stub.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_stub.c Sun Feb 14 23:51:13 2016
(r295622)
+++ stable/10/sys/dev/drm2/drm_stub.c Mon Feb 15 07:35:40 2016
(r295623)
@@ -94,9 +94,9 @@ static int drm_minor_get_id(struct drm_d
if (type == DRM_MINOR_CONTROL) {
new_id += 64;
- } else if (type == DRM_MINOR_RENDER) {
- new_id += 128;
- }
+ } else if (type == DRM_MINOR_RENDER) {
+ new_id += 128;
+ }
return new_id;
}
Modified: stable/10/sys/dev/drm2/i915/i915_dma.c
==============================================================================
--- stable/10/sys/dev/drm2/i915/i915_dma.c Sun Feb 14 23:51:13 2016
(r295622)
+++ stable/10/sys/dev/drm2/i915/i915_dma.c Mon Feb 15 07:35:40 2016
(r295623)
@@ -1458,6 +1458,8 @@ i915_driver_load(struct drm_device *dev,
}
}
+ pci_enable_busmaster(dev->dev);
+
intel_opregion_init(dev);
callout_init(&dev_priv->hangcheck_timer, 1);
Modified: stable/10/sys/dev/drm2/i915/intel_opregion.c
==============================================================================
--- stable/10/sys/dev/drm2/i915/intel_opregion.c Sun Feb 14 23:51:13
2016 (r295622)
+++ stable/10/sys/dev/drm2/i915/intel_opregion.c Mon Feb 15 07:35:40
2016 (r295623)
@@ -533,11 +533,9 @@ void intel_opregion_fini(struct drm_devi
opregion->vbt = NULL;
}
#else
-int
+void
intel_opregion_init(struct drm_device *dev)
{
-
- return (0);
}
void
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
