ti-sgx-j721e-ddx-um (1.15.6133109-k5.10-git20220510.0)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

ti-sgx-j721e-ddx-um/extract.sh

+#!/bin/bash -e
+
+if [ -d ./ignore ] ; then
+	rm -rf ./ignore || true
+fi
+
+if [ ! -d ./files ] ; then
+	mkdir -p files
+fi
+
+mkdir -p ./ignore
+
+cd ./ignore/
+ar xv ../ti-img-rogue-umlibs_1.15.6133109-r2.0_j7_evm.ipk
+tar xf data.tar.xz
+#cp usr/share/ti/ti-opencl-tidl-fw-tree/eve_firmware.bin ../files/eve_firmware.bin
+#cp usr/share/ti/ti-opencl-tidl-fw-tree/ocl_tidl_dsp.lib ../files/ocl_tidl_dsp.lib
+#ls -lha ./usr/share/ti/ti-opencl-tidl-fw-tree/
+#cd ../
+#rm -rf ./ignore || true
+

ti-sgx-j721e-ddx-um/suite/bullseye/debian/99-pvr.rules

+# Rules for PowerVR device nodes
+KERNEL=="pvr_sync", SUBSYSTEM=="misc", MODE="0660", OWNER="root", GROUP="video"

ti-sgx-j721e-ddx-um/suite/bullseye/debian/changelog

-ti-sgx-j721e-ddx-um (1.13.5776728-k5.10-git20220126.0-0~bullseye+20220126) bullseye; urgency=low
+ti-sgx-j721e-ddx-um (1.15.6133109-k5.10-git20220510.0-0~bullseye+20220708) bullseye; urgency=low
 
   * Rebuild for repos.rcn-ee.com
 
- -- Robert Nelson <robertcnelson@gmail.com>  Wed, 26 Jan 2022 14:27:33 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 08 Jul 2022 11:33:27 -0500
 

ti-sgx-j721e-ddx-um/suite/bullseye/debian/control

@@ -2,15 +2,17 @@ Source: ti-sgx-j721e-ddx-um
 Section: misc
 Priority: optional
 Maintainer: Robert Nelson <robertcnelson@gmail.com>
-Build-Depends: debhelper (>= 9),
-         libdrm-dev,
-         libwayland-dev,
+Build-Depends:
+ debhelper (>= 9)
+ , libdrm-dev
+ , libwayland-dev
 Standards-Version: 4.5.0
 Homepage: https://git.ti.com/gitweb?p=graphics/ti-img-rogue-umlibs.git;a=summary
 
 Package: ti-sgx-j721e-ddx-um
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ ${shlibs:Depends}
+ , ${misc:Depends}
 Architecture: arm64
 Description: Userspace libraries for SGX
  Userspace libraries for SGX

ti-sgx-j721e-ddx-um/suite/bullseye/debian/install

