Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "workaround pvr init by old module, update kernel"

This reverts commit 10f0777.

Conflicts:

	2ndboot/zImage

Change-Id: Iaef17a78a9f4f216da19d388f759cc6b3b06fc82
  • Loading branch information...
commit 15626dfafbe3f1be77df8868c69d5ad5d2eecbac 1 parent 7035e77
@nadlabak nadlabak authored
View
15 prebuilt/bin/init_pvr.sh
@@ -1,15 +0,0 @@
-#!/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
View
BIN  prebuilt/lib/modules/omaplfb.ko
Binary file not shown
View
BIN  prebuilt/lib/modules/pvrsrvkm.ko
Binary file not shown
View
BIN  prebuilt/lib/modules/pvrsrvkm15.ko
Binary file not shown
View
14 rootfs/init.mapphone_umts.rc
@@ -94,8 +94,9 @@ setprop ro.sys.atvc_allow_efem 0
insmod /system/lib/modules/modem_pm_driver.ko
insmod /system/lib/modules/sec.ko
-# Initialize SGX PVR gpu
- exec /system/bin/init_pvr.sh
+# Install GPU kernel modules
+ insmod /system/lib/modules/pvrsrvkm.ko
+ insmod /system/lib/modules/omaplfb.ko
on early-boot
@@ -254,6 +255,10 @@ 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
@@ -557,6 +562,11 @@ 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
View
2  umts_sholes.mk
@@ -147,7 +147,6 @@ 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 \
@@ -175,7 +174,6 @@ 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 \
Please sign in to comment.
Something went wrong with that request. Please try again.