Deleted Added
sdiff udiff text old ( 183573 ) new ( 183833 )
full compact
drm_pci.c (183573) drm_pci.c (183833)
1/*-
2 * Copyright 2003 Eric Anholt.
3 * All Rights Reserved.
4 *
5 * Permission is hereby granted, free of charge, to any person obtaining a
6 * copy of this software and associated documentation files (the "Software"),
7 * to deal in the Software without restriction, including without limitation
8 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19 * AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */
23
24#include <sys/cdefs.h>
1/*-
2 * Copyright 2003 Eric Anholt.
3 * All Rights Reserved.
4 *
5 * Permission is hereby granted, free of charge, to any person obtaining a
6 * copy of this software and associated documentation files (the "Software"),
7 * to deal in the Software without restriction, including without limitation
8 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19 * AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */
23
24#include <sys/cdefs.h>
25__FBSDID("$FreeBSD: head/sys/dev/drm/drm_pci.c 183573 2008-10-03 16:59:11Z rnoland $");
25__FBSDID("$FreeBSD: head/sys/dev/drm/drm_pci.c 183833 2008-10-13 18:03:27Z rnoland $");
26
27/**
28 * \file drm_pci.h
29 * \brief PCI consistent, DMA-accessible memory allocation.
30 *
31 * \author Eric Anholt <anholt@FreeBSD.org>
32 */
33

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

62
63 /* Need power-of-two alignment, so fail the allocation if it isn't. */
64 if ((align & (align - 1)) != 0) {
65 DRM_ERROR("drm_pci_alloc with non-power-of-two alignment %d\n",
66 (int)align);
67 return NULL;
68 }
69
26
27/**
28 * \file drm_pci.h
29 * \brief PCI consistent, DMA-accessible memory allocation.
30 *
31 * \author Eric Anholt <anholt@FreeBSD.org>
32 */
33

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

62
63 /* Need power-of-two alignment, so fail the allocation if it isn't. */
64 if ((align & (align - 1)) != 0) {
65 DRM_ERROR("drm_pci_alloc with non-power-of-two alignment %d\n",
66 (int)align);
67 return NULL;
68 }
69
70 dmah = malloc(sizeof(drm_dma_handle_t), M_DRM, M_ZERO | M_NOWAIT);
70 dmah = malloc(sizeof(drm_dma_handle_t), DRM_MEM_DMA, M_ZERO | M_NOWAIT);
71 if (dmah == NULL)
72 return NULL;
73
74 /* Make sure we aren't holding locks here */
75 mtx_assert(&dev->dev_lock, MA_NOTOWNED);
76 if (mtx_owned(&dev->dev_lock))
77 DRM_ERROR("called while holding dev_lock\n");
78 mtx_assert(&dev->dma_lock, MA_NOTOWNED);
79 if (mtx_owned(&dev->dma_lock))
80 DRM_ERROR("called while holding dma_lock\n");
81
82 ret = bus_dma_tag_create(NULL, align, 0, /* tag, align, boundary */
83 maxaddr, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */
84 NULL, NULL, /* filtfunc, filtfuncargs */
85 size, 1, size, /* maxsize, nsegs, maxsegsize */
86 BUS_DMA_ALLOCNOW, NULL, NULL, /* flags, lockfunc, lockfuncargs */
87 &dmah->tag);
88 if (ret != 0) {
71 if (dmah == NULL)
72 return NULL;
73
74 /* Make sure we aren't holding locks here */
75 mtx_assert(&dev->dev_lock, MA_NOTOWNED);
76 if (mtx_owned(&dev->dev_lock))
77 DRM_ERROR("called while holding dev_lock\n");
78 mtx_assert(&dev->dma_lock, MA_NOTOWNED);
79 if (mtx_owned(&dev->dma_lock))
80 DRM_ERROR("called while holding dma_lock\n");
81
82 ret = bus_dma_tag_create(NULL, align, 0, /* tag, align, boundary */
83 maxaddr, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */
84 NULL, NULL, /* filtfunc, filtfuncargs */
85 size, 1, size, /* maxsize, nsegs, maxsegsize */
86 BUS_DMA_ALLOCNOW, NULL, NULL, /* flags, lockfunc, lockfuncargs */
87 &dmah->tag);
88 if (ret != 0) {
89 free(dmah, M_DRM);
89 free(dmah, DRM_MEM_DMA);
90 return NULL;
91 }
92
93 ret = bus_dmamem_alloc(dmah->tag, &dmah->vaddr, BUS_DMA_NOWAIT,
94 &dmah->map);
95 if (ret != 0) {
96 bus_dma_tag_destroy(dmah->tag);
90 return NULL;
91 }
92
93 ret = bus_dmamem_alloc(dmah->tag, &dmah->vaddr, BUS_DMA_NOWAIT,
94 &dmah->map);
95 if (ret != 0) {
96 bus_dma_tag_destroy(dmah->tag);
97 free(dmah, M_DRM);
97 free(dmah, DRM_MEM_DMA);
98 return NULL;
99 }
100
101 ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr, size,
102 drm_pci_busdma_callback, dmah, 0);
103 if (ret != 0) {
104 bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
105 bus_dma_tag_destroy(dmah->tag);
98 return NULL;
99 }
100
101 ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr, size,
102 drm_pci_busdma_callback, dmah, 0);
103 if (ret != 0) {
104 bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
105 bus_dma_tag_destroy(dmah->tag);
106 free(dmah, M_DRM);
106 free(dmah, DRM_MEM_DMA);
107 return NULL;
108 }
109
110 return dmah;
111}
112
113/**
114 * \brief Free a DMA-accessible consistent memory block.
115 */
116void
117drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah)
118{
119 if (dmah == NULL)
120 return;
121
122 bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
123 bus_dma_tag_destroy(dmah->tag);
124
107 return NULL;
108 }
109
110 return dmah;
111}
112
113/**
114 * \brief Free a DMA-accessible consistent memory block.
115 */
116void
117drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah)
118{
119 if (dmah == NULL)
120 return;
121
122 bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
123 bus_dma_tag_destroy(dmah->tag);
124
125 free(dmah, M_DRM);
125 free(dmah, DRM_MEM_DMA);
126}
127
128/*@}*/
126}
127
128/*@}*/