On Sat, May 26, 2012 at 12:42 PM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> Just move its only caller into the same file as it and make it static.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> ?drivers/gpu/drm/radeon/radeon.h ? ? ?| ? ?1 -
> ?drivers/gpu/drm/radeon/radeon_cs.c ? | ? 27 ++++++++++++++++++++++++++-
> ?drivers/gpu/drm/radeon/radeon_ring.c | ? 25 -------------------------
> ?3 files changed, 26 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 1dc3a4a..492654f 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -848,7 +848,6 @@ struct radeon_cs_parser {
> ? ? ? ?s32 ? ? ? ? ? ? ? ? ? ? priority;
> ?};
>
> -extern int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx);
> ?extern int radeon_cs_finish_pages(struct radeon_cs_parser *p);
> ?extern u32 radeon_get_ib_value(struct radeon_cs_parser *p, int idx);
>
> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c
> b/drivers/gpu/drm/radeon/radeon_cs.c
> index c7d64a7..0137689 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;
> +}
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c
> b/drivers/gpu/drm/radeon/radeon_ring.c
> index 493a7be..983658c 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -39,31 +39,6 @@
> ?*/
> ?int radeon_debugfs_sa_init(struct radeon_device *rdev);
>
> -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;
> -}
> -
> ?int radeon_ib_get(struct radeon_device *rdev, int ring,
> ? ? ? ? ? ? ? ? ?struct radeon_ib *ib, unsigned size)
> ?{
> --
> 1.7.7.6
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
