History

drm/msm: Remove idle function hook

There isn't any generic code that uses ->idle so remove it.

Jordan Crouse committed 9 years ago

Commit e895c7b1 parent 167b6066 files · +10 −11Browse files

Unified · Split

6 files
  1. drivers/gpu/drm/msm/adreno/a3xx_gpu.c +2 −2
  2. drivers/gpu/drm/msm/adreno/a4xx_gpu.c +2 −2
  3. drivers/gpu/drm/msm/adreno/a5xx_gpu.c +4 −5
  4. drivers/gpu/drm/msm/adreno/a5xx_gpu.h +1 −0
  5. drivers/gpu/drm/msm/adreno/a5xx_power.c +1 −1
  6. drivers/gpu/drm/msm/msm_gpu.h +0 −1
drivers/gpu/drm/msm/adreno/a3xx_gpu.c+2−2
@@ -40,6 +40,7 @@ · 39 unmodified lines
4040 extern bool hang_debug;
4141
4242 static void a3xx_dump(struct msm_gpu *gpu);
43+static bool a3xx_idle(struct msm_gpu *gpu);
4344
4445 static bool a3xx_me_init(struct msm_gpu *gpu)
4546 {
@@ -65,7 +66,7 @@ static bool a3xx_me_init(struct msm_gpu *gpu) · 19 unmodified lines
6566 OUT_RING(ring, 0x00000000);
6667
6768 gpu->funcs->flush(gpu);
68− return gpu->funcs->idle(gpu);
69+ return a3xx_idle(gpu);
6970 }
7071
7172 static int a3xx_hw_init(struct msm_gpu *gpu)
@@ -446,7 +447,6 @@ static const struct adreno_gpu_funcs funcs = { · 374 unmodified lines
446447 .last_fence = adreno_last_fence,
447448 .submit = adreno_submit,
448449 .flush = adreno_flush,
449− .idle = a3xx_idle,
450450 .irq = a3xx_irq,
451451 .destroy = a3xx_destroy,
452452 #ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/msm/adreno/a4xx_gpu.c+2−2
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131
3232 extern bool hang_debug;
3333 static void a4xx_dump(struct msm_gpu *gpu);
34+static bool a4xx_idle(struct msm_gpu *gpu);
3435
3536 /*
3637 * a4xx_enable_hwcg() - Program the clock control registers
@@ -137,7 +138,7 @@ static bool a4xx_me_init(struct msm_gpu *gpu) · 100 unmodified lines
137138 OUT_RING(ring, 0x00000000);
138139
139140 gpu->funcs->flush(gpu);
140− return gpu->funcs->idle(gpu);
141+ return a4xx_idle(gpu);
141142 }
142143
143144 static int a4xx_hw_init(struct msm_gpu *gpu)
@@ -534,7 +535,6 @@ static const struct adreno_gpu_funcs funcs = { · 390 unmodified lines
534535 .last_fence = adreno_last_fence,
535536 .submit = adreno_submit,
536537 .flush = adreno_flush,
537− .idle = a4xx_idle,
538538 .irq = a4xx_irq,
539539 .destroy = a4xx_destroy,
540540 #ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/msm/adreno/a5xx_gpu.c+4−5
@@ -287,7 +287,7 @@ static int a5xx_me_init(struct msm_gpu *gpu) · 286 unmodified lines
287287
288288 gpu->funcs->flush(gpu);
289289
290− return gpu->funcs->idle(gpu) ? 0 : -EINVAL;
290+ return a5xx_idle(gpu) ? 0 : -EINVAL;
291291 }
292292
293293 static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu,
@@ -638,7 +638,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu) · 344 unmodified lines
638638 OUT_RING(gpu->rb, 0x0F);
639639
640640 gpu->funcs->flush(gpu);
641− if (!gpu->funcs->idle(gpu))
641+ if (!a5xx_idle(gpu))
642642 return -EINVAL;
643643 }
644644
@@ -655,7 +655,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu) · 10 unmodified lines
655655 OUT_RING(gpu->rb, 0x00000000);
656656
657657 gpu->funcs->flush(gpu);
658− if (!gpu->funcs->idle(gpu))
658+ if (!a5xx_idle(gpu))
659659 return -EINVAL;
660660 } else {
661661 /* Print a warning so if we die, we know why */
@@ -732,7 +732,7 @@ static inline bool _a5xx_check_idle(struct msm_gpu *gpu) · 70 unmodified lines
732732 A5XX_RBBM_INT_0_MASK_MISC_HANG_DETECT);
733733 }
734734
735−static bool a5xx_idle(struct msm_gpu *gpu)
735+bool a5xx_idle(struct msm_gpu *gpu)
736736 {
737737 /* wait for CP to drain ringbuffer: */
738738 if (!adreno_idle(gpu))
@@ -1037,7 +1037,6 @@ static const struct adreno_gpu_funcs funcs = { · 298 unmodified lines
10371037 .last_fence = adreno_last_fence,
10381038 .submit = a5xx_submit,
10391039 .flush = adreno_flush,
1040− .idle = a5xx_idle,
10411040 .irq = a5xx_irq,
10421041 .destroy = a5xx_destroy,
10431042 #ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/msm/adreno/a5xx_gpu.h+1−0
@@ -58,5 +58,6 @@ static inline int spin_usecs(struct msm_gpu *gpu, uint32_t usecs, · 57 unmodified lines
5858 return -ETIMEDOUT;
5959 }
6060
61+bool a5xx_idle(struct msm_gpu *gpu);
6162
6263 #endif /* __A5XX_GPU_H__ */
drivers/gpu/drm/msm/adreno/a5xx_power.c+1−1
@@ -194,7 +194,7 @@ static int a5xx_gpmu_init(struct msm_gpu *gpu) · 193 unmodified lines
194194
195195 gpu->funcs->flush(gpu);
196196
197− if (!gpu->funcs->idle(gpu)) {
197+ if (!a5xx_idle(gpu)) {
198198 DRM_ERROR("%s: Unable to load GPMU firmware. GPMU will not be active\n",
199199 gpu->name);
200200 return -EINVAL;
drivers/gpu/drm/msm/msm_gpu.h+0−1
@@ -50,7 +50,6 @@ struct msm_gpu_funcs { · 49 unmodified lines
5050 void (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit,
5151 struct msm_file_private *ctx);
5252 void (*flush)(struct msm_gpu *gpu);
53− bool (*idle)(struct msm_gpu *gpu);
5453 irqreturn_t (*irq)(struct msm_gpu *irq);
5554 uint32_t (*last_fence)(struct msm_gpu *gpu);
5655 void (*recover)(struct msm_gpu *gpu);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t