Deleted Added
full compact
i915_dma.c (189054) i915_dma.c (189130)
1/* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
2 */
3/*-
4 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
5 * All Rights Reserved.
6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the

--- 13 unchanged lines hidden (view full) ---

22 * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
23 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 *
27 */
28
29#include <sys/cdefs.h>
1/* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
2 */
3/*-
4 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
5 * All Rights Reserved.
6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the

--- 13 unchanged lines hidden (view full) ---

22 * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
23 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 *
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/drm/i915_dma.c 189054 2009-02-25 20:24:13Z rnoland $");
30__FBSDID("$FreeBSD: head/sys/dev/drm/i915_dma.c 189130 2009-02-28 02:37:55Z rnoland $");
31
32#include "dev/drm/drmP.h"
33#include "dev/drm/drm.h"
34#include "dev/drm/i915_drm.h"
35#include "dev/drm/i915_drv.h"
36
37/* Really want an OS-independent resettable timer. Would like to have
38 * this loop run for (eg) 3 sec, but have the timer reset every time

--- 858 unchanged lines hidden (view full) ---

897 if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
898 if (pci_enable_msi(dev->pdev))
899 DRM_ERROR("failed to enable MSI\n");
900
901 intel_opregion_init(dev);
902#endif
903 DRM_SPININIT(&dev_priv->user_irq_lock, "userirq");
904
31
32#include "dev/drm/drmP.h"
33#include "dev/drm/drm.h"
34#include "dev/drm/i915_drm.h"
35#include "dev/drm/i915_drv.h"
36
37/* Really want an OS-independent resettable timer. Would like to have
38 * this loop run for (eg) 3 sec, but have the timer reset every time

--- 858 unchanged lines hidden (view full) ---

897 if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
898 if (pci_enable_msi(dev->pdev))
899 DRM_ERROR("failed to enable MSI\n");
900
901 intel_opregion_init(dev);
902#endif
903 DRM_SPININIT(&dev_priv->user_irq_lock, "userirq");
904
905 ret = drm_vblank_init(dev, I915_NUM_PIPE);
906
907 if (ret) {
908 (void) i915_driver_unload(dev);
909 return ret;
910 }
911
905 return ret;
906}
907
908int i915_driver_unload(struct drm_device *dev)
909{
910 struct drm_i915_private *dev_priv = dev->dev_private;
911
912 i915_free_hws(dev);

--- 115 unchanged lines hidden ---
912 return ret;
913}
914
915int i915_driver_unload(struct drm_device *dev)
916{
917 struct drm_i915_private *dev_priv = dev->dev_private;
918
919 i915_free_hws(dev);

--- 115 unchanged lines hidden ---