+debian/99-pvr.rules etc/udev/rules.d/
 tmp/usr/lib/* usr/lib
 tmp/usr/bin/* usr/bin
 tmp/lib/firmware/* lib/firmware

ti-sgx-j721e-ddx-um/suite/bullseye/debian/ti-sgx-j721e-ddx-um.init

-#! /bin/sh -e
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          ti-sgx-j721e-ddx-um.init
@@ -40,14 +40,21 @@ fi
 # THE SOFTWARE.
 #### ###########################################################################
 
-# Auto-generated for j721e_linux from rogueddk_1.10@5371573
+# Auto-generated for j721e_linux from rogueddk_1.15@6133109
 #
 
 load_pvr()
 {
+	load_modules_exit_status=0
+
 	# Load the PVR Services module.
-	#	
-	if ! /sbin/modprobe -q pvrsrvkm $PVR_SRVKM_PARAMS; then
+	#
+	
+	if [ -n "$PVR_SRVKM_PARAMS" ] && ! /sbin/modprobe -q pvrsrvkm --dry-run --first-time; then
+		echo "Cannot set parameters for pvrsrvkm. Module already loaded."
+		some_modules_already_loaded=1
+		readonly load_modules_exit_status=1
+	elif ! /sbin/modprobe -q pvrsrvkm $PVR_SRVKM_PARAMS; then
 		echo "Module pvrsrvkm failed to load. Retrying."
 		if [ -z $depmod_has_been_run ]; then
 			if [ -e /sbin/depmod ]; then
@@ -64,15 +71,110 @@ load_pvr()
 		/sbin/udevadm control --reload-rules
 	fi
 
-	
 	# Load 3rd party module(s).
 	#
-			echo "Loaded PowerVR consumer services."
-	return 0;
+		
+	if [ -z "$PVR_LOAD_MODULES_ONLY" ]; then
+		# Create the directory for the Wayland socket.
+		#
+		if [ -z "$XDG_RUNTIME_DIR" ]; then
+			export XDG_RUNTIME_DIR=/tmp/wayland
+		fi
+		if [ ! -e $XDG_RUNTIME_DIR ]; then
+			mkdir $XDG_RUNTIME_DIR && chmod 0700 $XDG_RUNTIME_DIR
+		fi
+
+		# If PDumping, enable software rendering for Weston to ensure that
+		# pdump doesn't capture any output from Weston itself.
+		#
+		if pgrep -x pdump > /dev/null 2>&1; then
+				export GBM_ALWAYS_SOFTWARE=1
+				export LIBGL_ALWAYS_SOFTWARE=1
+		fi
+
+		# Try to work out the device node for the display controller.
+		#
+		for dev in /dev/dri/card*; do
+			dev_major=$(($(stat -c '0x%t' "$dev")))
+			dev_minor=$(($(stat -c '0x%T' "$dev")))
+			sys_path=$(readlink -f /sys/dev/char/$dev_major\:$dev_minor)
+
+			while [ -e "$sys_path" -a "$sys_path" != "/sys" ]; do
+				if [ ! -e "${sys_path}/driver" ]; then
+					sys_path="$(dirname "$sys_path")"
+					continue
+				fi
+
+				module="$(basename "$(readlink -f "$sys_path/driver/module")")"
+				if [ "$module" = "DISPLAY_CONTROLLER" ]; then
+					drm_card="$(basename "$dev")"
+				fi
+				break
+			done
+
+			if [ -n "$drm_card" ]; then
+				break
+			fi
+		done
+
+		if [ -e "${XDG_RUNTIME_DIR}/weston.pgid" ]; then
+			echo "Weston is already running. If this is not the case run:"
+			echo "$ sudo rm ${XDG_RUNTIME_DIR}/weston.pgid"
+			echo
+		else
+			# Get a TTY for Weston to use.
+			#
+			if [ -x "$(which openvt)" ] && [ -e "/sys/class/tty/tty0/active" ]; then
+				openvt -s -l && read unused_tty < /sys/class/tty/tty0/active
+			fi
+
+			# Launch Weston.
+			#
+			if [ -n "$drm_card" ]; then
+				if [ -n "$unused_tty" ]; then
+					ps -p $$ -o pgid= > "${XDG_RUNTIME_DIR}/weston.pgid"
+					/usr/bin/weston --backend=drm-backend.so --drm-device="$drm_card" --tty="${unused_tty//[!0-9]}" --idle-time=0  &
+				else
+					last_tty_path="$(ls /dev/tty[1-9][0-9] | sort -V |tail -n 1)"
+
+					echo "To start Weston run (specifying a tty within the given range):"
+					echo "$ sudo /usr/bin/weston --backend=drm-backend.so --drm-device=$drm_card --tty=<8..${last_tty_path//[!0-9]}> --idle-time=0 &"
+					echo
+				fi
+			else
+				echo "Couldn't start Weston automatically."
+			fi
+		fi
+	fi
+
+	if [ -n "$some_modules_already_loaded" ]; then
+		echo
+		echo "Could not set parameters for some modules."
+		echo "To fix this ensure automatic loading of those modules is disabled and restart the driver."
+		echo "See the platform guide for more details."
+	else
+		echo "Loaded PowerVR consumer services."
+	fi
+
+	return $load_modules_exit_status;
 }
 
 unload_pvr()
 {
+	if [ -z "$XDG_RUNTIME_DIR" ]; then
+		XDG_RUNTIME_DIR=/tmp/wayland
+	fi
+
+	# Stop Weston.
+	#
+	if [ -f "${XDG_RUNTIME_DIR}/weston.pgid" ]; then
+		read WESTON_PGID < "${XDG_RUNTIME_DIR}/weston.pgid" && [ -n "$WESTON_PGID" ] && WESTON_PID=$(pgrep -g $WESTON_PGID -x weston) && [ -n "$WESTON_PID" ] && kill $WESTON_PID && while [ -e /proc/$WESTON_PID ] ; do sleep 1; done
+		rm "${XDG_RUNTIME_DIR}/weston.pgid"
+	elif pgrep -x weston > /dev/null; then
+		echo "Warning: Found one of more instances of Weston running."
+		echo "         This may prevent the driver from being unloaded."
+	fi
+
 	# Unload 3rd party module(s).
 	#
 		

ti-sgx-j721e-ddx-um/version.sh

@@ -4,12 +4,12 @@
 
 package_name="ti-sgx-j721e-ddx-um"
 debian_pkg_name="${package_name}"
-package_version="1.13.5776728-k5.10-git20220126.0"
+package_version="1.15.6133109-k5.10-git20220510.0"
 package_source="${package_name}_${package_version}.orig.tar.xz"
 src_dir="${package_name}_${package_version}"
 
-git_repo="git://git.ti.com/graphics/ti-img-rogue-umlibs.git"
-git_sha="258add91efa402d3647302165373c6a8d1b7201d"
+git_repo="https://git.ti.com/git/graphics/ti-img-rogue-umlibs.git"
+git_sha="fba0c770b712640ab3761dbe8369d43f89f616ed"
 reprepro_dir="t/${package_name}"
 dl_path=""
 
@@ -19,4 +19,4 @@ debian_diff=""
 
 clear_changelog="enable"
 
-bullseye_version="~bullseye+20220126"
+bullseye_version="~bullseye+20220708"