diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index e2e567395df8..dd903d329406 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -71,6 +71,10 @@ int r100_copy_blit(struct radeon_device *rdev, | |||
71 | uint64_t dst_offset, | 71 | uint64_t dst_offset, |
72 | unsigned num_pages, | 72 | unsigned num_pages, |
73 | struct radeon_fence *fence); | 73 | struct radeon_fence *fence); |
74 | int r100_set_surface_reg(struct radeon_device *rdev, int reg, | ||
75 | uint32_t tiling_flags, uint32_t pitch, | ||
76 | uint32_t offset, uint32_t obj_size); | ||
77 | int r100_clear_surface_reg(struct radeon_device *rdev, int reg); | ||
74 | 78 | ||
75 | static struct radeon_asic r100_asic = { | 79 | static struct radeon_asic r100_asic = { |
76 | .init = &r100_init, | 80 | .init = &r100_init, |
@@ -100,6 +104,8 @@ static struct radeon_asic r100_asic = { | |||
100 | .set_memory_clock = NULL, | 104 | .set_memory_clock = NULL, |
101 | .set_pcie_lanes = NULL, | 105 | .set_pcie_lanes = NULL, |
102 | .set_clock_gating = &radeon_legacy_set_clock_gating, | 106 | .set_clock_gating = &radeon_legacy_set_clock_gating, |
107 | .set_surface_reg = r100_set_surface_reg, | ||
108 | .clear_surface_reg = r100_clear_surface_reg, | ||
103 | }; | 109 | }; |
104 | 110 | ||
105 | 111 | ||
@@ -128,6 +134,7 @@ int r300_copy_dma(struct radeon_device *rdev, | |||
128 | uint64_t dst_offset, | 134 | uint64_t dst_offset, |
129 | unsigned num_pages, | 135 | unsigned num_pages, |
130 | struct radeon_fence *fence); | 136 | struct radeon_fence *fence); |
137 | |||
131 | static struct radeon_asic r300_asic = { | 138 | static struct radeon_asic r300_asic = { |
132 | .init = &r300_init, | 139 | .init = &r300_init, |
133 | .errata = &r300_errata, | 140 | .errata = &r300_errata, |
@@ -156,6 +163,8 @@ static struct radeon_asic r300_asic = { | |||
156 | .set_memory_clock = NULL, | 163 | .set_memory_clock = NULL, |
157 | .set_pcie_lanes = &rv370_set_pcie_lanes, | 164 | .set_pcie_lanes = &rv370_set_pcie_lanes, |
158 | .set_clock_gating = &radeon_legacy_set_clock_gating, | 165 | .set_clock_gating = &radeon_legacy_set_clock_gating, |
166 | .set_surface_reg = r100_set_surface_reg, | ||
167 | .clear_surface_reg = r100_clear_surface_reg, | ||
159 | }; | 168 | }; |
160 | 169 | ||
161 | /* | 170 | /* |
@@ -193,6 +202,8 @@ static struct radeon_asic r420_asic = { | |||
193 | .set_memory_clock = &radeon_atom_set_memory_clock, | 202 | .set_memory_clock = &radeon_atom_set_memory_clock, |
194 | .set_pcie_lanes = &rv370_set_pcie_lanes, | 203 | .set_pcie_lanes = &rv370_set_pcie_lanes, |
195 | .set_clock_gating = &radeon_atom_set_clock_gating, | 204 | .set_clock_gating = &radeon_atom_set_clock_gating, |
205 | .set_surface_reg = r100_set_surface_reg, | ||
206 | .clear_surface_reg = r100_clear_surface_reg, | ||
196 | }; | 207 | }; |
197 | 208 | ||
198 | 209 | ||
@@ -237,6 +248,8 @@ static struct radeon_asic rs400_asic = { | |||
237 | .set_memory_clock = NULL, | 248 | .set_memory_clock = NULL, |
238 | .set_pcie_lanes = NULL, | 249 | .set_pcie_lanes = NULL, |
239 | .set_clock_gating = &radeon_legacy_set_clock_gating, | 250 | .set_clock_gating = &radeon_legacy_set_clock_gating, |
251 | .set_surface_reg = r100_set_surface_reg, | ||
252 | .clear_surface_reg = r100_clear_surface_reg, | ||
240 | }; | 253 | }; |
241 | 254 | ||
242 | 255 | ||
@@ -322,6 +335,8 @@ static struct radeon_asic rs690_asic = { | |||
322 | .set_memory_clock = &radeon_atom_set_memory_clock, | 335 | .set_memory_clock = &radeon_atom_set_memory_clock, |
323 | .set_pcie_lanes = NULL, | 336 | .set_pcie_lanes = NULL, |
324 | .set_clock_gating = &radeon_atom_set_clock_gating, | 337 | .set_clock_gating = &radeon_atom_set_clock_gating, |
338 | .set_surface_reg = r100_set_surface_reg, | ||
339 | .clear_surface_reg = r100_clear_surface_reg, | ||
325 | }; | 340 | }; |
326 | 341 | ||
327 | 342 | ||
@@ -367,6 +382,8 @@ static struct radeon_asic rv515_asic = { | |||
367 | .set_memory_clock = &radeon_atom_set_memory_clock, | 382 | .set_memory_clock = &radeon_atom_set_memory_clock, |
368 | .set_pcie_lanes = &rv370_set_pcie_lanes, | 383 | .set_pcie_lanes = &rv370_set_pcie_lanes, |
369 | .set_clock_gating = &radeon_atom_set_clock_gating, | 384 | .set_clock_gating = &radeon_atom_set_clock_gating, |
385 | .set_surface_reg = r100_set_surface_reg, | ||
386 | .clear_surface_reg = r100_clear_surface_reg, | ||
370 | }; | 387 | }; |
371 | 388 | ||
372 | 389 | ||
@@ -405,6 +422,8 @@ static struct radeon_asic r520_asic = { | |||
405 | .set_memory_clock = &radeon_atom_set_memory_clock, | 422 | .set_memory_clock = &radeon_atom_set_memory_clock, |
406 | .set_pcie_lanes = &rv370_set_pcie_lanes, | 423 | .set_pcie_lanes = &rv370_set_pcie_lanes, |
407 | .set_clock_gating = &radeon_atom_set_clock_gating, | 424 | .set_clock_gating = &radeon_atom_set_clock_gating, |
425 | .set_surface_reg = r100_set_surface_reg, | ||
426 | .clear_surface_reg = r100_clear_surface_reg, | ||
408 | }; | 427 | }; |
409 | 428 | ||
410 | /* | 429 | /* |