workaround pvr init by old module, update kernel

Change-Id: If9185dfe4348020f871b36a38c22b238ef5b1c94
chineseddk · Oct 22, 2012 · 10f0777 · 10f0777
1 parent 814a9a5
commit 10f0777
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/2ndboot/zImage b/2ndboot/zImage
diff --git a/prebuilt/bin/init_pvr.sh b/prebuilt/bin/init_pvr.sh
@@ -0,0 +1,15 @@
+#!/system/bin/sh
+#
+export PATH=/system/bin:/system/xbin:$PATH
+
+insmod /system/lib/modules/pvrsrvkm15.ko
+until rmmod pvrsrvkm15; do
+    sleep 1
+    log "Retrying pvrsrvkm 1.5 unload"
+done
+insmod /system/lib/modules/pvrsrvkm.ko
+insmod /system/lib/modules/omaplfb.ko
+sleep 1
+chmod 0666 /dev/pvrsrvkm
+chown system graphics /dev/pvrsrvkm
+pvrsrvinit
diff --git a/prebuilt/lib/modules/omaplfb.ko b/prebuilt/lib/modules/omaplfb.ko
diff --git a/prebuilt/lib/modules/pvrsrvkm.ko b/prebuilt/lib/modules/pvrsrvkm.ko
diff --git a/prebuilt/lib/modules/pvrsrvkm15.ko b/prebuilt/lib/modules/pvrsrvkm15.ko
diff --git a/rootfs/init.mapphone_umts.rc b/rootfs/init.mapphone_umts.rc
@@ -94,9 +94,8 @@ setprop ro.sys.atvc_allow_efem 0
     insmod /system/lib/modules/modem_pm_driver.ko
     insmod /system/lib/modules/sec.ko
 
-# Install GPU kernel modules
+# Initialize SGX PVR gpu
-    insmod /system/lib/modules/pvrsrvkm.ko
+    exec /system/bin/init_pvr.sh
-    insmod /system/lib/modules/omaplfb.ko
 
 on early-boot
 
@@ -255,10 +254,6 @@ mount rootfs rootfs / ro remount
 # Change ownership of vibrator
    chmod 0660 /sys/class/timed_output/vibrator/enable
 
-# Permissions for 3D
-    chmod 0666 /dev/pvrsrvkm
-    chown system graphics /dev/pvrsrvkm
-
 # DSS - disable tearing elimination
     write /sys/devices/omapdss/display0/tear_elim 0
 
@@ -562,11 +557,6 @@ service baseimage /system/bin/dspexec -v -T /system/lib/dsp/baseimage.dof
     class media_early_init
     oneshot
 
-service pvrsrv /system/bin/pvrsrvinit
-    class post-zygote_services
-    user root
-    oneshot
-
 service pppd /system/xbin/pppd silent ipparam dun plugin /system/lib/libpppd_plugin.so
     class post-zygote_services
     user root

diff --git a/umts_sholes.mk b/umts_sholes.mk
@@ -147,6 +147,7 @@ PRODUCT_COPY_FILES += \
     device/motorola/umts_sholes/prebuilt/etc/excluded-input-devices.xml:/system/etc/excluded-input-devices.xml \
     device/motorola/umts_sholes/prebuilt/bin/init_prep_keypad.sh:/system/bin/init_prep_keypad.sh \
     device/motorola/umts_sholes/prebuilt/bin/init_bp_nvm.sh:/system/bin/init_bp_nvm.sh \
+    device/motorola/umts_sholes/prebuilt/bin/init_pvr.sh:/system/bin/init_pvr.sh \
     device/motorola/umts_sholes/prebuilt/bin/init_early_bind_mounts.sh:/system/bin/init_early_bind_mounts.sh \
     device/motorola/umts_sholes/prebuilt/bin/ttsmovetool.sh:/system/bin/ttsmovetool.sh \
     device/motorola/umts_sholes/prebuilt/bin/sh_hijack.sh:/system/bin/sh_hijack.sh \
@@ -174,6 +175,7 @@ PRODUCT_COPY_FILES += \
     device/motorola/umts_sholes/prebuilt/usr/keylayout/sholesp2a-keypad-russian.kl:/system/usr/keylayout/sholesp2a-keypad-russian.kl \
     device/motorola/umts_sholes/prebuilt/lib/libgki.so:/system/lib/libgki.so \
     device/motorola/umts_sholes/prebuilt/lib/modules/pvrsrvkm.ko:/system/lib/modules/pvrsrvkm.ko \
+    device/motorola/umts_sholes/prebuilt/lib/modules/pvrsrvkm15.ko:/system/lib/modules/pvrsrvkm15.ko \
     device/motorola/umts_sholes/prebuilt/lib/modules/omaplfb.ko:/system/lib/modules/omaplfb.ko \
     device/motorola/umts_sholes/prebuilt/lib/modules/tiwlan_drv.ko:/system/lib/modules/tiwlan_drv.ko \
     device/motorola/umts_sholes/prebuilt/lib/modules/tiap_drv.ko:/system/lib/modules/tiap_drv.ko \