diff options
author | Jerome Glisse <jglisse@redhat.com> | 2009-11-20 08:29:23 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-01 23:00:18 -0500 |
commit | 4c7886791264f03428d5424befb1b96f08fc90f4 (patch) | |
tree | 2c644931001b06969fb3038e7beb68db436c4872 /drivers/gpu/drm/radeon/r100_track.h | |
parent | 1614f8b17b8cc3ad143541d41569623d30dbc9ec (diff) |
drm/radeon/kms: Rework radeon object handling
The locking & protection of radeon object was somewhat messy.
This patch completely rework it to now use ttm reserve as a
protection for the radeon object structure member. It also
shrink down the various radeon object structure by removing
field which were redondant with the ttm information. Last it
converts few simple functions to inline which should with
performances.
airlied: rebase on top of r600 and other changes.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100_track.h')
-rw-r--r-- | drivers/gpu/drm/radeon/r100_track.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index 0daf0d76a891..ca50903dd2bb 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h | |||
@@ -10,26 +10,26 @@ | |||
10 | * CS functions | 10 | * CS functions |
11 | */ | 11 | */ |
12 | struct r100_cs_track_cb { | 12 | struct r100_cs_track_cb { |
13 | struct radeon_object *robj; | 13 | struct radeon_bo *robj; |
14 | unsigned pitch; | 14 | unsigned pitch; |
15 | unsigned cpp; | 15 | unsigned cpp; |
16 | unsigned offset; | 16 | unsigned offset; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | struct r100_cs_track_array { | 19 | struct r100_cs_track_array { |
20 | struct radeon_object *robj; | 20 | struct radeon_bo *robj; |
21 | unsigned esize; | 21 | unsigned esize; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | struct r100_cs_cube_info { | 24 | struct r100_cs_cube_info { |
25 | struct radeon_object *robj; | 25 | struct radeon_bo *robj; |
26 | unsigned offset; | 26 | unsigned offset; |
27 | unsigned width; | 27 | unsigned width; |
28 | unsigned height; | 28 | unsigned height; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | struct r100_cs_track_texture { | 31 | struct r100_cs_track_texture { |
32 | struct radeon_object *robj; | 32 | struct radeon_bo *robj; |
33 | struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */ | 33 | struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */ |
34 | unsigned pitch; | 34 | unsigned pitch; |
35 | unsigned width; | 35 | unsigned width; |