APPLIED: [PATCH][focal/linux-azure-5.11] UBUNTU: [Config] azure-5.11: CONFIG_FB_EFI=y

[Tim Gardner]

Applied to focal/linux-azure-5.11 azure-5.11-next. Thanks.

-rtg

On 1/27/22 9:00 AM, Tim Gardner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1959216
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>   .../abi/5.11.0-1027.30~20.04.1/amd64/azure.modules       | 4 ----
>   .../abi/5.11.0-1027.30~20.04.1/arm64/azure.modules       | 1 -
>   debian.azure-5.11/config/amd64/config.common.amd64       | 3 ---
>   debian.azure-5.11/config/arm64/config.common.arm64       | 3 ---
>   debian.azure-5.11/config/config.common.ubuntu            | 9 +++++----
>   5 files changed, 5 insertions(+), 15 deletions(-)
> 
> diff --git a/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/amd64/azure.modules b/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/amd64/azure.modules
> index fd7713cc2fb9d..6b86e31b0f9be 100644
> --- a/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/amd64/azure.modules
> +++ b/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/amd64/azure.modules
> @@ -281,9 +281,6 @@ ceph
>   cfag12864b
>   cfag12864bfb
>   cfb
> -cfbcopyarea
> -cfbfillrect
> -cfbimgblt
>   cfg80211
>   ch
>   ch_ipsec
> @@ -429,7 +426,6 @@ drivetemp
>   drm
>   drm_kms_helper
>   drm_mipi_dbi
> -drm_panel_orientation_quirks
>   drm_ttm_helper
>   drm_vram_helper
>   ds1621
> diff --git a/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/arm64/azure.modules b/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/arm64/azure.modules
> index 5400f04451796..9ec9ad0bdb157 100644
> --- a/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/arm64/azure.modules
> +++ b/debian.azure-5.11/abi/5.11.0-1027.30~20.04.1/arm64/azure.modules
> @@ -503,7 +503,6 @@ drivetemp
>   drm
>   drm_kms_helper
>   drm_mipi_dbi
> -drm_panel_orientation_quirks
>   drm_ttm_helper
>   drm_vram_helper
>   ds1621
> diff --git a/debian.azure-5.11/config/amd64/config.common.amd64 b/debian.azure-5.11/config/amd64/config.common.amd64
> index c3f6de7405ec9..5d2d052bdbc74 100644
> --- a/debian.azure-5.11/config/amd64/config.common.amd64
> +++ b/debian.azure-5.11/config/amd64/config.common.amd64
> @@ -17,9 +17,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
>   CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>   CONFIG_DMA_VIRTUAL_CHANNELS=m
>   # CONFIG_EXTCON is not set
> -CONFIG_FB_CFB_COPYAREA=m
> -CONFIG_FB_CFB_FILLRECT=m
> -CONFIG_FB_CFB_IMAGEBLIT=m
>   CONFIG_GPIO_GENERIC=m
>   CONFIG_GPIO_GENERIC_PLATFORM=m
>   CONFIG_HIBERNATION=y
> diff --git a/debian.azure-5.11/config/arm64/config.common.arm64 b/debian.azure-5.11/config/arm64/config.common.arm64
> index dfa86392a1285..4a72bc70d2799 100644
> --- a/debian.azure-5.11/config/arm64/config.common.arm64
> +++ b/debian.azure-5.11/config/arm64/config.common.arm64
> @@ -17,9 +17,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
>   CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
>   CONFIG_DMA_VIRTUAL_CHANNELS=y
>   CONFIG_EXTCON=y
> -CONFIG_FB_CFB_COPYAREA=y
> -CONFIG_FB_CFB_FILLRECT=y
> -CONFIG_FB_CFB_IMAGEBLIT=y
>   CONFIG_GPIO_GENERIC=y
>   CONFIG_GPIO_GENERIC_PLATFORM=y
>   # CONFIG_HIBERNATION is not set
> diff --git a/debian.azure-5.11/config/config.common.ubuntu b/debian.azure-5.11/config/config.common.ubuntu
> index 214bc5c5d6881..0f3e74070e042 100644
> --- a/debian.azure-5.11/config/config.common.ubuntu
> +++ b/debian.azure-5.11/config/config.common.ubuntu
> @@ -1641,7 +1641,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
>   # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
>   CONFIG_DEBUG_INFO=y
>   CONFIG_DEBUG_INFO_BTF=y
> -CONFIG_DEBUG_INFO_BTF_MODULES=y
>   # CONFIG_DEBUG_INFO_COMPRESSED is not set
>   CONFIG_DEBUG_INFO_DWARF4=y
>   # CONFIG_DEBUG_INFO_REDUCED is not set
> @@ -1971,7 +1970,7 @@ CONFIG_DRM_PANEL_NOVATEK_NT35510=m
>   CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
>   CONFIG_DRM_PANEL_NOVATEK_NT39016=m
>   CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
> -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
> +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
>   CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
>   CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
>   CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
> @@ -2266,12 +2265,15 @@ CONFIG_FB_ARMCLCD=m
>   # CONFIG_FB_ATY128 is not set
>   CONFIG_FB_BACKLIGHT=m
>   # CONFIG_FB_CARMINE is not set
> +CONFIG_FB_CFB_COPYAREA=y
> +CONFIG_FB_CFB_FILLRECT=y
> +CONFIG_FB_CFB_IMAGEBLIT=y
>   # CONFIG_FB_CIRRUS is not set
>   CONFIG_FB_CMDLINE=y
>   # CONFIG_FB_CYBER2000 is not set
>   CONFIG_FB_DDC=m
>   CONFIG_FB_DEFERRED_IO=y
> -# CONFIG_FB_EFI is not set
> +CONFIG_FB_EFI=y
>   # CONFIG_FB_FOREIGN_ENDIAN is not set
>   # CONFIG_FB_HGA is not set
>   CONFIG_FB_HYPERV=m
> @@ -5107,7 +5109,6 @@ CONFIG_PAGE_POISONING=y
>   CONFIG_PAGE_POOL=y
>   CONFIG_PAGE_REPORTING=y
>   CONFIG_PAGE_TABLE_ISOLATION=y
> -CONFIG_PAHOLE_HAS_SPLIT_BTF=y
>   # CONFIG_PANASONIC_LAPTOP is not set
>   CONFIG_PANEL=m
>   # CONFIG_PANEL_CHANGE_MESSAGE is not set

-- 
-----------
Tim Gardner
Canonical, Inc