src/gallium/drivers/panfrost/ci/arm64.config

@@ -9,6 +9,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
 
 CONFIG_DRM=y
 CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_MESON=y
 CONFIG_DRM_PANFROST=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_PWM_CROS_EC=y
@@ -37,7 +38,6 @@ CONFIG_ARCH_LAYERSCAPE=n
 CONFIG_ARCH_LG1K=n
 CONFIG_ARCH_HISI=n
 CONFIG_ARCH_MEDIATEK=n
-CONFIG_ARCH_MESON=n
 CONFIG_ARCH_MVEBU=n
 CONFIG_ARCH_QCOM=n
 CONFIG_ARCH_SEATTLE=n

src/gallium/drivers/panfrost/ci/debian-install.sh

@@ -120,7 +120,7 @@ rm -rf /battery
 mkdir -p /volt
 cd /volt
 git clone --depth=1 https://github.com/VoltLang/Watt.git
-git clone --depth=1 https://github.com/VoltLang/Volta.git --branch go-go-gadget-armhf
+git clone --depth=1 https://github.com/VoltLang/Volta.git #--branch go-go-gadget-armhf
 git clone --depth=1 https://github.com/Wallbraker/dEQP.git
 battery config --release --lto Volta Watt
 battery build
@@ -135,7 +135,7 @@ apt-get -y remove \*llvm\*
 
 
 ############### Cross-build kernel
-KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-5.2.tar.gz"
+KERNEL_URL="https://github.com/superna9999/linux/archive/amlogic/v5.3/panfrost.tar.gz"
 export ARCH=${KERNEL_ARCH}
 export CROSS_COMPILE="${GCC_ARCH}-"
 

src/gallium/drivers/panfrost/ci/generate_lava.py

@@ -9,6 +9,7 @@ parser.add_argument("--base-artifacts-url")
 parser.add_argument("--arch")
 parser.add_argument("--device-type")
 parser.add_argument("--kernel-image-name")
+parser.add_argument("--boot-method")
 args = parser.parse_args()
 
 env = Environment(loader = FileSystemLoader('.'), trim_blocks=True, lstrip_blocks=True)
@@ -19,5 +20,6 @@ values['base_artifacts_url'] = args.base_artifacts_url
 values['arch'] = args.arch
 values['device_type'] = args.device_type
 values['kernel_image_name'] = args.kernel_image_name
+values['boot_method'] = args.boot_method
 
 print(template.render(values))

src/gallium/drivers/panfrost/ci/gitlab-ci.yml

@@ -16,7 +16,7 @@
 variables:
   UPSTREAM_REPO: mesa/mesa
   DEBIAN_VERSION: testing-slim
-  IMAGE_TAG: "2019-09-02-2"
+  IMAGE_TAG: "2019-09-12-1"
 
 include:
   - project: 'wayland/ci-templates'
@@ -48,7 +48,7 @@ stages:
                   KERNEL_ARCH=${KERNEL_ARCH}
                   VOLT_ARCH=${VOLT_ARCH}
                   DEFCONFIG=${DEFCONFIG}
-                  DEVICE_TREES=${DEVICE_TREES}
+                  DEVICE_TREES="${DEVICE_TREES}"
                   KERNEL_IMAGE_NAME=${KERNEL_IMAGE_NAME}
                   bash src/gallium/drivers/panfrost/ci/debian-install.sh'
 
@@ -71,7 +71,7 @@ container:arm64:
     KERNEL_ARCH: "arm64"
     VOLT_ARCH: "aarch64"
     DEFCONFIG: "arch/arm64/configs/defconfig"
-    DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
+    DEVICE_TREES: "arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
     KERNEL_IMAGE_NAME: "Image"
 
 .build:
@@ -120,6 +120,7 @@ container:arm64:
         --base-artifacts-url $CI_PROJECT_URL/-/jobs/$CI_JOB_ID/artifacts/raw/results
         --device-type ${DEVICE_TYPE}
         --kernel-image-name ${KERNEL_IMAGE_NAME}
