/
ion.txt
26955 lines (26244 loc) · 852 KB
/
ion.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From c7306c281e9e124d906c97f5eb367ea0eb7af55a Mon Sep 17 00:00:00 2001
From: bilalliberty <bilal_liberty@live.com>
Date: Wed, 27 Nov 2013 21:49:58 +0300
Subject: [PATCH] ION: CAF
---
arch/arm/configs/senny_defconfig | 2 +-
arch/arm/include/asm/device.h | 6 +-
arch/arm/include/asm/dma-iommu.h | 34 +
arch/arm/mach-msm/board-pyramid.c | 15 +-
arch/arm/mach-msm/devices-msm8x60.c | 2 +-
arch/arm/mach-msm/include/mach/board.h | 9 +-
arch/arm/mach-msm/include/mach/memory.h | 18 +
arch/arm/mach-msm/memory.c | 21 +
arch/arm/mach-msm/qdsp6v2/audio_acdb.c | 2 +-
arch/arm/mach-msm/qdsp6v2/audio_lpa.c | 2 +-
arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c | 3 +-
arch/arm/mm/init.c | 4 +-
drivers/char/msm_rotator.c | 2 +-
drivers/gpu/ion/Kconfig | 0
drivers/gpu/ion/Makefile | 1 +
drivers/gpu/ion/ion.c | 293 ++-
drivers/gpu/ion/ion_carveout_heap.c | 115 +-
drivers/gpu/ion/ion_cma_heap.c | 358 +++
drivers/gpu/ion/ion_cp_heap.c | 92 +-
drivers/gpu/ion/ion_heap.c | 18 +-
drivers/gpu/ion/ion_iommu_heap.c | 322 ++-
drivers/gpu/ion/ion_priv.h | 143 +-
drivers/gpu/ion/ion_system_heap.c | 43 +-
drivers/gpu/ion/ion_system_mapper.c | 114 +
drivers/gpu/ion/msm/Makefile | 0
drivers/gpu/ion/msm/ion_cp_common.c | 2 +-
drivers/gpu/ion/msm/ion_cp_common.h | 16 +-
drivers/gpu/ion/msm/msm_ion.c | 342 ++-
drivers/gpu/ion/tegra/Makefile | 0
drivers/gpu/ion/tegra/tegra_ion.c | 96 +
drivers/gpu/msm/kgsl.h | 2 +-
drivers/gpu/msm/kgsl_sharedmem.c | 2 +-
.../media/video/msm/gemini/msm_gemini_platform.c | 2 +-
drivers/media/video/msm/msm_mem.c | 2 +-
drivers/media/video/msm/wfd/Makefile | 0
drivers/media/video/msm/wfd/enc-subdev.c | 6 +-
drivers/media/video/msm/wfd/enc-subdev.h | 2 +-
drivers/media/video/msm/wfd/mdp-subdev.c | 0
drivers/media/video/msm/wfd/mdp-subdev.h | 0
drivers/media/video/msm/wfd/vsg-subdev.c | 0
drivers/media/video/msm/wfd/vsg-subdev.h | 0
drivers/media/video/msm/wfd/wfd-ioctl.c | 4 +-
drivers/media/video/msm/wfd/wfd-util.c | 0
drivers/media/video/msm/wfd/wfd-util.h | 0
drivers/media/video/videobuf2-msm-mem.c | 8 +-
drivers/staging/android/lowmemorykiller.c | 2 -
drivers/video/msm/mdp.h | 2 +-
drivers/video/msm/mdp4_util.c | 3 +-
drivers/video/msm/msm_fb.c | 2 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl.c | 41 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h | 74 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_api.h | 2 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_core.h | 10 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c | 19 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c | 416 ++-
.../msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c | 153 +-
.../video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c | 131 +-
.../video/msm/vidc/1080p/ddl/vcd_ddl_metadata.h | 4 +-
.../video/msm/vidc/1080p/ddl/vcd_ddl_properties.c | 461 +++-
.../video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c | 142 +-
.../video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h | 11 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c | 21 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h | 16 +-
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c | 95 +-
drivers/video/msm/vidc/1080p/ddl/vidc.c | 155 +-
drivers/video/msm/vidc/1080p/ddl/vidc.h | 34 +-
drivers/video/msm/vidc/1080p/ddl/vidc_hwio.h | 19 +-
drivers/video/msm/vidc/1080p/ddl/vidc_hwio_reg.h | 36 +-
drivers/video/msm/vidc/1080p/ddl/vidc_pix_cache.c | 6 +-
drivers/video/msm/vidc/1080p/ddl/vidc_pix_cache.h | 2 +-
.../vidc/1080p/resource_tracker/vcd_res_tracker.c | 136 +-
.../vidc/1080p/resource_tracker/vcd_res_tracker.h | 31 +-
.../1080p/resource_tracker/vcd_res_tracker_api.h | 4 +-
drivers/video/msm/vidc/720p/ddl/vcd_ddl.c | 637 +++++
drivers/video/msm/vidc/720p/ddl/vcd_ddl.h | 294 +++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_api.h | 53 +
drivers/video/msm/vidc/720p/ddl/vcd_ddl_core.h | 99 +
drivers/video/msm/vidc/720p/ddl/vcd_ddl_errors.c | 612 +++++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_firmware.c | 352 +++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_firmware.h | 53 +
drivers/video/msm/vidc/720p/ddl/vcd_ddl_hal.c | 971 +++++++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_helper.c | 297 +++
.../msm/vidc/720p/ddl/vcd_ddl_internal_property.h | 81 +
.../msm/vidc/720p/ddl/vcd_ddl_interrupt_handler.c | 1128 ++++++++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_metadata.c | 580 +++++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_metadata.h | 79 +
.../video/msm/vidc/720p/ddl/vcd_ddl_properties.c | 1943 ++++++++++++++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.c | 317 +++
drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.h | 60 +
drivers/video/msm/vidc/720p/ddl/vidc.c | 804 ++++++
drivers/video/msm/vidc/720p/ddl/vidc.h | 2705 ++++++++++++++++++++
.../vidc/720p/resource_tracker/vcd_res_tracker.c | 807 ++++++
.../vidc/720p/resource_tracker/vcd_res_tracker.h | 60 +
.../720p/resource_tracker/vcd_res_tracker_api.h | 44 +
drivers/video/msm/vidc/common/dec/vdec.c | 674 ++++-
drivers/video/msm/vidc/common/dec/vdec_internal.h | 2 +-
drivers/video/msm/vidc/common/enc/venc.c | 609 ++++-
drivers/video/msm/vidc/common/enc/venc_internal.c | 372 ++-
drivers/video/msm/vidc/common/enc/venc_internal.h | 25 +-
drivers/video/msm/vidc/common/init/vidc_init.c | 160 +-
.../msm/vidc/common/init/vidc_init_internal.h | 2 +-
drivers/video/msm/vidc/common/vcd/vcd.h | 11 +-
drivers/video/msm/vidc/common/vcd/vcd_api.c | 31 +-
drivers/video/msm/vidc/common/vcd/vcd_client_sm.c | 50 +-
drivers/video/msm/vidc/common/vcd/vcd_client_sm.h | 2 +-
drivers/video/msm/vidc/common/vcd/vcd_core.h | 6 +-
drivers/video/msm/vidc/common/vcd/vcd_device_sm.c | 14 +-
drivers/video/msm/vidc/common/vcd/vcd_device_sm.h | 2 +-
drivers/video/msm/vidc/common/vcd/vcd_power_sm.c | 44 +-
drivers/video/msm/vidc/common/vcd/vcd_power_sm.h | 2 +-
drivers/video/msm/vidc/common/vcd/vcd_scheduler.c | 35 +-
drivers/video/msm/vidc/common/vcd/vcd_sub.c | 240 +-
drivers/video/msm/vidc/common/vcd/vcd_util.c | 106 +
drivers/video/msm/vidc/common/vcd/vcd_util.h | 33 +-
fs/proc/meminfo.c | 86 +-
include/asm-generic/dma-coherent.h | 9 +
include/asm-generic/pci-dma-compat.h | 16 +-
include/linux/device.h | 1 +
include/linux/dma-attrs.h | 27 +-
include/linux/ion.h | 535 ++--
include/linux/msm_ion.h | 320 ++-
include/linux/msm_vidc_dec.h | 79 +-
include/linux/msm_vidc_enc.h | 347 ++-
include/media/msm/vcd_api.h | 9 +-
include/media/msm/vcd_property.h | 71 +-
include/media/msm/vcd_status.h | 3 +-
include/media/msm/vidc_init.h | 16 +-
include/media/msm/vidc_type.h | 2 +-
mm/oom_kill.c | 246 +-
sound/soc/msm/qdsp6/q6asm.c | 11 +-
130 files changed, 18861 insertions(+), 1444 deletions(-)
create mode 100644 arch/arm/include/asm/dma-iommu.h
mode change 100644 => 100755 drivers/gpu/ion/Kconfig
mode change 100644 => 100755 drivers/gpu/ion/Makefile
mode change 100644 => 100755 drivers/gpu/ion/ion.c
mode change 100644 => 100755 drivers/gpu/ion/ion_carveout_heap.c
create mode 100755 drivers/gpu/ion/ion_cma_heap.c
mode change 100644 => 100755 drivers/gpu/ion/ion_cp_heap.c
mode change 100644 => 100755 drivers/gpu/ion/ion_heap.c
mode change 100644 => 100755 drivers/gpu/ion/ion_iommu_heap.c
mode change 100644 => 100755 drivers/gpu/ion/ion_priv.h
mode change 100644 => 100755 drivers/gpu/ion/ion_system_heap.c
create mode 100755 drivers/gpu/ion/ion_system_mapper.c
mode change 100644 => 100755 drivers/gpu/ion/msm/Makefile
mode change 100644 => 100755 drivers/gpu/ion/msm/ion_cp_common.c
mode change 100644 => 100755 drivers/gpu/ion/msm/ion_cp_common.h
mode change 100644 => 100755 drivers/gpu/ion/msm/msm_ion.c
mode change 100644 => 100755 drivers/gpu/ion/tegra/Makefile
create mode 100755 drivers/gpu/ion/tegra/tegra_ion.c
mode change 100755 => 100644 drivers/media/video/msm/wfd/Makefile
mode change 100755 => 100644 drivers/media/video/msm/wfd/enc-subdev.c
mode change 100755 => 100644 drivers/media/video/msm/wfd/enc-subdev.h
mode change 100755 => 100644 drivers/media/video/msm/wfd/mdp-subdev.c
mode change 100755 => 100644 drivers/media/video/msm/wfd/mdp-subdev.h
mode change 100755 => 100644 drivers/media/video/msm/wfd/vsg-subdev.c
mode change 100755 => 100644 drivers/media/video/msm/wfd/vsg-subdev.h
mode change 100755 => 100644 drivers/media/video/msm/wfd/wfd-ioctl.c
mode change 100755 => 100644 drivers/media/video/msm/wfd/wfd-util.c
mode change 100755 => 100644 drivers/media/video/msm/wfd/wfd-util.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_api.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_core.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_errors.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_firmware.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_firmware.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_hal.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_helper.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_internal_property.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_interrupt_handler.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_metadata.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_metadata.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_properties.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.h
create mode 100644 drivers/video/msm/vidc/720p/ddl/vidc.c
create mode 100644 drivers/video/msm/vidc/720p/ddl/vidc.h
create mode 100644 drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
create mode 100644 drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.h
create mode 100644 drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker_api.h
create mode 100644 drivers/video/msm/vidc/common/vcd/vcd_util.c
diff --git a/arch/arm/configs/senny_defconfig b/arch/arm/configs/senny_defconfig
index 66974ee..d293e2a 100644
--- a/arch/arm/configs/senny_defconfig
+++ b/arch/arm/configs/senny_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-SebastianFM-1.0.3""
+CONFIG_LOCALVERSION="-LIBERTY-AOSP"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h
index 0f8aacd..b69c0d3 100644
--- a/arch/arm/include/asm/device.h
+++ b/arch/arm/include/asm/device.h
@@ -7,11 +7,15 @@
#define ASMARM_DEVICE_H
struct dev_archdata {
+ struct dma_map_ops *dma_ops;
#ifdef CONFIG_DMABOUNCE
struct dmabounce_device_info *dmabounce;
#endif
#ifdef CONFIG_IOMMU_API
- void *iommu;
+ void *iommu; /* private IOMMU data */
+#endif
+#ifdef CONFIG_ARM_DMA_USE_IOMMU
+ struct dma_iommu_mapping *mapping;
#endif
};
diff --git a/arch/arm/include/asm/dma-iommu.h b/arch/arm/include/asm/dma-iommu.h
new file mode 100644
index 0000000..799b094
--- /dev/null
+++ b/arch/arm/include/asm/dma-iommu.h
@@ -0,0 +1,34 @@
+#ifndef ASMARM_DMA_IOMMU_H
+#define ASMARM_DMA_IOMMU_H
+
+#ifdef __KERNEL__
+
+#include <linux/mm_types.h>
+#include <linux/scatterlist.h>
+#include <linux/dma-debug.h>
+#include <linux/kmemcheck.h>
+
+struct dma_iommu_mapping {
+ /* iommu specific data */
+ struct iommu_domain *domain;
+
+ void *bitmap;
+ size_t bits;
+ unsigned int order;
+ dma_addr_t base;
+
+ spinlock_t lock;
+ struct kref kref;
+};
+
+struct dma_iommu_mapping *
+arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size,
+ int order);
+
+void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping);
+
+int arm_iommu_attach_device(struct device *dev,
+ struct dma_iommu_mapping *mapping);
+
+#endif /* __KERNEL__ */
+#endif
diff --git a/arch/arm/mach-msm/board-pyramid.c b/arch/arm/mach-msm/board-pyramid.c
index 732a000..99dc76f 100644
--- a/arch/arm/mach-msm/board-pyramid.c
+++ b/arch/arm/mach-msm/board-pyramid.c
@@ -131,7 +131,7 @@
#include <linux/memblock.h>
#include <linux/clk.h>
-
+#include <linux/msm_ion.h>
#define PHY_BASE_ADDR1 0x48000000
#define SIZE_ADDR1 0x28000000
@@ -2679,9 +2679,9 @@ static void __init pm8901_vreg_mpp0_init(void)
.align = PAGE_SIZE,
};
-static struct ion_platform_data ion_pdata = {
- .nr = MSM_ION_HEAP_NUM,
- .heaps = {
+struct ion_platform_heap msm8660_heaps[] = {
+
+
{
.id = ION_SYSTEM_HEAP_ID,
.type = ION_HEAP_TYPE_SYSTEM,
@@ -2749,7 +2749,12 @@ static void __init pm8901_vreg_mpp0_init(void)
.memory_type = ION_EBI_TYPE,
.extra_data = &co_ion_pdata,
},
- }
+
+};
+
+static struct ion_platform_data ion_pdata = {
+ .nr = MSM_ION_HEAP_NUM,
+ .heaps = msm8660_heaps,
};
static struct platform_device ion_dev = {
diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c
index f3b7b1d..a618b28 100644
--- a/arch/arm/mach-msm/devices-msm8x60.c
+++ b/arch/arm/mach-msm/devices-msm8x60.c
@@ -16,7 +16,7 @@
#include <linux/regulator/machine.h>
#include <linux/regulator/consumer.h>
#include <linux/mfd/pmic8058.h>
-#include <linux/ion.h>
+#include <linux/msm_ion.h>
#include <mach/irqs.h>
#include <mach/dma.h>
#include <asm/mach/mmc.h>
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index 204a0ac..04ff56d 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -313,7 +313,11 @@ enum msm_camera_pixel_order_default {
MSM_CAMERA_PIXEL_ORDER_BG,
MSM_CAMERA_PIXEL_ORDER_GB,
};
-
+enum sensor_mount_angle {
+ ANGLE_90,
+ ANGLE_180,
+ ANGLE_270,
+};
struct msm_camera_sensor_platform_info {
int mount_angle;
int sensor_reset;
@@ -332,6 +336,8 @@ struct msm_camera_sensor_platform_info {
enum msm_camera_pixel_order_default pixel_order_default;
enum sensor_flip_mirror_info mirror_flip;
void *privacy_light_info;
+ enum sensor_mount_angle sensor_mount_angle;
+ bool ews_enable;
};
@@ -691,6 +697,7 @@ struct msm_vidc_platform_data {
int disable_fullhd;
u32 cp_enabled;
u32 secure_wb_heap;
+ u32 enable_sec_metadata;
#ifdef CONFIG_MSM_BUS_SCALING
struct msm_bus_scale_pdata *vidc_bus_client_pdata;
#endif
diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h
index ecf53f8..cafdc9a 100644
--- a/arch/arm/mach-msm/include/mach/memory.h
+++ b/arch/arm/mach-msm/include/mach/memory.h
@@ -67,6 +67,7 @@
int platform_physical_remove_pages(u64, u64);
int platform_physical_active_pages(u64, u64);
int platform_physical_low_power_pages(u64, u64);
+int msm_get_memory_type_from_name(const char *memtype_name);
extern int (*change_memory_power)(u64, u64, int);
@@ -107,6 +108,23 @@
(virt) - MEMBANK0_PAGE_OFFSET + MEMBANK0_PHYS_OFFSET)
#endif
+/*
+ * Need a temporary unique variable that no one will ever see to
+ * hold the compat string. Line number gives this easily.
+ * Need another layer of indirection to get __LINE__ to expand
+ * properly as opposed to appending and ending up with
+ * __compat___LINE__
+ */
+#define __CONCAT(a, b) ___CONCAT(a, b)
+#define ___CONCAT(a, b) a ## b
+
+#define EXPORT_COMPAT(com) \
+static char *__CONCAT(__compat_, __LINE__) __used \
+ __attribute((__section__(".exportcompat.init"))) = com
+
+extern char *__compat_exports_start[];
+extern char *__compat_exports_end[];
+
#endif
#if defined CONFIG_ARCH_MSM_SCORPION || defined CONFIG_ARCH_MSM_KRAIT
diff --git a/arch/arm/mach-msm/memory.c b/arch/arm/mach-msm/memory.c
index 45edbc5..45e0d5c 100644
--- a/arch/arm/mach-msm/memory.c
+++ b/arch/arm/mach-msm/memory.c
@@ -353,3 +353,24 @@ int release_fmem_c_region(void *unused)
{
return fmem_set_state(FMEM_T_STATE);
}
+
+static char * const memtype_names[] = {
+ [MEMTYPE_SMI_KERNEL] = "SMI_KERNEL",
+ [MEMTYPE_SMI] = "SMI",
+ [MEMTYPE_EBI0] = "EBI0",
+ [MEMTYPE_EBI1] = "EBI1",
+};
+
+int msm_get_memory_type_from_name(const char *memtype_name)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(memtype_names); i++) {
+ if (memtype_names[i] &&
+ strcmp(memtype_name, memtype_names[i]) == 0)
+ return i;
+ }
+
+ pr_err("Could not find memory type %s\n", memtype_name);
+ return -EINVAL;
+}
diff --git a/arch/arm/mach-msm/qdsp6v2/audio_acdb.c b/arch/arm/mach-msm/qdsp6v2/audio_acdb.c
index af077b0..e2d053a 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_acdb.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_acdb.c
@@ -666,7 +666,7 @@ static int register_memory(void)
}
kvptr = ion_map_kernel(acdb_data.ion_client,
- acdb_data.ion_handle, 0);
+ acdb_data.ion_handle);
if (IS_ERR_OR_NULL(kvptr)) {
pr_err("%s: Could not get kernel virt addr!!!\n", __func__);
result = PTR_ERR(kvptr);
diff --git a/arch/arm/mach-msm/qdsp6v2/audio_lpa.c b/arch/arm/mach-msm/qdsp6v2/audio_lpa.c
index 2fa6164..1dbefef 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_lpa.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_lpa.c
@@ -487,7 +487,7 @@ static int audlpa_ion_add(struct audio *audio,
goto flag_error;
}
- temp_ptr = ion_map_kernel(audio->client, handle, ionflag);
+ temp_ptr = ion_map_kernel(audio->client, handle);
if (IS_ERR_OR_NULL(temp_ptr)) {
pr_err("%s: could not get virtual address\n", __func__);
goto map_error;
diff --git a/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c b/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
index 3755036..d7d0765 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
@@ -740,7 +740,7 @@ static int audio_aio_ion_add(struct q6audio_aio *audio,
goto flag_error;
}
- temp_ptr = ion_map_kernel(audio->client, handle, ionflag);
+ temp_ptr = ion_map_kernel(audio->client, handle);
if (IS_ERR_OR_NULL(temp_ptr)) {
pr_err("%s: could not get virtual address\n", __func__);
goto map_error;
@@ -1157,7 +1157,6 @@ long audio_aio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
stats.byte_count = atomic_read(&audio->in_bytes);
stats.sample_count = atomic_read(&audio->in_samples);
- timestamp = q6asm_get_session_time(audio->ac);
memcpy(&stats.unused[0], ×tamp, sizeof(timestamp));
if (copy_to_user((void *)arg, &stats, sizeof(stats)))
rc = -EFAULT;
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index f3fe30d..7aefddf 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -97,8 +97,8 @@ void show_mem(unsigned int filter)
int free = 0, total = 0, reserved = 0;
int shared = 0, cached = 0, slab = 0, i;
struct meminfo * mi = &meminfo;
- unsigned long kgsl_alloc = kgsl_get_alloc_size(0);
- int ion_alloc = ion_iommu_heap_dump_size();
+ unsigned long kgsl_alloc = 0;
+ int ion_alloc = 0;
printk("Mem-info:\n");
show_free_areas(filter);
diff --git a/drivers/char/msm_rotator.c b/drivers/char/msm_rotator.c
index 615f003..a287f53 100644
--- a/drivers/char/msm_rotator.c
+++ b/drivers/char/msm_rotator.c
@@ -28,7 +28,7 @@
#include <linux/file.h>
#include <linux/major.h>
#include <linux/regulator/consumer.h>
-#include <linux/ion.h>
+#include <linux/msm_ion.h>
#ifdef CONFIG_MSM_BUS_SCALING
#include <mach/msm_bus.h>
#include <mach/msm_bus_board.h>
diff --git a/drivers/gpu/ion/Kconfig b/drivers/gpu/ion/Kconfig
old mode 100644
new mode 100755
diff --git a/drivers/gpu/ion/Makefile b/drivers/gpu/ion/Makefile
old mode 100644
new mode 100755
index c9e8a94..51349f6
--- a/drivers/gpu/ion/Makefile
+++ b/drivers/gpu/ion/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_ION) += ion.o ion_heap.o ion_system_heap.o ion_carveout_heap.o ion_iommu_heap.o ion_cp_heap.o
+obj-$(CONFIG_CMA) += ion_cma_heap.o
obj-$(CONFIG_ION_TEGRA) += tegra/
obj-$(CONFIG_ION_MSM) += msm/
diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c
old mode 100644
new mode 100755
index e5a6d1d..e9b3bb3
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/gpu/ion/ion.c
@@ -2,7 +2,7 @@
* drivers/gpu/ion/ion.c
*
* Copyright (C) 2011 Google, Inc.
- * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -39,6 +39,14 @@
#include "ion_priv.h"
#define DEBUG
+/**
+ * struct ion_device - the metadata of the ion device node
+ * @dev: the actual misc device
+ * @buffers: an rb tree of all the existing buffers
+ * @lock: lock protecting the buffers & heaps trees
+ * @heaps: list of all the heaps in the system
+ * @user_clients: list of all the clients created from userspace
+ */
struct ion_device {
struct miscdevice dev;
struct rb_root buffers;
@@ -50,6 +58,20 @@ struct ion_device {
struct dentry *debug_root;
};
+/**
+ * struct ion_client - a process/hw block local address space
+ * @node: node in the tree of all clients
+ * @dev: backpointer to ion device
+ * @handles: an rb tree of all the handles in this client
+ * @lock: lock protecting the tree of handles
+ * @heap_mask: mask of all supported heaps
+ * @name: used for debugging
+ * @task: used for debugging
+ *
+ * A client represents a list of buffers this client may access.
+ * The mutex stored here is used to protect both handles tree
+ * as well as the handles themselves, and should be held while modifying either.
+ */
struct ion_client {
struct rb_node node;
struct ion_device *dev;
@@ -62,6 +84,18 @@ struct ion_client {
struct dentry *debug_root;
};
+/**
+ * ion_handle - a client local reference to a buffer
+ * @ref: reference count
+ * @client: back pointer to the client the buffer resides in
+ * @buffer: pointer to the buffer
+ * @node: node in the client's handle rbtree
+ * @kmap_cnt: count of times this client has mapped to kernel
+ * @dmap_cnt: count of times this client has mapped for dma
+ *
+ * Modifications to node, map_cnt or mapping should be protected by the
+ * lock in the client. Other fields are never changed after initialization.
+ */
struct ion_handle {
struct kref ref;
struct ion_client *client;
@@ -73,24 +107,7 @@ struct ion_handle {
static void ion_iommu_release(struct kref *kref);
-static int ion_validate_buffer_flags(struct ion_buffer *buffer,
- unsigned long flags)
-{
- if (buffer->kmap_cnt || buffer->dmap_cnt || buffer->umap_cnt ||
- buffer->iommu_map_cnt) {
- if (buffer->flags != flags) {
- pr_err("%s: buffer was already mapped with flags %lx,"
- " cannot map with flags %lx\n", __func__,
- buffer->flags, flags);
- return 1;
- }
-
- } else {
- buffer->flags = flags;
- }
- return 0;
-}
-
+/* this function should only be called while dev->lock is held */
static void ion_buffer_add(struct ion_device *dev,
struct ion_buffer *buffer)
{
@@ -171,6 +188,7 @@ static struct ion_iommu_map *ion_iommu_lookup(struct ion_buffer *buffer,
return NULL;
}
+/* this function should only be called while dev->lock is held */
static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
struct ion_device *dev,
unsigned long len,
@@ -196,6 +214,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
buffer->dev = dev;
buffer->size = len;
+ buffer->flags = flags;
table = buffer->heap->ops->map_dma(buffer->heap, buffer);
if (IS_ERR_OR_NULL(table)) {
@@ -210,6 +229,10 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
return buffer;
}
+/**
+ * Check for delayed IOMMU unmapping. Also unmap any outstanding
+ * mappings which would otherwise have been leaked.
+ */
static void ion_iommu_delayed_unmap(struct ion_buffer *buffer)
{
struct ion_iommu_map *iommu_map;
@@ -230,7 +253,7 @@ static void ion_iommu_delayed_unmap(struct ion_buffer *buffer)
__func__, iommu_map->domain_info[DI_DOMAIN_NUM],
iommu_map->domain_info[DI_PARTITION_NUM]);
}
-
+ /* set ref count to 1 to force release */
kref_init(&iommu_map->ref);
kref_put(&iommu_map->ref, ion_iommu_release);
}
@@ -249,10 +272,10 @@ static void ion_buffer_destroy(struct kref *kref)
buffer->heap->ops->unmap_dma(buffer->heap, buffer);
ion_iommu_delayed_unmap(buffer);
+ buffer->heap->ops->free(buffer);
mutex_lock(&dev->lock);
rb_erase(&buffer->node, &dev->buffers);
mutex_unlock(&dev->lock);
- buffer->heap->ops->free(buffer);
kfree(buffer);
}
@@ -372,7 +395,8 @@ static void ion_handle_add(struct ion_client *client, struct ion_handle *handle)
}
struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
- size_t align, unsigned int flags)
+ size_t align, unsigned int heap_mask,
+ unsigned int flags)
{
struct rb_node *n;
struct ion_handle *handle;
@@ -385,6 +409,12 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
dbg_str[0] = '\0';
+ /*
+ * traverse the list of heaps available in this system in priority
+ * order. If the heap type is supported by the client, and matches the
+ * request of the caller allocate from it. Repeat until allocate has
+ * succeeded or all heaps have been tried
+ */
if (WARN_ON(!len))
return ERR_PTR(-EINVAL);
@@ -393,14 +423,15 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
mutex_lock(&dev->lock);
for (n = rb_first(&dev->heaps); n != NULL; n = rb_next(n)) {
struct ion_heap *heap = rb_entry(n, struct ion_heap, node);
-
+ /* if the client doesn't support this heap type */
if (!((1 << heap->type) & client->heap_mask))
continue;
-
- if (!((1 << heap->id) & flags))
+ /* if the caller didn't specify this heap type */
+ if (!((1 << heap->id) & heap_mask))
continue;
-
- if (secure_allocation && (heap->type != ION_HEAP_TYPE_CP))
+ /* Do not allow un-secure heap if secure is specified */
+ if (secure_allocation &&
+ (heap->type != (enum ion_heap_type) ION_HEAP_TYPE_CP))
continue;
buffer = ion_buffer_create(heap, dev, len, align, flags);
if (!IS_ERR_OR_NULL(buffer))
@@ -410,13 +441,13 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
int ret_value = snprintf(&dbg_str[dbg_str_idx],
len_left, "%s ", heap->name);
if (ret_value >= len_left) {
-
+ /* overflow */
dbg_str[MAX_DBG_STR_LEN-1] = '\0';
dbg_str_idx = MAX_DBG_STR_LEN;
} else if (ret_value >= 0) {
dbg_str_idx += ret_value;
} else {
-
+ /* error */
dbg_str[MAX_DBG_STR_LEN-1] = '\0';
}
}
@@ -434,9 +465,12 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
return ERR_PTR(PTR_ERR(buffer));
}
- buffer->creator = client;
handle = ion_handle_create(client, buffer);
+ /*
+ * ion_buffer_create will create a buffer with a ref_cnt of 1,
+ * and ion_handle_create will take a second reference, drop one here
+ */
ion_buffer_put(buffer);
if (!IS_ERR(handle)) {
@@ -616,6 +650,10 @@ int ion_map_iommu(struct ion_client *client, struct ion_handle *handle,
goto out;
}
+ /*
+ * If clients don't want a custom iova length, just use whatever
+ * the buffer size is
+ */
if (!iova_length)
iova_length = buffer->size;
@@ -718,8 +756,7 @@ void ion_unmap_iommu(struct ion_client *client, struct ion_handle *handle,
}
EXPORT_SYMBOL(ion_unmap_iommu);
-void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle,
- unsigned long flags)
+void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle)
{
struct ion_buffer *buffer;
void *vaddr;
@@ -741,11 +778,6 @@ void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle,
return ERR_PTR(-ENODEV);
}
- if (ion_validate_buffer_flags(buffer, flags)) {
- mutex_unlock(&client->lock);
- return ERR_PTR(-EEXIST);
- }
-
mutex_lock(&buffer->lock);
vaddr = ion_handle_kmap_get(handle);
mutex_unlock(&buffer->lock);
@@ -832,7 +864,7 @@ static int ion_debug_client_show(struct seq_file *s, void *unused)
if (type == ION_HEAP_TYPE_SYSTEM_CONTIG ||
type == ION_HEAP_TYPE_CARVEOUT ||
- type == ION_HEAP_TYPE_CP)
+ type == (enum ion_heap_type) ION_HEAP_TYPE_CP)
seq_printf(s, " : %12lx", handle->buffer->priv_phys);
else
seq_printf(s, " : %12s", "N/A");
@@ -886,6 +918,8 @@ struct ion_client *ion_client_create(struct ion_device *dev,
get_task_struct(current->group_leader);
task_lock(current->group_leader);
pid = task_pid_nr(current->group_leader);
+ /* don't bother to store task struct for kernel threads,
+ they can't be killed anyway */
if (current->group_leader->flags & PF_KTHREAD) {
put_task_struct(current->group_leader);
task = NULL;
@@ -938,7 +972,6 @@ struct ion_client *ion_client_create(struct ion_device *dev,
&debug_client_fops);
mutex_unlock(&dev->lock);
- pr_info("%s: create ion_client (%s) at %p\n", __func__, client->name, client);
return client;
}
@@ -947,13 +980,11 @@ void ion_client_destroy(struct ion_client *client)
struct ion_device *dev = client->dev;
struct rb_node *n;
- pr_info("%s: destroy ion_client %p (%s)\n", __func__, client, client->name);
+ pr_debug("%s: %d\n", __func__, __LINE__);
while ((n = rb_first(&client->handles))) {
struct ion_handle *handle = rb_entry(n, struct ion_handle,
node);
- mutex_lock(&client->lock);
ion_handle_destroy(&handle->ref);
- mutex_unlock(&client->lock);
}
mutex_lock(&dev->lock);
if (client->task)
@@ -1088,7 +1119,7 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
}
mutex_lock(&buffer->lock);
-
+ /* now map it to userspace */
ret = buffer->heap->ops->map_user(buffer->heap, buffer, vma);
if (ret) {
@@ -1100,6 +1131,10 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
mutex_unlock(&buffer->lock);
vma->vm_ops = &ion_vm_ops;
+ /*
+ * move the buffer into the vm_private_data so we can access it
+ * from vma_open/close
+ */
vma->vm_private_data = buffer;
}
return ret;
@@ -1176,9 +1211,12 @@ static int ion_share_set_flags(struct ion_client *client,
{
struct ion_buffer *buffer;
bool valid_handle;
- unsigned long ion_flags = ION_SET_CACHE(CACHED);
+ unsigned long ion_flags = 0;
if (flags & O_DSYNC)
- ion_flags = ION_SET_CACHE(UNCACHED);
+ ion_flags = ION_SET_UNCACHED(ion_flags);
+ else
+ ion_flags = ION_SET_CACHED(ion_flags);
+
mutex_lock(&client->lock);
valid_handle = ion_handle_validate(client, handle);
@@ -1190,12 +1228,6 @@ static int ion_share_set_flags(struct ion_client *client,
buffer = handle->buffer;
- mutex_lock(&buffer->lock);
- if (ion_validate_buffer_flags(buffer, ion_flags)) {
- mutex_unlock(&buffer->lock);
- return -EEXIST;
- }
- mutex_unlock(&buffer->lock);
return 0;
}
@@ -1239,7 +1271,7 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
dmabuf = dma_buf_get(fd);
if (IS_ERR_OR_NULL(dmabuf))
return ERR_PTR(PTR_ERR(dmabuf));
-
+ /* if this memory came from ion */
if (dmabuf->ops != &dma_buf_ops) {
pr_err("%s: can not import dmabuf from another exporter\n",
@@ -1250,7 +1282,7 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
buffer = dmabuf->priv;
mutex_lock(&client->lock);
-
+ /* if a handle exists for this buffer just take a reference to it */
handle = ion_handle_lookup(client, buffer);
if (!IS_ERR_OR_NULL(handle)) {
ion_handle_get(handle);
@@ -1279,7 +1311,25 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (copy_from_user(&data, (void __user *)arg, sizeof(data)))
return -EFAULT;
data.handle = ion_alloc(client, data.len, data.align,
- data.flags);
+ data.heap_mask, data.flags);
+
+ if (IS_ERR(data.handle))
+ return PTR_ERR(data.handle);
+
+ if (copy_to_user((void __user *)arg, &data, sizeof(data))) {
+ ion_free(client, data.handle);
+ return -EFAULT;
+ }
+ break;
+ }
+ case ION_IOC_ALLOC_COMPAT:
+ {
+ struct ion_allocation_data_compat data;
+
+ if (copy_from_user(&data, (void __user *)arg, sizeof(data)))
+ return -EFAULT;
+ data.handle = ion_alloc(client, data.len, data.align,
+ ion_full_heap_mask, 0);
if (IS_ERR(data.handle))
return PTR_ERR(data.handle);
@@ -1326,6 +1376,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
break;
}
case ION_IOC_IMPORT:
+ case ION_IOC_IMPORT_COMPAT:
{
struct ion_fd_data data;
int ret = 0;
@@ -1333,8 +1384,10 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
sizeof(struct ion_fd_data)))
return -EFAULT;
data.handle = ion_import_dma_buf(client, data.fd);
- if (IS_ERR(data.handle))
+ if (IS_ERR(data.handle)) {
+ ret = PTR_ERR(data.handle);
data.handle = NULL;
+ }
if (copy_to_user((void __user *)arg, &data,
sizeof(struct ion_fd_data)))
return -EFAULT;
@@ -1354,20 +1407,20 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return -EFAULT;
return dev->custom_ioctl(client, data.cmd, data.arg);
}
- case ION_IOC_CLEAN_CACHES_OLD:
case ION_IOC_CLEAN_CACHES:
+ case ION_IOC_CLEAN_CACHES_COMPAT:
return client->dev->custom_ioctl(client,
ION_IOC_CLEAN_CACHES, arg);
- case ION_IOC_INV_CACHES_OLD:
case ION_IOC_INV_CACHES:
+ case ION_IOC_INV_CACHES_COMPAT:
return client->dev->custom_ioctl(client,
ION_IOC_INV_CACHES, arg);
- case ION_IOC_CLEAN_INV_CACHES_OLD:
case ION_IOC_CLEAN_INV_CACHES:
+ case ION_IOC_CLEAN_INV_CACHES_COMPAT:
return client->dev->custom_ioctl(client,
ION_IOC_CLEAN_INV_CACHES, arg);
- case ION_IOC_GET_FLAGS_OLD:
case ION_IOC_GET_FLAGS:
+ case ION_IOC_GET_FLAGS_COMPAT:
return client->dev->custom_ioctl(client,
ION_IOC_GET_FLAGS, arg);
default:
@@ -1391,15 +1444,9 @@ static int ion_open(struct inode *inode, struct file *file)
struct ion_device *dev = container_of(miscdev, struct ion_device, dev);
struct ion_client *client;
char debug_name[64];
- char task_comm[TASK_COMM_LEN];
pr_debug("%s: %d\n", __func__, __LINE__);
- if (current->group_leader->flags & PF_KTHREAD) {
- snprintf(debug_name, 64, "%u", task_pid_nr(current->group_leader));
- } else {
- strcpy(debug_name, get_task_comm(task_comm, current->group_leader));
- }
-
+ snprintf(debug_name, 64, "%u", task_pid_nr(current->group_leader));
client = ion_client_create(dev, -1, debug_name);
if (IS_ERR_OR_NULL(client))
return PTR_ERR(client);
@@ -1421,9 +1468,7 @@ static size_t ion_debug_heap_total(struct ion_client *client,
size_t size = 0;
struct rb_node *n;
- if (!mutex_trylock(&client->lock))
- return -1;
-
+ mutex_lock(&client->lock);
for (n = rb_first(&client->handles); n; n = rb_next(n)) {
struct ion_handle *handle = rb_entry(n,
struct ion_handle,
@@ -1435,29 +1480,34 @@ static size_t ion_debug_heap_total(struct ion_client *client,
return size;
}
-static int ion_debug_find_buffer_owner(struct ion_client *client,
+/**
+ * Searches through a clients handles to find if the buffer is owned
+ * by this client. Used for debug output.
+ * @param client pointer to candidate owner of buffer
+ * @param buf pointer to buffer that we are trying to find the owner of
+ * @return 1 if found, 0 otherwise
+ */
+static int ion_debug_find_buffer_owner(const struct ion_client *client,
const struct ion_buffer *buf)
{
struct rb_node *n;
- int found = 0;
-
- if (!mutex_trylock(&client->lock))
- return 0;
for (n = rb_first(&client->handles); n; n = rb_next(n)) {
const struct ion_handle *handle = rb_entry(n,
const struct ion_handle,
node);
- if (handle->buffer == buf) {
- found = 1;
- break;
- }
+ if (handle->buffer == buf)
+ return 1;
}
-
- mutex_unlock(&client->lock);
- return found;
+ return 0;
}
+/**