Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Pavel nadlabak authored
15 prebuilt/bin/init_pvr.sh
... ... @@ -1,15 +0,0 @@
1   -#!/system/bin/sh
2   -#
3   -export PATH=/system/bin:/system/xbin:$PATH
4   -
5   -insmod /system/lib/modules/pvrsrvkm15.ko
6   -until rmmod pvrsrvkm15; do
7   - sleep 1
8   - log "Retrying pvrsrvkm 1.5 unload"
9   -done
10   -insmod /system/lib/modules/pvrsrvkm.ko
11   -insmod /system/lib/modules/omaplfb.ko
12   -sleep 1
13   -chmod 0666 /dev/pvrsrvkm
14   -chown system graphics /dev/pvrsrvkm
15   -pvrsrvinit
BIN  prebuilt/lib/modules/omaplfb.ko
Binary file not shown
BIN  prebuilt/lib/modules/pvrsrvkm.ko
Binary file not shown
BIN  prebuilt/lib/modules/pvrsrvkm15.ko
Binary file not shown
14 rootfs/init.mapphone_umts.rc
@@ -94,8 +94,9 @@ setprop ro.sys.atvc_allow_efem 0
94 94 insmod /system/lib/modules/modem_pm_driver.ko
95 95 insmod /system/lib/modules/sec.ko
96 96
97   -# Initialize SGX PVR gpu
98   - exec /system/bin/init_pvr.sh
  97 +# Install GPU kernel modules
  98 + insmod /system/lib/modules/pvrsrvkm.ko
  99 + insmod /system/lib/modules/omaplfb.ko
99 100
100 101 on early-boot
101 102
@@ -254,6 +255,10 @@ mount rootfs rootfs / ro remount
254 255 # Change ownership of vibrator
255 256 chmod 0660 /sys/class/timed_output/vibrator/enable
256 257
  258 +# Permissions for 3D
  259 + chmod 0666 /dev/pvrsrvkm
  260 + chown system graphics /dev/pvrsrvkm
  261 +
257 262 # DSS - disable tearing elimination
258 263 write /sys/devices/omapdss/display0/tear_elim 0
259 264
@@ -557,6 +562,11 @@ service baseimage /system/bin/dspexec -v -T /system/lib/dsp/baseimage.dof
557 562 class media_early_init
558 563 oneshot
559 564
  565 +service pvrsrv /system/bin/pvrsrvinit
  566 + class post-zygote_services
  567 + user root
  568 + oneshot
  569 +
560 570 service pppd /system/xbin/pppd silent ipparam dun plugin /system/lib/libpppd_plugin.so
561 571 class post-zygote_services
562 572 user root
2  umts_sholes.mk
@@ -147,7 +147,6 @@ PRODUCT_COPY_FILES += \
147 147 device/motorola/umts_sholes/prebuilt/etc/excluded-input-devices.xml:/system/etc/excluded-input-devices.xml \
148 148 device/motorola/umts_sholes/prebuilt/bin/init_prep_keypad.sh:/system/bin/init_prep_keypad.sh \
149 149 device/motorola/umts_sholes/prebuilt/bin/init_bp_nvm.sh:/system/bin/init_bp_nvm.sh \
150   - device/motorola/umts_sholes/prebuilt/bin/init_pvr.sh:/system/bin/init_pvr.sh \
151 150 device/motorola/umts_sholes/prebuilt/bin/init_early_bind_mounts.sh:/system/bin/init_early_bind_mounts.sh \
152 151 device/motorola/umts_sholes/prebuilt/bin/ttsmovetool.sh:/system/bin/ttsmovetool.sh \
153 152 device/motorola/umts_sholes/prebuilt/bin/sh_hijack.sh:/system/bin/sh_hijack.sh \
@@ -175,7 +174,6 @@ PRODUCT_COPY_FILES += \
175 174 device/motorola/umts_sholes/prebuilt/usr/keylayout/sholesp2a-keypad-russian.kl:/system/usr/keylayout/sholesp2a-keypad-russian.kl \
176 175 device/motorola/umts_sholes/prebuilt/lib/libgki.so:/system/lib/libgki.so \
177 176 device/motorola/umts_sholes/prebuilt/lib/modules/pvrsrvkm.ko:/system/lib/modules/pvrsrvkm.ko \
178   - device/motorola/umts_sholes/prebuilt/lib/modules/pvrsrvkm15.ko:/system/lib/modules/pvrsrvkm15.ko \
179 177 device/motorola/umts_sholes/prebuilt/lib/modules/omaplfb.ko:/system/lib/modules/omaplfb.ko \
180 178 device/motorola/umts_sholes/prebuilt/lib/modules/tiwlan_drv.ko:/system/lib/modules/tiwlan_drv.ko \
181 179 device/motorola/umts_sholes/prebuilt/lib/modules/tiap_drv.ko:/system/lib/modules/tiap_drv.ko \

0 comments on commit 15626df

Please sign in to comment.
Something went wrong with that request. Please try again.