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
40extern bool hang_debug;40extern bool hang_debug;
41 41
42static void a3xx_dump(struct msm_gpu *gpu);42static void a3xx_dump(struct msm_gpu *gpu);
43static bool a3xx_idle(struct msm_gpu *gpu);
43 44
44static bool a3xx_me_init(struct msm_gpu *gpu)45static bool a3xx_me_init(struct msm_gpu *gpu)
45{46{
@@ -65,7 +66,7 @@ static bool a3xx_me_init(struct msm_gpu *gpu) · 19 unmodified lines
65 OUT_RING(ring, 0x00000000);66 OUT_RING(ring, 0x00000000);
66 67
67 gpu->funcs->flush(gpu);68 gpu->funcs->flush(gpu);
68 return gpu->funcs->idle(gpu);69 return a3xx_idle(gpu);
69}70}
70 71
71static int a3xx_hw_init(struct msm_gpu *gpu)72static int a3xx_hw_init(struct msm_gpu *gpu)
@@ -446,7 +447,6 @@ static const struct adreno_gpu_funcs funcs = { · 374 unmodified lines
446 .last_fence = adreno_last_fence,447 .last_fence = adreno_last_fence,
447 .submit = adreno_submit,448 .submit = adreno_submit,
448 .flush = adreno_flush,449 .flush = adreno_flush,
449 .idle = a3xx_idle,
450 .irq = a3xx_irq,450 .irq = a3xx_irq,
451 .destroy = a3xx_destroy,451 .destroy = a3xx_destroy,
452#ifdef CONFIG_DEBUG_FS452#ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/msm/adreno/a4xx_gpu.c+2−2
@@ -31,6 +31,7 @@ · 30 unmodified lines
31 31
32extern bool hang_debug;32extern bool hang_debug;
33static void a4xx_dump(struct msm_gpu *gpu);33static void a4xx_dump(struct msm_gpu *gpu);
34static bool a4xx_idle(struct msm_gpu *gpu);
34 35
35/*36/*
36 * a4xx_enable_hwcg() - Program the clock control registers37 * a4xx_enable_hwcg() - Program the clock control registers
@@ -137,7 +138,7 @@ static bool a4xx_me_init(struct msm_gpu *gpu) · 100 unmodified lines
137 OUT_RING(ring, 0x00000000);138 OUT_RING(ring, 0x00000000);
138 139
139 gpu->funcs->flush(gpu);140 gpu->funcs->flush(gpu);
140 return gpu->funcs->idle(gpu);141 return a4xx_idle(gpu);
141}142}
142 143
143static int a4xx_hw_init(struct msm_gpu *gpu)144static int a4xx_hw_init(struct msm_gpu *gpu)
@@ -534,7 +535,6 @@ static const struct adreno_gpu_funcs funcs = { · 390 unmodified lines
534 .last_fence = adreno_last_fence,535 .last_fence = adreno_last_fence,
535 .submit = adreno_submit,536 .submit = adreno_submit,
536 .flush = adreno_flush,537 .flush = adreno_flush,
537 .idle = a4xx_idle,
538 .irq = a4xx_irq,538 .irq = a4xx_irq,
539 .destroy = a4xx_destroy,539 .destroy = a4xx_destroy,
540#ifdef CONFIG_DEBUG_FS540#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
287 287
288 gpu->funcs->flush(gpu);288 gpu->funcs->flush(gpu);
289 289
290 return gpu->funcs->idle(gpu) ? 0 : -EINVAL;290 return a5xx_idle(gpu) ? 0 : -EINVAL;
291}291}
292 292
293static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu,293static 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
638 OUT_RING(gpu->rb, 0x0F);638 OUT_RING(gpu->rb, 0x0F);
639 639
640 gpu->funcs->flush(gpu);640 gpu->funcs->flush(gpu);
641 if (!gpu->funcs->idle(gpu))641 if (!a5xx_idle(gpu))
642 return -EINVAL;642 return -EINVAL;
643 }643 }
644 644
@@ -655,7 +655,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu) · 10 unmodified lines
655 OUT_RING(gpu->rb, 0x00000000);655 OUT_RING(gpu->rb, 0x00000000);
656 656
657 gpu->funcs->flush(gpu);657 gpu->funcs->flush(gpu);
658 if (!gpu->funcs->idle(gpu))658 if (!a5xx_idle(gpu))
659 return -EINVAL;659 return -EINVAL;
660 } else {660 } else {
661 /* Print a warning so if we die, we know why */661 /* 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
732 A5XX_RBBM_INT_0_MASK_MISC_HANG_DETECT);732 A5XX_RBBM_INT_0_MASK_MISC_HANG_DETECT);
733}733}
734 734
735static bool a5xx_idle(struct msm_gpu *gpu)735bool a5xx_idle(struct msm_gpu *gpu)
736{736{
737 /* wait for CP to drain ringbuffer: */737 /* wait for CP to drain ringbuffer: */
738 if (!adreno_idle(gpu))738 if (!adreno_idle(gpu))
@@ -1037,7 +1037,6 @@ static const struct adreno_gpu_funcs funcs = { · 298 unmodified lines
1037 .last_fence = adreno_last_fence,1037 .last_fence = adreno_last_fence,
1038 .submit = a5xx_submit,1038 .submit = a5xx_submit,
1039 .flush = adreno_flush,1039 .flush = adreno_flush,
1040 .idle = a5xx_idle,
1041 .irq = a5xx_irq,1040 .irq = a5xx_irq,
1042 .destroy = a5xx_destroy,1041 .destroy = a5xx_destroy,
1043#ifdef CONFIG_DEBUG_FS1042#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
58 return -ETIMEDOUT;58 return -ETIMEDOUT;
59}59}
60 60
61bool a5xx_idle(struct msm_gpu *gpu);
61 62
62#endif /* __A5XX_GPU_H__ */63#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
194 194
195 gpu->funcs->flush(gpu);195 gpu->funcs->flush(gpu);
196 196
197 if (!gpu->funcs->idle(gpu)) {197 if (!a5xx_idle(gpu)) {
198 DRM_ERROR("%s: Unable to load GPMU firmware. GPMU will not be active\n",198 DRM_ERROR("%s: Unable to load GPMU firmware. GPMU will not be active\n",
199 gpu->name);199 gpu->name);
200 return -EINVAL;200 return -EINVAL;
drivers/gpu/drm/msm/msm_gpu.h+0−1
@@ -50,7 +50,6 @@ struct msm_gpu_funcs { · 49 unmodified lines
50 void (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit,50 void (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit,
51 struct msm_file_private *ctx);51 struct msm_file_private *ctx);
52 void (*flush)(struct msm_gpu *gpu);52 void (*flush)(struct msm_gpu *gpu);
53 bool (*idle)(struct msm_gpu *gpu);
54 irqreturn_t (*irq)(struct msm_gpu *irq);53 irqreturn_t (*irq)(struct msm_gpu *irq);
55 uint32_t (*last_fence)(struct msm_gpu *gpu);54 uint32_t (*last_fence)(struct msm_gpu *gpu);
56 void (*recover)(struct msm_gpu *gpu);55 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