From 42e4e4e13758ca1f42dc2bb7a91c7b5150fcd11a Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 29 Jan 2021 22:44:49 +0100 Subject: [PATCH] linux5.10: enable amdgpu dcn30 (rx 6xxx series) on ppc64 --- srcpkgs/linux5.10/files/ppc64-dotconfig | 4 +- srcpkgs/linux5.10/files/ppc64le-dotconfig | 19 ++------ .../patches/amdgpu-dcn30-ppc64.patch | 46 +++++++++++++++++++ 3 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig index 4299f42e17c..4579421aac2 100644 --- a/srcpkgs/linux5.10/files/ppc64-dotconfig +++ b/srcpkgs/linux5.10/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.10.10 Kernel Configuration +# Linux/powerpc 5.10.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -6032,6 +6032,7 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y +CONFIG_DRM_AMD_DC_DCN3_0=y # CONFIG_DRM_AMD_DC_HDCP is not set CONFIG_DRM_AMD_DC_SI=y # end of Display Engine Configuration @@ -7197,7 +7198,6 @@ CONFIG_USB_BDC_UDC=m # # Platform Support # -CONFIG_USB_BDC_PCI=m CONFIG_USB_AMD5536UDC=m CONFIG_USB_NET2272=m # CONFIG_USB_NET2272_DMA is not set diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig index 1397fe1b776..08459346e24 100644 --- a/srcpkgs/linux5.10/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig @@ -1,11 +1,11 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.10.1 Kernel Configuration +# Linux/powerpc 5.10.11 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 9.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90300 -CONFIG_LD_VERSION=232000000 +CONFIG_GCC_VERSION=100201 +CONFIG_LD_VERSION=235010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y @@ -4202,7 +4202,6 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_CDEV_V1=y CONFIG_GPIO_GENERIC=y -CONFIG_GPIO_REGMAP=m CONFIG_GPIO_MAX730X=m # @@ -4261,7 +4260,6 @@ CONFIG_GPIO_MAX77620=m CONFIG_GPIO_MAX77650=m CONFIG_GPIO_PALMAS=y CONFIG_GPIO_RC5T583=y -CONFIG_GPIO_SL28CPLD=m CONFIG_GPIO_STMPE=y CONFIG_GPIO_TC3589X=y CONFIG_GPIO_TPS65086=m @@ -4545,7 +4543,6 @@ CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_XDPE122=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_PWM_FAN=m -CONFIG_SENSORS_SL28CPLD=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SHT3x=m @@ -4638,7 +4635,6 @@ CONFIG_WM831X_WATCHDOG=m # CONFIG_WM8350_WATCHDOG is not set CONFIG_XILINX_WATCHDOG=m CONFIG_ZIIRAVE_WATCHDOG=m -CONFIG_SL28CPLD_WATCHDOG=m CONFIG_CADENCE_WATCHDOG=m CONFIG_DW_WATCHDOG=m CONFIG_RN5T618_WATCHDOG=m @@ -4763,8 +4759,6 @@ CONFIG_MFD_RK808=m CONFIG_MFD_RN5T618=m # CONFIG_MFD_SEC_CORE is not set CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SIMPLE_MFD_I2C=m -CONFIG_MFD_SL28CPLD=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SKY81452=m @@ -5838,6 +5832,7 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y +CONFIG_DRM_AMD_DC_DCN3_0=y # CONFIG_DRM_AMD_DC_HDCP is not set CONFIG_DRM_AMD_DC_SI=y # end of Display Engine Configuration @@ -6893,7 +6888,6 @@ CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m CONFIG_APPLE_MFI_FASTCHARGE=m CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m @@ -6949,7 +6943,6 @@ CONFIG_USB_BDC_UDC=m # # Platform Support # -CONFIG_USB_BDC_PCI=m CONFIG_USB_AMD5536UDC=m CONFIG_USB_NET2272=m # CONFIG_USB_NET2272_DMA is not set @@ -8503,7 +8496,6 @@ CONFIG_PWM_FSL_FTM=m CONFIG_PWM_IQS620A=m CONFIG_PWM_LP3943=m CONFIG_PWM_PCA9685=m -CONFIG_PWM_SL28CPLD=m CONFIG_PWM_STMPE=y # CONFIG_PWM_TWL is not set # CONFIG_PWM_TWL_LED is not set @@ -9418,7 +9410,6 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y -CONFIG_DMA_VIRT_OPS=y CONFIG_SWIOTLB=y # CONFIG_DMA_API_DEBUG is not set CONFIG_SGL_ALLOC=y diff --git a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch new file mode 100644 index 00000000000..a72cdfea781 --- /dev/null +++ b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch @@ -0,0 +1,46 @@ +From 3a75ebe236580073d77ad69730fc1d8980e130c2 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Fri, 29 Jan 2021 22:25:29 +0100 +Subject: [PATCH] amd/display: enable dcn30 for ppc64 + +--- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig +index 3c410d2..a749cc7 100644 +--- a/drivers/gpu/drm/amd/display/Kconfig ++++ b/drivers/gpu/drm/amd/display/Kconfig +@@ -19,7 +19,7 @@ config DRM_AMD_DC_DCN + + config DRM_AMD_DC_DCN3_0 + bool "DCN 3.0 family" +- depends on DRM_AMD_DC && X86 ++ depends on DRM_AMD_DC + depends on DRM_AMD_DC_DCN + help + Choose this option if you want to have +diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile +index bd2a068..248c271 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile ++++ b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile +@@ -52,6 +52,7 @@ IS_OLD_GCC = 1 + endif + endif + ++ifdef CONFIG_X86 + ifdef IS_OLD_GCC + # Stack alignment mismatch, proceed with caution. + # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 +@@ -62,6 +63,7 @@ else + CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -msse2 + CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -msse2 + endif ++endif + + AMD_DAL_DCN30 = $(addprefix $(AMDDALPATH)/dc/dcn30/,$(DCN30)) + +-- +2.30.0 +