diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-15 09:46:16 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-15 09:46:16 -0200 |
| commit | 51145f6d236c6fef7e3df24ff1ed1947de914e58 (patch) | |
| tree | 461add4658cb859338055f2682faabe5ac7b1c37 /sys/dev | |
| parent | c5df3d0f11ca3b170da878cdd4782fc603c15460 (diff) | |
| parent | 744ea196e52f4821042acc2a9b289ee54aea5202 (diff) | |
| download | FreeBSD-src-51145f6d236c6fef7e3df24ff1ed1947de914e58.zip FreeBSD-src-51145f6d236c6fef7e3df24ff1ed1947de914e58.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/drm2/drmP.h | 6 | ||||
| -rw-r--r-- | sys/dev/drm2/drm_fops.c | 2 | ||||
| -rw-r--r-- | sys/dev/drm2/drm_stub.c | 6 | ||||
| -rw-r--r-- | sys/dev/drm2/i915/i915_dma.c | 2 | ||||
| -rw-r--r-- | sys/dev/drm2/i915/intel_opregion.c | 4 |
5 files changed, 7 insertions, 13 deletions
diff --git a/sys/dev/drm2/drmP.h b/sys/dev/drm2/drmP.h index f028d81..5d625a7 100644 --- a/sys/dev/drm2/drmP.h +++ b/sys/dev/drm2/drmP.h @@ -1757,12 +1757,6 @@ void drm_driver_irq_preinstall(struct drm_device *dev); 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); diff --git a/sys/dev/drm2/drm_fops.c b/sys/dev/drm2/drm_fops.c index b73cec6..3b3be06 100644 --- a/sys/dev/drm2/drm_fops.c +++ b/sys/dev/drm2/drm_fops.c @@ -136,7 +136,7 @@ int drm_open(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p) 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++) diff --git a/sys/dev/drm2/drm_stub.c b/sys/dev/drm2/drm_stub.c index d7ec6cb..06663ac 100644 --- a/sys/dev/drm2/drm_stub.c +++ b/sys/dev/drm2/drm_stub.c @@ -94,9 +94,9 @@ static int drm_minor_get_id(struct drm_device *dev, int type) 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; } diff --git a/sys/dev/drm2/i915/i915_dma.c b/sys/dev/drm2/i915/i915_dma.c index 910b35a..353c081 100644 --- a/sys/dev/drm2/i915/i915_dma.c +++ b/sys/dev/drm2/i915/i915_dma.c @@ -1458,6 +1458,8 @@ i915_driver_load(struct drm_device *dev, unsigned long flags) } } + pci_enable_busmaster(dev->dev); + intel_opregion_init(dev); callout_init(&dev_priv->hangcheck_timer, 1); diff --git a/sys/dev/drm2/i915/intel_opregion.c b/sys/dev/drm2/i915/intel_opregion.c index 411e530..397c559 100644 --- a/sys/dev/drm2/i915/intel_opregion.c +++ b/sys/dev/drm2/i915/intel_opregion.c @@ -533,11 +533,9 @@ void intel_opregion_fini(struct drm_device *dev) opregion->vbt = NULL; } #else -int +void intel_opregion_init(struct drm_device *dev) { - - return (0); } void |
