Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f337e315 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'update-new' into 'v1-pie' 

Update blobs , Fix issue issues-1232 and issues-1245

See merge request !3
parents bcfd5f14 6b314974

BoardConfig.mk

+5 −0
Original line number Diff line number Diff line
@@ -201,6 +201,11 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 
TARGET_USES_MEDIA_EXTENSIONS := true

TARGET_MOUNT_POINTS_SYMLINKS := false



# Power

BOARD_POWER_CUSTOM_BOARD_LIB := libpower_8953

TARGET_HAS_NO_WLAN_STATS := true

TARGET_USES_INTERACTION_BOOST := true



# DRM

TARGET_ENABLE_MEDIADRM_64 := true

configs/perf/perf-profile0.conf

0 → 100644
+2 −0
Original line number Diff line number Diff line 
[priority] # This profile is reserved for perflock requests

99

configs/powerhint.xml

+93 −67
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


<!--

/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020, The eOS Project.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -29,71 +30,96 @@ 
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-->



<HintConfigs>

    <Powerhint>

    <Hint type="0x0E00"> <!--preview-->

        <Resource opcode="0x41400000" value="0x4"  />   <!-- B CPU - above_hispeed_delay of 40 ms -->

        <Resource opcode="0x41410000" value="0x5F" />   <!-- B CPU - go hispeed load 95 -->

        <Resource opcode="0x41414000" value="0x22C"/>   <!-- B CPU - hispeed freq of 556 MHz -->

        <Resource opcode="0x41420000" value="0x5A" />   <!-- B CPU - target load of 90 -->

        <Resource opcode="0x41400100" value="0x4"  />   <!-- L CPU - above_hispeed_delay of 40 ms -->

        <Resource opcode="0x41410100" value="0x5F" />   <!-- L CPU - go hispeed load 95 -->

        <Resource opcode="0x41414100" value="0x22C"/>   <!-- L CPU - hispeed freq of 556 MHz- -->

        <Resource opcode="0x41420100" value="0x5A" />   <!-- L CPU - target load of 90 -->

        <Resource opcode="0x41810000" value="0x9C4"/>   <!-- CPUBW low power ceil mpbs of 2500 -->

        <Resource opcode="0x41814000" value="0x32" />   <!-- CPUBW low power io percent of 50 -->

    </Hint>

    <Hint type="0x0A00"> <!--video encode 30 fps-->

        <Resource opcode="0x41400000" value="0x4"  />   <!-- B CPU - above_hispeed_delay of 40 ms -->

        <Resource opcode="0x41410000" value="0x5F" />   <!-- B CPU - go hispeed load 95 -->

        <Resource opcode="0x41414000" value="0x326"/>   <!-- B CPU - hispeed freq of 806 MHz -->

        <Resource opcode="0x41420000" value="0x5A" />   <!-- B CPU - target load of 90 -->

        <Resource opcode="0x41400100" value="0x4"  />   <!-- L CPU - above_hispeed_delay of 40 ms -->

        <Resource opcode="0x41410100" value="0x5F" />   <!-- L CPU - go hispeed load 95 -->

        <Resource opcode="0x41414100" value="0x22C"/>   <!-- L CPU - hispeed freq of 556 MHz- -->

        <Resource opcode="0x41420100" value="0x5A" />   <!-- L CPU - target load of 90 -->

        <Resource opcode="0x41810000" value="0x9C4"/>   <!-- CPUBW low power ceil mpbs of 2500 -->

        <Resource opcode="0x41814000" value="0x32" />   <!-- CPUBW low power io percent of 50 -->

        <Resource opcode="0x4180C000" value="0x0"  />   <!-- CPUBW disable hysteresis -->

        <Resource opcode="0x41820000" value="0xA"  />   <!-- CPUBW sample_ms of 10ms -->

        <Resource opcode="0x41438100" value="0x0"  />   <!-- L CPU - disable ignore_hispeed_notif -->

        <Resource opcode="0x41438000" value="0x0"  />   <!-- B CPU - disable ignore_hispeed_notif -->

    </Hint>

    <Hint type="0x0B00"> <!--video decode-->

        <Resource opcode="0x41400100" value="0x4"  />   <!-- L CPU - Above Hispeed Delay of 40ms -->

        <Resource opcode="0x41410100" value="0x5F" />   <!-- L CPU - Go Hispeed Delay of 95 -->

        <Resource opcode="0x41414100" value="0x2D9"/>   <!-- L CPU - Hispeed Freq of 768 MHz -->

        <Resource opcode="0x41420100" value="0x5A" />   <!-- L CPU - Target Loads of 90 -->

        <Resource opcode="0x41400000" value="0x4"  />   <!-- B CPU - Above Hispeed Delay of 40ms -->

        <Resource opcode="0x41410000" value="0x5F" />   <!-- B CPU - Go Hispeed Load of 95 -->

        <Resource opcode="0x41414000" value="0x2D9"/>   <!-- B CPU - Hispeed Freq of 729 MHz -->

        <Resource opcode="0x41420000" value="0x5A" />   <!-- B CPU - Target Load of 90 -->

    </Hint>

	<Hint type="0x0F00"> <!--sustained performance-->

        <Resource opcode="0x40800000" value="0x0"/>     <!-- B CPU - Cluster min freq uncapped -->

        <Resource opcode="0x40800100" value="0x0"/>     <!-- L CPU - Cluster min freq uncapped -->

        <Resource opcode="0x40804000" value="0x4E0"/>   <!-- B CPU - Cluster max freq ~1.2 GHz -->

        <Resource opcode="0x40804100" value="0x4E0"/>   <!-- L CPU - Cluster max freq ~1.2 Ghz -->

        <Resource opcode="0x4280C000" value="0xB4"/>    <!-- GPU - min freq 180 Mhz -->

        <Resource opcode="0x42810000" value="0x156"/>   <!-- GPU - max freq 342 Mhz -->

        <Resource opcode="0x42814000" value="0x0"/>     <!-- GPUBW freq uncapped -->

    </Hint>

	<Hint type="0x1000"> <!--vr mode-->

        <Resource opcode="0x40800000" value="0x579"/>   <!-- B CPU - Cluster min freq ~1.4 Ghz -->

        <Resource opcode="0x40800100" value="0x579"/>   <!-- L CPU - Cluster min freq ~1.4 Ghz -->

        <Resource opcode="0x40804000" value="0x579"/>   <!-- B CPU - Cluster max freq ~1.4 Ghz -->

        <Resource opcode="0x40804100" value="0x579"/>   <!-- L CPU - Cluster max freq ~1.4 Ghz -->

        <Resource opcode="0x4280C000" value="0x203"/>   <!-- GPU - min freq 510 Mhz -->

        <Resource opcode="0x42810000" value="0x203"/>   <!-- GPU - max freq 510 Mhz -->

        <Resource opcode="0x42814000" value="0x1E4F"/>  <!-- GPUBW freq 775 Mhz-->

    </Hint>

	<Hint type="0x1001"> <!--vr mode sustained performance-->

        <Resource opcode="0x40800000" value="0x4E0"/>   <!-- B CPU - Cluster min freq ~1.2 Ghz -->

        <Resource opcode="0x40800100" value="0x4E0"/>   <!-- L CPU - Cluster min freq ~1.2 Ghz -->

        <Resource opcode="0x40804000" value="0x4E0"/>   <!-- B CPU - Cluster max freq ~1.2 Ghz -->

        <Resource opcode="0x40804100" value="0x4E0"/>   <!-- L CPU - Cluster max freq ~1.2 Ghz -->

        <Resource opcode="0x4280C000" value="0x156"/>   <!-- GPU - min freq 342 Mhz -->

        <Resource opcode="0x42810000" value="0x156"/>   <!-- GPU - max freq 342 Mhz -->

        <Resource opcode="0x42814000" value="0x1E4F"/>  <!-- GPUBW freq 775 Mhz -->

    </Hint>

        <!--preview-->

        <!-- B CPU - above_hispeed_delay of 40 ms -->

        <!-- B CPU - go hispeed load 95 -->

        <!-- B CPU - hispeed freq of 556 MHz -->

        <!-- B CPU - target load of 90 -->

        <!-- L CPU - above_hispeed_delay of 40 ms -->

        <!-- L CPU - go hispeed load 95 -->

        <!-- L CPU - hispeed freq of 556 MHz- -->

        <!-- L CPU - target load of 90 -->

        <!-- CPUBW low power ceil mpbs of 2500 -->

        <!-- CPUBW low power io percent of 50 -->

        <Config

            Id="0x00001300" Enable="true" Target="msm8953"

            Resources="0x41400000, 0x4, 0x41410000, 0x5F, 0x41414000, 0x22C, 0x41420000, 0x5A, 0x41400100, 0x4, 0x41410100, 0x5F

            , 0x41414100, 0x22C, 0x41420100, 0x5A, 0x41810000, 0x9C4, 0x41814000, 0x32" />



        <!--video encode 30 fps-->

        <!-- B CPU - above_hispeed_delay of 40 ms -->

        <!-- B CPU - go hispeed load 95 -->

        <!-- B CPU - hispeed freq of 806 MHz -->

        <!-- B CPU - target load of 90 -->

        <!-- L CPU - above_hispeed_delay of 40 ms -->

        <!-- L CPU - go hispeed load 95 -->

        <!-- L CPU - hispeed freq of 556 MHz- -->

        <!-- L CPU - target load of 90 -->

        <!-- CPUBW low power ceil mpbs of 2500 -->

        <!-- CPUBW low power io percent of 50 -->

        <!-- CPUBW disable hysteresis -->

        <!-- CPUBW sample_ms of 10ms -->

        <!-- L CPU - disable ignore_hispeed_notif -->

        <!-- B CPU - disable ignore_hispeed_notif -->

        <Config

            Id="0x00001203" Enable="true" Target="msm8953"

            Resources="0x41400000, 0x4, 0x41410000, 0x5F ,0x41414000, 0x326, 0x41420000, 0x5A, 0x41400100, 0x4, 0x41410100

            , 0x5F, 0x41414100, 0x22C, 0x41420100, 0x5A, 0x41810000 ,0x9C4, 0x41814000,

            0x32, 0x4180C000 ,0x0, 0x41820000, 0xA, 0x41438100, 0x0, 0x41438000, 0x0" />



        <!--video decode-->

        <!-- L CPU - above_hispeed_delay of 40 ms -->

        <!-- L CPU - go hispeed load 95 -->

        <!-- L CPU - hispeed freq of 768 MHz- -->

        <!-- L CPU - target load of 90 -->

        <!-- B CPU - above_hispeed_delay of 40 ms -->

        <!-- B CPU - go hispeed load 95 -->

        <!-- B CPU - hispeed freq of 729 MHz -->

        <!-- B CPU - target load of 90 -->

        <Config

            Id="0x00001204" Enable="true" Target="msm8953"

            Resources="0x41400100, 0x4, 0x41410100, 0x5F ,0x41414100, 0x2D9, 0x41420100, 0x5A, 0x41400000, 0x4, 0x41410000

            , 0x5F, 0x41414000, 0x2D9, 0x41420000, 0x5A" />



        <!--sustained performance-->

        <!-- B CPU - Cluster min freq uncapped -->

        <!-- L CPU - Cluster min freq uncapped -->

        <!-- B CPU - Cluster max freq ~1.2 GHz -->

        <!-- L CPU - Cluster max freq ~1.2 Ghz -->

        <!-- GPU - min freq 180 Mhz -->

        <!-- GPU - max freq 342 Mhz -->

        <!-- GPUBW freq uncapped -->

        <Config

            Id="0x00001206" Enable="true" Target="msm8953"

            Resources="0x40800000, 0x0, 0x40800100, 0x0, 0x40804000, 0x4E0, 0x40804100, 0x4E0,

            0x4280C000, 0xB4, 0x42810000, 0x156, 0x42814000, 0x0"/>



        <!--vr mode-->

        <!-- B CPU - Cluster min freq ~1.4 Ghz -->

        <!-- L CPU - Cluster min freq ~1.4 Ghz -->

        <!-- B CPU - Cluster max freq ~1.4 Ghz -->

        <!-- L CPU - Cluster max freq ~1.4 Ghz -->

        <!-- GPU - min freq 510 Mhz -->

        <!-- GPU - max freq 510 Mhz -->

        <!-- GPUBW freq 775 Mhz-->

        <Config

            Id="0x00001207" Enable="true" Target="msm8953"

            Resources="0x40800000, 0x579, 0x40800100, 0x579, 0x40804000, 0x579, 0x40804100, 0x579,

            0x4280C000, 0x203, 0x42810000, 0x203, 0x42814000, 0x1E4F"/>



        <!--vr mode sustained performance-->

        <!-- B CPU - Cluster min freq ~1.2 Ghz -->

        <!-- L CPU - Cluster min freq ~1.2 Ghz -->

        <!-- B CPU - Cluster max freq ~1.2 Ghz -->

        <!-- L CPU - Cluster max freq ~1.2 Ghz -->

        <!-- GPU - min freq 342 Mhz -->

        <!-- GPU - max freq 342 Mhz -->

        <!-- GPUBW freq 775 Mhz -->

        <Config

            Id="0x00001301" Enable="true" Target="msm8953"

            Resources="0x40800000, 0x4E0, 0x40800100, 0x4E0, 0x40804000, 0x4E0, 0x40804100, 0x4E0, 0x4280C000, 0x156,

            0x42810000, 0x156, 0x42814000, 0x1E4F"/>

    </Powerhint>

</HintConfigs>

device.mk

+3 −2
Original line number Diff line number Diff line
@@ -339,9 +339,10 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

	$(LOCAL_PATH)/rootdir/bin/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh



# Powerhint configuration file

# Perf

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/configs/powerhint.xml:system/etc/powerhint.xml

    $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \

    $(LOCAL_PATH)/configs/perf/perf-profile0.conf:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perf-profile0.conf



# Enable vndk-sp Libraries

PRODUCT_PACKAGES += \

lineage_FP3.mk

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ PRODUCT_GMS_CLIENTID_BASE := android-uniscope 
# userdebug

PRODUCT_BUILD_PROP_OVERRIDES += \

        PRODUCT_NAME=FP3 \

        PRIVATE_BUILD_DESC="FP3-userdebug 9 8901.2.A.0111-SS.20200304 03042332 release-keys"

        PRIVATE_BUILD_DESC="FP3-user 9 8901.2.A.0120.20200421 04211500 release-keys"



# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop

BUILD_FINGERPRINT := Fairphone/FP3/FP3:9/8901.2.A.0111-SS.20200304/03042332:userdebug/release-keys
 
BUILD_FINGERPRINT := Fairphone/FP3/FP3:9/8901.2.A.0120.20200421/04211500:user/release-keys