diff options
author | Dave Airlie <airlied@redhat.com> | 2012-05-26 17:34:24 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-29 11:01:45 +0100 |
commit | c4c7f3149ba0b510047cb95d10f26ae1f6b89bc7 (patch) | |
tree | 56eff3cf28fbb6d46fcf72102120a664231c0059 /drivers/gpu/drm/radeon/radeon_cs.c | |
parent | a01ee165a132fadb57659d26246e340d6ac53265 (diff) | |
download | linux-stable-c4c7f3149ba0b510047cb95d10f26ae1f6b89bc7.tar.gz linux-stable-c4c7f3149ba0b510047cb95d10f26ae1f6b89bc7.tar.bz2 linux-stable-c4c7f3149ba0b510047cb95d10f26ae1f6b89bc7.zip |
radeon: make radeon_cs_update_pages static.
Just move its only caller into the same file as it and make it static.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_cs.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index c7d64a739033..0137689ed461 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -580,7 +580,7 @@ int radeon_cs_finish_pages(struct radeon_cs_parser *p) return 0; } -int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx) +static int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx) { int new_page; struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx]; @@ -623,3 +623,28 @@ int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx) return new_page; } + +u32 radeon_get_ib_value(struct radeon_cs_parser *p, int idx) +{ + struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx]; + u32 pg_idx, pg_offset; + u32 idx_value = 0; + int new_page; + + pg_idx = (idx * 4) / PAGE_SIZE; + pg_offset = (idx * 4) % PAGE_SIZE; + + if (ibc->kpage_idx[0] == pg_idx) + return ibc->kpage[0][pg_offset/4]; + if (ibc->kpage_idx[1] == pg_idx) + return ibc->kpage[1][pg_offset/4]; + + new_page = radeon_cs_update_pages(p, pg_idx); + if (new_page < 0) { + p->parser_error = new_page; + return 0; + } + + idx_value = ibc->kpage[new_page][pg_offset/4]; + return idx_value; +} |