From 7c074a6c3c0f908f773a45ac00b0bd177ec6f4cd Mon Sep 17 00:00:00 2001 From: Roy Luo Date: Wed, 26 Jun 2024 22:55:52 +0000 Subject: [PATCH 1/2] Use absolute path for udc device Avoid search in /sys/class/udc directory Bug: 339241080 Test: tested on gs201 Flag: EXEMPT bugfix Change-Id: Iad74cae0d6ad6887d79d705dc8478f1b44532503 --- usb/gadget/UsbGadget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index d117b910..cdd1871e 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -74,7 +74,7 @@ constexpr char kProcInterruptsPath[] = "/proc/interrupts"; constexpr char kProcIrqPath[] = "/proc/irq/"; constexpr char kSmpAffinityList[] = "/smp_affinity_list"; #ifndef UDC_PATH -#define UDC_PATH "/sys/class/udc/11210000.dwc3/" +#define UDC_PATH "/sys/devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3/" #endif static MonitorFfs monitorFfs(kGadgetName); From 7136214409ee55c18e6dd5eb8830ffab628c1d6d Mon Sep 17 00:00:00 2001 From: Jeremy Kemp Date: Wed, 22 May 2024 09:59:19 +0100 Subject: [PATCH 2/2] Add Mali OpenCL ICD to PRODUCT_PACKAGES Bug: 324057328 Test: clpeak Change-Id: Ied865d4149569b90b400b876ab29441ea2d09c06 --- device.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 37df4d9b..fe4f9e13 100644 --- a/device.mk +++ b/device.mk @@ -252,9 +252,18 @@ PRODUCT_PACKAGES += \ csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ libGLES_mali \ vulkan.mali \ - libOpenCL \ libgpudataproducer \ +# Install the OpenCL ICD Loader +PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader +PRODUCT_PACKAGES += \ + libOpenCL \ + mali_icd__customer_pixel_opencl-icd_ARM.icd +ifeq ($(DEVICE_IS_64BIT_ONLY),false) +PRODUCT_PACKAGES += \ + mali_icd__customer_pixel_opencl-icd_ARM32.icd +endif + # Mali Configuration Properties # b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2 PRODUCT_VENDOR_PROPERTIES += \