diff options
author | Christian König <christian.koenig@amd.com> | 2015-08-03 14:39:12 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:50:59 -0400 |
commit | 351dba73691fc632b269f531bbce80157f79c5b3 (patch) | |
tree | 25a85a1fe8eceb0b9a21efa927f0a5cf302ebd4c | |
parent | 7484667c6a8a9122d139a287454bc9c8799c3def (diff) |
drm/amdgpu: reorder the code to avoid forward declerations
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 468f884271b3..d4cc232ccff3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -41,11 +41,6 @@ struct amdgpu_cs_buckets { | |||
41 | struct list_head bucket[AMDGPU_CS_NUM_BUCKETS]; | 41 | struct list_head bucket[AMDGPU_CS_NUM_BUCKETS]; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, | ||
45 | int error, bool backoff); | ||
46 | static void amdgpu_cs_parser_fini_early(struct amdgpu_cs_parser *parser, int error, bool backoff); | ||
47 | static void amdgpu_cs_parser_fini_late(struct amdgpu_cs_parser *parser); | ||
48 | |||
49 | static void amdgpu_cs_buckets_init(struct amdgpu_cs_buckets *b) | 44 | static void amdgpu_cs_buckets_init(struct amdgpu_cs_buckets *b) |
50 | { | 45 | { |
51 | unsigned i; | 46 | unsigned i; |
@@ -470,34 +465,6 @@ static int cmp_size_smaller_first(void *priv, struct list_head *a, | |||
470 | return (int)la->robj->tbo.num_pages - (int)lb->robj->tbo.num_pages; | 465 | return (int)la->robj->tbo.num_pages - (int)lb->robj->tbo.num_pages; |
471 | } | 466 | } |
472 | 467 | ||
473 | /** | ||
474 | * cs_parser_fini() - clean parser states | ||
475 | * @parser: parser structure holding parsing context. | ||
476 | * @error: error number | ||
477 | * | ||
478 | * If error is set than unvalidate buffer, otherwise just free memory | ||
479 | * used by parsing context. | ||
480 | **/ | ||
481 | static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bool backoff) | ||
482 | { | ||
483 | amdgpu_cs_parser_fini_early(parser, error, backoff); | ||
484 | amdgpu_cs_parser_fini_late(parser); | ||
485 | } | ||
486 | |||
487 | static int amdgpu_cs_parser_run_job( | ||
488 | struct amdgpu_cs_parser *sched_job) | ||
489 | { | ||
490 | amdgpu_cs_parser_fini_early(sched_job, 0, true); | ||
491 | return 0; | ||
492 | } | ||
493 | |||
494 | static int amdgpu_cs_parser_free_job( | ||
495 | struct amdgpu_cs_parser *sched_job) | ||
496 | { | ||
497 | amdgpu_cs_parser_fini_late(sched_job); | ||
498 | return 0; | ||
499 | } | ||
500 | |||
501 | static void amdgpu_cs_parser_fini_early(struct amdgpu_cs_parser *parser, int error, bool backoff) | 468 | static void amdgpu_cs_parser_fini_early(struct amdgpu_cs_parser *parser, int error, bool backoff) |
502 | { | 469 | { |
503 | if (!error) { | 470 | if (!error) { |
@@ -548,6 +515,34 @@ static void amdgpu_cs_parser_fini_late(struct amdgpu_cs_parser *parser) | |||
548 | kfree(parser); | 515 | kfree(parser); |
549 | } | 516 | } |
550 | 517 | ||
518 | /** | ||
519 | * cs_parser_fini() - clean parser states | ||
520 | * @parser: parser structure holding parsing context. | ||
521 | * @error: error number | ||
522 | * | ||
523 | * If error is set than unvalidate buffer, otherwise just free memory | ||
524 | * used by parsing context. | ||
525 | **/ | ||
526 | static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bool backoff) | ||
527 | { | ||
528 | amdgpu_cs_parser_fini_early(parser, error, backoff); | ||
529 | amdgpu_cs_parser_fini_late(parser); | ||
530 | } | ||
531 | |||
532 | static int amdgpu_cs_parser_run_job( | ||
533 | struct amdgpu_cs_parser *sched_job) | ||
534 | { | ||
535 | amdgpu_cs_parser_fini_early(sched_job, 0, true); | ||
536 | return 0; | ||
537 | } | ||
538 | |||
539 | static int amdgpu_cs_parser_free_job( | ||
540 | struct amdgpu_cs_parser *sched_job) | ||
541 | { | ||
542 | amdgpu_cs_parser_fini_late(sched_job); | ||
543 | return 0; | ||
544 | } | ||
545 | |||
551 | static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p, | 546 | static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p, |
552 | struct amdgpu_vm *vm) | 547 | struct amdgpu_vm *vm) |
553 | { | 548 | { |