summaryrefslogtreecommitdiff
path: root/mali_kbase/mali_kbase_js.c
AgeCommit message (Collapse)Author
2024-01-05Merge branch 'upstream' into HEADVamsidhar reddy Gaddam
Update KMD to R47P0 Bug: 315267052 Test: Outlined in go/pixel-gpu-kmd-r47p0 Change-Id: I89454c4c862033fe330b260a9bc6cc777a3ca231 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2023-12-14Update KMD to r47p0Jörg Wagner
Provenance: ipdelivery@ad01e50d640910a99224382bb227e6d4de627657 Change-Id: I19ac9bce34a5c5a319c1b4a388e8b037b3dfe6e7
2023-09-01Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1Jörg Wagner
Bug: 290882327 Change-Id: I90723cbaa3f294431087587fd8025f0688e51bf2
2023-08-03Update KMD to 'mini release: update r44p1-01bet1 to r44p1-00dev2'Jörg Wagner
Provenance: ipdelivery@d10c137c7691a470b8b33786aec4965315db4561 Change-Id: I4fbcc669d3b8e36c8288c91fdddd8b79258b6635
2023-07-12Merge upstream DDK R43P0 KMDDebarshi Dutta
Merge DDK version R43P0 from upstream branch Provenance: 48a9c7e25986318c8475bc245de51e7bec2606e8 (ipdelivery/EAC/v_r43p0) VX504X08X-BU-00000-r43p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r43p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r43p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r43p0-01eac0 - Valhall Android Renderscript AOSP parts Bug 278174418 Commit-Topic: R43P0_KMD Signed-off-by: Debarshi Dutta <debarshid@google.com> Change-Id: I84fb19e7ce5f28e735d44a4993d51bd985aac80b
2023-05-01Mali Valhall Android DDK r43p0-01eac0 KMDToby Sunrise
Provenance: 48a9c7e25986318c8475bc245de51e7bec2606e8 (ipdelivery/EAC/v_r43p0) VX504X08X-BU-00000-r43p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r43p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r43p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r43p0-01eac0 - Valhall Android Renderscript AOSP parts Change-Id: I5df1914eba386e0bf507d4951240e1744f666a29
2023-05-01Mali Valhall Android DDK r42p0-01eac0 KMDToby Sunrise
Provenance: 300534375857cb2963042df7b788b1ab5616c500 (ipdelivery/EAC/v_r42p0) VX504X08X-BU-00000-r42p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r42p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r42p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r42p0-01eac0 - Valhall Android Renderscript AOSP parts Change-Id: I3b15e01574f03706574a8edaf50dae4ba16e30c0
2023-04-05mali_kbase: Remove redundant if check to unblock suspendJack Diver
Completed atoms are expected to always have a flag indicating they were submitted. A warning is present to assert this fact. Currently, if the flag is not present it will block GPU suspend. Remove the if to unblock suspend and prevent a kernel lockup. Bug: 233522199 Change-Id: I541ac835ec36562f7724b35e171d71537e763ed9 Signed-off-by: Jack Diver <diverj@google.com>
2023-02-12Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udcPixelBot AutoMerger
SBMerger: 478053055 Change-Id: Ia97a3d8926abeb6706979bb4bcbc11bee2e9d3a5 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-01-13MIDCET-4324/GPUCORE-35180 Clear GPU caches before terminating region trackerandroid-t-qpr2-beta-3_r0.5android-t-qpr2-beta-3_r0.4android-t-qpr2-beta-3_r0.3android-t-qpr2-beta-3.2_r0.6android-gs-raviole-5.10-android13-qpr2-betaandroid-gs-pantah-5.10-t-qpr2-beta-3.2android-gs-pantah-5.10-android13-qpr2-betaandroid-gs-bluejay-5.10-android13-qpr2-betaSuzanne Candanedo
Move the code to disable the MMU for a kctx (which also will flush the GPU caches for that kctx's Address Space) from the end of kctx termination to JM/CSF kctx-scheduler termination time. This ensures the GPU cached writes for that kctx are clear before we free the kctx's GPU memory pages in the region tracker, and before the MMU tables are freed. This in turn ensures the GPU cached writes do not land in freed memory (which would be a security issue). Change-Id: I2730a5762cb106ca2179cf9a2f789b8764f21901 (cherry picked from commit 09e14ccf27007dcb2cc0d4d64f5087ccc620a0b5) Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/4810 Bug: 260123838
2022-12-15Mali Valhall Android DDK r41p0-01eac0 KMDJörg Wagner
Provenance 7bb206ede984968bd1014b29529e94763b043202 (ipdelivery/EAC/v_r41p0) VX504X08X-BU-00000-r41p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r41p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r41p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r41p0-01eac0 - Valhall Android Renderscript AOSP parts Change-Id: I95f741ffe0ec4ee4c8f2c0338778294f1a2a2836
2022-12-15Mali Valhall Android DDK r40p0-01eac0 KMDJörg Wagner
Provenance: 056ded72d351d1bf6319f7b2b925496dd6ad304f (ipdelivery/EAC/v_r40p0) VX504X08X-BU-00000-r40p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r40p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r40p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r40p0-01eac0 - Valhall Android Renderscript AOSP parts Change-Id: I6db6b45c73c5447dd246533246e65b5ef2c8872f
2022-12-06mali_kbase: upgrade pm lock to rt_mutexKevin DuBois
Upgrade pm lock to rt_mutex. Userspace code, which may be of any priority, can hold this lock through certain paths, which leads to PI on RT tasks that also need this path. Bug: 225338402 Test: boot to home, subjective improvement noted. Change-Id: Ie8e5aff5d2f59a0274e4b19f534624bbaf50870e
2022-10-06mali_kbase: MIDCET-4220 Patch for GPUSWERRATA-1360Suzanne Candanedo
This patch is fix for SW errata 2637762 fixing possible out of bounds array access. Bug: 251397485 Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/4580 Signed-off-by: Jesse Hall <jessehall@google.com> Change-Id: Ie8a48bbe903fe1127d298a33b9533753d0763452
2022-09-02Mali Valhall Android DDK r38p1-01eac0Jack Diver
VX504X08X-BU-00000-r38p1-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r38p1-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r38p1-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r38p1-01eac0 - Valhall Android Renderscript AOSP parts Signed-off-by: Jack Diver <diverj@google.com> Change-Id: I242060ad8ddc14475bda657cbbbe6b6c26ecfd57
2022-05-06mali_kbase: use RT_MUTEX for some job submission and context locksandroid-t-beta-4_r0.6android-t-beta-4_r0.5android-t-beta-4_r0.4android-t-beta-3_r0.4android-t-beta-3.3_r0.4android-t-beta-3.2_r0.4android-13.0.0_r0.5android-13.0.0_r0.44android-13.0.0_r0.43android-13.0.0_r0.4android-13.0.0_r0.20android-13.0.0_r0.19android-13.0.0_r0.15android-13.0.0_r0.14android-gs-raviole-5.10-t-beta-4android-gs-raviole-5.10-t-beta-3android-gs-raviole-5.10-android13android-gs-bluejay-5.10-t-beta-4android-gs-bluejay-5.10-android13Devika Krishnadas
Bug: 230692528 Test: smoke test Signed-off-by: Devika Krishnadas <kdevika@google.com> Change-Id: I7d5da6c0a55ccfc6e789ecb74f0af71aac9d5be3
2022-03-23Merge r36p0 from upstream into android-gs-pixel-5.10-gs101Siddharth Kapoor
Bug: 220942030 Test: boot to Home, Camera, Video, Chrome Signed-off-by: Siddharth Kapoor <ksiddharth@google.com> Change-Id: I8cf3a6243b092a05299acf956f5293facd1ed3cc
2022-03-02Mali Valhall Android DDK r36p0 KMDSiddharth Kapoor
Provenance: 9f72c118d9 (ipdelivery/EAC/v_r36p0) VX504X08X-BU-00000-r36p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r36p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r36p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r36p0-01eac0 - Valhall Android Renderscript AOSP parts Signed-off-by: Siddharth Kapoor <ksiddharth@google.com> Change-Id: I4a63b707fedc68d7b7d046596c7098da47a139cb
2021-12-06Merge r34p0-00dev1 from upstream into android-gs-pixel-5.10-gs101Siddharth Kapoor
Change-Id: I051ad3af9ac645fb8585219c48210df424a27807 Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
2021-11-23Mali Valhall Android DDK r34p0-00dev1Jesse Hall
Provenance: 046d23c969 (collaborate/google/android/v_r34p0-00dev1) VX504X08X-BU-00000-r34p0-00dev1 - Valhall Android DDK VX504X08X-SW-99006-r34p0-00dev1 - Valhall Android Renderscript AOSP parts Documentation from VX504X08X-BU-00000 omitted. Signed-off-by: Jesse Hall <jessehall@google.com> Change-Id: I4ebbb3a3af709bd39f883eed3b35bf4657a95797
2021-10-01Fix unused-but-set-variable build breakage clang migrate to r433403Robin Peng
Bug: 201718040 Signed-off-by: Robin Peng <robinpeng@google.com> Change-Id: I504445083e7e4f74ae8fede4c1d33458bc1eb565
2021-07-21Merge r32p1-beta2 from upstream into android-gs-pixel-5.10Sidath Senanayake
This commit updates the Mali KMD to version r32p1-beta2 from commit 52c5bf56aa5f18f0e0158998b8ac23bfc4cccad6 Bug: 186092835 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ie68303c73624067234aeb8756ad0835115380968
2021-07-19Mali Valhall DDK r32p1 BETA 2 KMDSidath Senanayake
Provenance: 83a91db27 (collaborate/google/android/v_r32p1-00bet0) VX504X08X-BU-00000-r32p1-00bet2 - Valhall Android DDK VX504X08X-BU-60000-r32p1-00bet2 - Valhall Android Document Bundle VX504X08X-DC-11001-r32p1-00bet2 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r32p1-00bet2 - Valhall Android Renderscript AOSP parts Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ib171e2ed076c1f60b38f4cc9d99848489d4d1459
2021-07-12Merge r32p1-beta from upstream into android-gs-pixel-5.10Sidath Senanayake
This commit updates the Mali KMD to version r32p1-beta from commit 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b Bug: 190388367 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ia2fa310b12eb95b0f3013c69ca821909d3fbf125
2021-07-12Merge r31p0 from upstream into android-gs-pixel-5.10Sidath Senanayake
This commit updates the Mali KMD to version r31p0 from commit fca8613cfcf585bf9113dca96a05daea9fd89794 Bug: 185900681 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I3c814b6145b10beee3d0fecedb74a6225a09a858
2021-06-17Mali Valhall DDK r32p1 BETA KMDSidath Senanayake
Provenance: 59f633569 (collaborate/google/android/v_r32p1-00bet0) VX504X08X-BU-00000-r32p1-00bet0 - Valhall Android DDK VX504X08X-BU-60000-r32p1-00bet0 - Valhall Android Document Bundle VX504X08X-DC-11001-r32p1-00bet0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r32p1-00bet0 - Valhall Android Renderscript AOSP parts Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I6c9fc6e1e9f2e58bc804eb79582ad7afaafdef1b
2021-06-15Mali Valhall DDK r31p0 KMDSidath Senanayake
Provenance: 2ea0ef9bd (collaborate/EAC/v_r31p0) VX504X08X-BU-00000-r31p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r31p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r31p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r31p0-01eac0 - Valhall Android Renderscript AOSP parts Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ide9d5fdc6d9c95fa66a3546b01f619b43c09496d
2021-04-20Merge r30p0 from upstream into android-gs-pixel-5.10Sidath Senanayake
This commit updates the Mali KMD to version r30p0 from commit 8037b534570814775d79aeddd06b76e5ee941f59 Bug: 180379272 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I703f1da43913fab5cb5ac704630418b72655dc41
2021-04-14Mali Valhall DDK r30p0 KMDSidath Senanayake
Provenance 4a09e9e58 (collaborate/EAC/v_r30p0) VX504X08X-BU-00000-r30p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r30p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r30p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r30p0-01eac0 - Valhall Android Renderscript AOSP parts Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ie30d6ece7ebe221c8e4c736af05ad05dcfc15127
2021-02-10Merge r29p0 from upstream into android-gs-pixel-mainlineSidath Senanayake
This commit updates the Mali KMD to version r29p0 from commit 9748305a584b9f1f7705303ce6e33a5e8b923e60 Bug: 178778804 Change-Id: Ie20425d4ea5c1529e299ca9a0454a56afb0fba95
2021-01-29Mali Valhall DDK r29p0 KMDSidath Senanayake
Provenance: afaca8da1 (collaborate/EAC/v_r29p0) VX504X08X-BU-00000-r29p0-01eac0 - Valhall Android DDK VX504X08X-BU-60000-r29p0-01eac0 - Valhall Android Document Bundle VX504X08X-DC-11001-r29p0-01eac0 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r29p0-01eac0 - Valhall Android Renderscript AOSP parts Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ie0904c9223b7ec9311b848a52d3159ac2b07530e
2020-09-02mali_kbase: defer some jobs instead of powering onSidath Senanayake
Bug: 156057140 Bug: 159487344 Bug: 154764613 Signed-off-by: Sidath Senanayake <sidaths@google.com> Signed-off-by: Jesse Hall <jessehall@google.com> Change-Id: Ibbf3b422894084d318cb01bddc3a3c635677231f
2020-09-02mali_kbase: convert event and jd workqueues to per-device kthreadsSidath Senanayake
Use kthreads instead of workqueues to allow more control over mali driver scheduling. Hoist the kthreads to be per-device. Bug: 156057140 Bug: 157077800 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ic7fd80cb6be7b514fc824658bfd2e5fd090f4555
2020-06-18Mali Valhall DDK r25p0 KMDSidath Senanayake
Provenance: 395644cb0 (collaborate/EAC/v_r25p0) VX504X08X-BU-00000-r25p0-01eac0 - Android DDK VX504X08X-BU-60000-r25p0-01eac0 - Android Document Bundle Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I2cffddb42a554696d45b7f65c7bae8827a71341f
2020-04-14Mali Valhall DDK r24p0 KMDSidath Senanayake
Provenance: c5a37f014 (collaborate/EAC/v_r24p0) VX504X08X-BU-00000-r24p0-01rel0 - Android DDK VX504X08X-BU-60000-r24p0-01rel0 - Android Document Bundle Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I1536474b6a18731cd377251c6dc947811ba0c787
2020-02-27Mali Valhall DDK r23p0 KMDSidath Senanayake
Provenance: 941021020 (collaborate/EAC/v_r23p0) VX504X08X-BU-00000-r23p0-01rel0 - Android DDK VX504X08X-BU-60000-r23p0-01rel0 - Android Document Bundle Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I0d87e7b3520751fd6f310e10e23498a468a7a68c
2020-02-03Mali Valhall DDK r22p0 KMDSidath Senanayake
Provenance: 6425105ec (collaborate/EAC/v_r22p0) VX504X08X-BU-00000-r22p0-01rel0 - Android DDK VX504X08X-BU-60000-r22p0-01rel0 - Android Document Bundle Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I257ad9ba30a61008e6425d63700356f16009ead7
2020-08-14Mali Valhall DDK r21p0 KMDSidath Senanayake
Provenance: 055b0c4d8 (collaborate/EAC/v_r21p0) VX504X08X-BU-00000-r21p0-01rel0 - Android DDK Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I652de1257c48ecb047f160906039e843347a7cd7
2019-08-23Mali Valhall DDK r20p0 KMDSidath Senanayake
Provenance: f3deff212 (collaborate/EAC/v_r20p0) VX504X08X-BU-00000-r20p0-01rel0 - Android DDK Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: If3c1611d83966bcb25a85ad27638612c121cb545
2019-05-06Mali Bifrost DDK r18p0 KMDSidath Senanayake
Provenance: ee36a6687 (collaborate/EAC/b_r18p0) BX304L01B-BU-00000-r18p0-01rel0 BX304L06A-BU-00000-r18p0-01rel0 BX304X07X-BU-00000-r18p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ie26cb00b475d697c2778306ac09c6a799201ac77
2019-04-10Mali Bifrost DDK r17p0 KMDSidath Senanayake
Provenance: 789dfe7c7 (collaborate/EAC/b_r17p0) BX304L01B-BU-00000-r17p0-01rel0 BX304L06A-BU-00000-r17p0-01rel0 BX304X07X-BU-00000-r17p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Iff5bea2d96207a6e72d5e533e772c24a7adbdc31
2018-12-06Mali Bifrost DDK r16p0 KMDSidath Senanayake
Provenance: aa8b3ff0f (collaborate/EAC/b_r16p0) BX304L01B-BU-00000-r16p0-01rel0 BX304L06A-BU-00000-r16p0-01rel0 BX304X07X-BU-00000-r16p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I96125862b7cf6596d1b7109853fb4ca39e851056
2018-09-27Mali Bifrost DDK r15p0 KMDSidath Senanayake
Provenance: c4c373c4f (collaborate/EAC/b_r15p0) BX304L01B-BU-00000-r15p0-01rel0 BX304L06A-BU-00000-r15p0-01rel0 BX304X07X-BU-00000-r15p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I09fe49ca693dfde616dd8d6b8c3e5b178a47e9f8
2018-07-31Mali Bifrost DDK r14p0 KMDSidath Senanayake
Provenance: 37fe8262c (collaborate/EAC/b_r14p0) BX304L01B-BU-00000-r14p0-01rel0 BX304L06A-BU-00000-r14p0-01rel0 BX304X07X-BU-00000-r14p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I0eb3b666045d72d33e2953954de5b416f909da0f
2018-04-27Mali Bifrost DDK r12p0 KMDSidath Senanayake
Provenance: 875d9aa9b (collaborate/EAC/b_r12p0) BX304L01B-BU-00000-r12p0-01rel0 BX304L06A-BU-00000-r12p0-01rel0 BX304X07X-BU-00000-r12p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Id91cbb43f407e908f71a977fd139ea1e3a4f6b6f
2018-03-19Mali Bifrost DDK r11p0 KMDSidath Senanayake
Provenance: b1581ebda (collaborate/EAC/b_r11p0) BX304L01B-BU-00000-r11p0-01rel0 BX304L06A-BU-00000-r11p0-01rel0 BX304X07X-BU-00000-r11p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Ia590e1eb21778d33cacbefba83598ee56790ca85
2018-01-22Mali Bifrost DDK r10p0 KMDSidath Senanayake
Provenance: 27ee08eb4 (collaborate/EAC/b_r10p0) BX304L01B-BU-00000-r10p0-01rel0 BX304L06A-BU-00000-r10p0-01rel0 BX304X07X-BU-00000-r10p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: I31c8d66dad91c5b998f3e07757054c37c6aea963
2017-11-08Mali Bifrost DDK r9p0 KMDSidath Senanayake
Provenance: b336f554d (collaborate/EAC/b_r9p0) BX304L01B-BU-00000-r9p0-01rel0 BX304L06A-BU-00000-r9p0-01rel0 BX304X07X-BU-00000-r9p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Iaff4ad1413fa7d768d5d250afadbb24d19e1e2e2
2017-09-19Mali Bifrost DDK r8p0 KMDSidath Senanayake
Provenance: a0013c522 (collaborate/EAC/b_r8p0) BX304L01B-BU-00000-r8p0-01rel0 BX304L06A-BU-00000-r8p0-01rel0 BX304X07X-BU-00000-r8p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Iab1f0fc8f3602409180629b210c624791be774c5
2017-07-11Mali Bifrost DDK r7p0 KMDSidath Senanayake
Provenance: cbfad67c8 (collaborate/EAC/b_r7p0) BX304L01B-BU-00000-r7p0-01rel0 BX304L06A-BU-00000-r7p0-01rel0 BX304X07X-BU-00000-r7p0-01rel0 Signed-off-by: Sidath Senanayake <sidaths@google.com> Change-Id: Icdf8b47a48b829cc228f4df3035f7b539da58104