aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Glisse2010-01-14 04:24:16 -0600
committerJerome Glisse2010-01-14 04:24:16 -0600
commit6bf1ed2979ca56d3e8dd8938fc08e3810887ae8a (patch)
tree0596c81c4076f485ebd7ca52df8f0d6153d475ef /radeon/radeon_cs.h
parentb06cb754a1eee0746c40f62c51d4f0544c39c843 (diff)
downloadexternal-libgbm-6bf1ed2979ca56d3e8dd8938fc08e3810887ae8a.tar.gz
external-libgbm-6bf1ed2979ca56d3e8dd8938fc08e3810887ae8a.tar.xz
external-libgbm-6bf1ed2979ca56d3e8dd8938fc08e3810887ae8a.zip
radeon: indentation & trailing space cleanup
Diffstat (limited to 'radeon/radeon_cs.h')
-rw-r--r--radeon/radeon_cs.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/radeon/radeon_cs.h b/radeon/radeon_cs.h
index 0954ca07..49d5d9a6 100644
--- a/radeon/radeon_cs.h
+++ b/radeon/radeon_cs.h
@@ -1,8 +1,8 @@
1/* 1/*
2 * Copyright © 2008 Nicolai Haehnle 2 * Copyright © 2008 Nicolai Haehnle
3 * Copyright © 2008 Jérôme Glisse 3 * Copyright © 2008 Jérôme Glisse
4 * All Rights Reserved. 4 * All Rights Reserved.
5 * 5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a 6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the 7 * copy of this software and associated documentation files (the
8 * "Software"), to deal in the Software without restriction, including 8 * "Software"), to deal in the Software without restriction, including
@@ -10,13 +10,13 @@
10 * distribute, sub license, and/or sell copies of the Software, and to 10 * distribute, sub license, and/or sell copies of the Software, and to
11 * permit persons to whom the Software is furnished to do so, subject to 11 * permit persons to whom the Software is furnished to do so, subject to
12 * the following conditions: 12 * the following conditions:
13 * 13 *
14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL 16 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
17 * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, 17 * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
18 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 18 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 19 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20 * USE OR OTHER DEALINGS IN THE SOFTWARE. 20 * USE OR OTHER DEALINGS IN THE SOFTWARE.
21 * 21 *
22 * The above copyright notice and this permission notice (including the 22 * The above copyright notice and this permission notice (including the
@@ -63,16 +63,16 @@ struct radeon_cs {
63struct radeon_cs_manager; 63struct radeon_cs_manager;
64 64
65extern struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm, 65extern struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm,
66 uint32_t ndw); 66 uint32_t ndw);
67 67
68extern int radeon_cs_begin(struct radeon_cs *cs, 68extern int radeon_cs_begin(struct radeon_cs *cs,
69 uint32_t ndw, 69 uint32_t ndw,
70 const char *file, 70 const char *file,
71 const char *func, int line); 71 const char *func, int line);
72extern int radeon_cs_end(struct radeon_cs *cs, 72extern int radeon_cs_end(struct radeon_cs *cs,
73 const char *file, 73 const char *file,
74 const char *func, 74 const char *func,
75 int line); 75 int line);
76extern int radeon_cs_emit(struct radeon_cs *cs); 76extern int radeon_cs_emit(struct radeon_cs *cs);
77extern int radeon_cs_destroy(struct radeon_cs *cs); 77extern int radeon_cs_destroy(struct radeon_cs *cs);
78extern int radeon_cs_erase(struct radeon_cs *cs); 78extern int radeon_cs_erase(struct radeon_cs *cs);
@@ -81,10 +81,10 @@ extern void radeon_cs_print(struct radeon_cs *cs, FILE *file);
81extern void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit); 81extern void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit);
82extern void radeon_cs_space_set_flush(struct radeon_cs *cs, void (*fn)(void *), void *data); 82extern void radeon_cs_space_set_flush(struct radeon_cs *cs, void (*fn)(void *), void *data);
83extern int radeon_cs_write_reloc(struct radeon_cs *cs, 83extern int radeon_cs_write_reloc(struct radeon_cs *cs,
84 struct radeon_bo *bo, 84 struct radeon_bo *bo,
85 uint32_t read_domain, 85 uint32_t read_domain,
86 uint32_t write_domain, 86 uint32_t write_domain,
87 uint32_t flags); 87 uint32_t flags);
88 88
89/* 89/*
90 * add a persistent BO to the list 90 * add a persistent BO to the list
@@ -94,9 +94,9 @@ extern int radeon_cs_write_reloc(struct radeon_cs *cs,
94 * is a state emission with a color/textures etc followed by a bunch of vertices. 94 * is a state emission with a color/textures etc followed by a bunch of vertices.
95 */ 95 */
96void radeon_cs_space_add_persistent_bo(struct radeon_cs *cs, 96void radeon_cs_space_add_persistent_bo(struct radeon_cs *cs,
97 struct radeon_bo *bo, 97 struct radeon_bo *bo,
98 uint32_t read_domains, 98 uint32_t read_domains,
99 uint32_t write_domain); 99 uint32_t write_domain);
100 100
101/* reset the persistent BO list */ 101/* reset the persistent BO list */
102void radeon_cs_space_reset_bos(struct radeon_cs *cs); 102void radeon_cs_space_reset_bos(struct radeon_cs *cs);
@@ -108,9 +108,9 @@ int radeon_cs_space_check(struct radeon_cs *cs);
108 * a temporary BO is like a DMA buffer, which gets flushed with the 108 * a temporary BO is like a DMA buffer, which gets flushed with the
109 * command buffer */ 109 * command buffer */
110int radeon_cs_space_check_with_bo(struct radeon_cs *cs, 110int radeon_cs_space_check_with_bo(struct radeon_cs *cs,
111 struct radeon_bo *bo, 111 struct radeon_bo *bo,
112 uint32_t read_domains, 112 uint32_t read_domains,
113 uint32_t write_domain); 113 uint32_t write_domain);
114 114
115static inline void radeon_cs_write_dword(struct radeon_cs *cs, uint32_t dword) 115static inline void radeon_cs_write_dword(struct radeon_cs *cs, uint32_t dword)
116{ 116{
@@ -130,12 +130,12 @@ static inline void radeon_cs_write_qword(struct radeon_cs *cs, uint64_t qword)
130} 130}
131 131
132static inline void radeon_cs_write_table(struct radeon_cs *cs, 132static inline void radeon_cs_write_table(struct radeon_cs *cs,
133 void *data, uint32_t size) 133 void *data, uint32_t size)
134{ 134{
135 memcpy(cs->packets + cs->cdw, data, size * 4); 135 memcpy(cs->packets + cs->cdw, data, size * 4);
136 cs->cdw += size; 136 cs->cdw += size;
137 if (cs->section_ndw) { 137 if (cs->section_ndw) {
138 cs->section_cdw += size; 138 cs->section_cdw += size;
139 } 139 }
140} 140}
141#endif 141#endif