diff options
| author | Guilherme Gallo <guilherme.gallo@collabora.com> | 2021-10-13 13:25:08 -0300 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-10 21:57:58 +0000 |
| commit | 3ca9c9c2d9d70d9e67ef9c584155dfc516194175 (patch) | |
| tree | af895cdf0e418c86bd8a44d5760afa29a6f34f05 /.gitlab-ci | |
| parent | 4ed9a049a1e6af7603733e0cd1936b4734247934 (diff) | |
ci: Update linux kernel to v5.15
* Update Kconfig for x86_64 and ARM64. Follow the dependency tree of the
kernel modules to make sure that the intended configurations are being
set. Check scripts/merge_config.sh output as well to see if there is
a requested Kconfig not being considered.
For a630 devices:
* Use kernel version with a6xx workaround for frequency scaling
* Enable CONFIG_QCOM_LMH targeting a630 slowness on new kernel
---- Out of tree patches used ----
For a360 device:
* Revert a commit which remove slpi_region from msm8996:
8b0031f8bda2 ("Revert "arm64: msm8996: fix memory region overlap"")
Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13089>
(cherry picked from commit 7fea3c6f14e96de7d611a154db601f9a6dc0df79)
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/arm64.config | 12 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_64.config | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config index 488106ca95b..bc88f42352e 100644 --- a/.gitlab-ci/container/arm64.config +++ b/.gitlab-ci/container/arm64.config @@ -16,7 +16,6 @@ CONFIG_DRM_LIMA=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_MSM=y CONFIG_DRM_I2C_ADV7511=y -CONFIG_DRM_I2C_ADV7533=y CONFIG_PWM_CROS_EC=y CONFIG_BACKLIGHT_PWM=y @@ -32,6 +31,10 @@ CONFIG_TYPEC=y CONFIG_TYPEC_TCPM=y # MSM platform bits + +# For CONFIG_QCOM_LMH +CONFIG_OF=y + CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMPD=y CONFIG_SDM_GPUCC_845=y @@ -45,9 +48,11 @@ CONFIG_I2C_QCOM_GENI=y CONFIG_SPI_QCOM_GENI=y CONFIG_PHY_QCOM_QUSB2=y CONFIG_PHY_QCOM_QMP=y +CONFIG_QCOM_CLK_APCC_MSM8996=y CONFIG_QCOM_LLCC=y +CONFIG_QCOM_LMH=y CONFIG_QCOM_SPMI_TEMP_ALARM=y -CONFIG_QCOM_CLK_APCC_MSM8996=y +CONFIG_QCOM_WDT=y CONFIG_POWER_RESET_QCOM_PON=y CONFIG_RTC_DRV_PM8XXX=y CONFIG_INTERCONNECT=y @@ -56,7 +61,6 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_MSM8916=y CONFIG_INTERCONNECT_QCOM_OSM_L3=y CONFIG_INTERCONNECT_QCOM_SC7180=y -CONFIG_QCOM_WDT=y CONFIG_CRYPTO_DEV_QCOM_RNG=y # db410c ethernet @@ -142,7 +146,9 @@ CONFIG_DRM_MESON=y CONFIG_DRM_MEDIATEK=y CONFIG_PWM_MEDIATEK=y CONFIG_DRM_MEDIATEK_HDMI=y +CONFIG_GNSS=y CONFIG_GNSS_MTK_SERIAL=y +CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MTK=y CONFIG_MTK_DEVAPC=y CONFIG_PWM_MTK_DISP=y diff --git a/.gitlab-ci/container/x86_64.config b/.gitlab-ci/container/x86_64.config index 5717f7d7fe3..1859540fbf1 100644 --- a/.gitlab-ci/container/x86_64.config +++ b/.gitlab-ci/container/x86_64.config @@ -1,6 +1,11 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_DEBUG_KERNEL=y +CONFIG_PWM=y +CONFIG_PM_DEVFREQ=y +CONFIG_OF=y +CONFIG_CROS_EC=y + # abootimg with a 'dummy' rootfs fails with root=/dev/nfs CONFIG_BLK_DEV_INITRD=n @@ -57,7 +62,7 @@ CONFIG_X86_AMD_FREQ_SENSITIVITY=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AMD=y CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMDGPU_SI=m +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_ACP=n CONFIG_ACPI_WMI=y |