+        --boot-method ${BOOT_METHOD}
         > results/lava-deqp.yml
     - cp src/gallium/drivers/panfrost/ci/expected-failures.txt results/.
   artifacts:
@@ -127,7 +128,7 @@ container:arm64:
     paths:
       - results/
 
-build:armhf:
+build:armhf-rk3288-veyron-jaq:
   extends: .build
   needs: ["container:armhf"]
   variables:
@@ -135,8 +136,9 @@ build:armhf:
     GCC_ARCH: "arm-linux-gnueabihf"
     DEVICE_TYPE: "rk3288-veyron-jaq"
     KERNEL_IMAGE_NAME: "zImage"
+    BOOT_METHOD: "depthcharge"
 
-build:arm64:
+build:arm64-rk3399-gru-kevin:
   extends: .build
   needs: ["container:arm64"]
   variables:
@@ -144,6 +146,20 @@ build:arm64:
     GCC_ARCH: "aarch64-linux-gnu"
     DEVICE_TYPE: "rk3399-gru-kevin"
     KERNEL_IMAGE_NAME: "Image"
+    BOOT_METHOD: "depthcharge"
+
+build:arm64-meson-gxm-khadas-vim2:
+  extends: .build
+  only:
+    variables:
+      - $BOARD_TESTS =~ /arm64-meson-gxm-khadas-vim2/
+  needs: ["container:arm64"]
+  variables:
+    DEBIAN_ARCH: "arm64"
+    GCC_ARCH: "aarch64-linux-gnu"
+    DEVICE_TYPE: "meson-gxm-khadas-vim2"
+    KERNEL_IMAGE_NAME: "Image"
+    BOOT_METHOD: "u-boot"
 
 .test:
   stage: test
@@ -167,15 +183,30 @@ build:arm64:
     paths:
       - results/
 
-test:armhf:
+test:armhf-rk3288-veyron-jaq:
   extends: .test
-  needs: ["build:armhf"]
+  tags:
+    - lava-rk3288-veyron-jag
+  allow_failure: true
+  needs: ["build:armhf-rk3288-veyron-jaq"]
+  dependencies:
+    - build:armhf-rk3288-veyron-jaq
+
+test:arm64-rk3399-gru-kevin:
+  extends: .test
+  tags:
+    - lava-rk3399-gru-kevin
+  allow_failure: true
+  needs: ["build:arm64-rk3399-gru-kevin"]
   dependencies:
-    - build:armhf
+    - build:arm64-rk3399-gru-kevin
 
-test:arm64:
+test:arm64-meson-gxm-khadas-vim2:
   extends: .test
-  needs: ["build:arm64"]
+  tags:
+    - lava-meson-gxm-khadas-vim2
+  allow_failure: true
+  needs: ["build:arm64-meson-gxm-khadas-vim2"]
   dependencies:
-    - build:arm64
+    - build:arm64-meson-gxm-khadas-vim2
 

src/gallium/drivers/panfrost/ci/lava-deqp.yml.jinja2

@@ -2,7 +2,7 @@ job_name: panfrost-deqp
 device_type: {{ device_type }}
 timeouts:
   job:
-    minutes: 40
+    minutes: 80
   action:
    minutes: 10
   actions:
@@ -10,6 +10,8 @@ timeouts:
       seconds: 30
 priority: medium
 visibility: public
+tags:
+  - panfrost
 actions:
 - deploy:
     timeout:
@@ -17,6 +19,7 @@ actions:
     to: tftp
     kernel:
       url: {{ base_artifacts_url }}/{{ kernel_image_name }}
+      type: image
     ramdisk:
       url: {{ base_artifacts_url }}/panfrost-rootfs-{{ arch }}.cpio.gz
       compression: gz
@@ -26,7 +29,7 @@ actions:
 - boot:
     timeout:
       minutes: 5
-    method: depthcharge
+    method: {{ boot_method }}
     commands: ramdisk
     prompts:
       - '#'