From dee4f26adcfd9a9a0e4664f0dc22974b60b5eea2 Mon Sep 17 00:00:00 2001

From: Nicolas Chauvet <kwizart@gmail.com>

Date: Sat, 26 Sep 2020 15:01:55 +0200

Subject: [PATCH] 50drm: Check drm_encoder_init along drm_crtc_init

Some modules are involved in the display output without to rely on

drm_crtc_init.

This is the case for the meson_dw_hdmi. This module need to be included

into the initramfs in both hostonly and generic modes.

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>

---

 modules.d/50drm/module-setup.sh | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh

index ad0e6d80..ddc1223d 100755

--- a/modules.d/50drm/module-setup.sh

+++ b/modules.d/50drm/module-setup.sh

@@ -33,13 +33,13 @@ installkernel() {

     if [[ $hostonly ]]; then

         for i in /sys/bus/{pci/devices,platform/devices,virtio/devices,soc/devices/soc?}/*/modalias; do

             [[ -e $i ]] || continue

-            if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register" -S "iw_handler_get_spy" $(<"$i"); then

+            if hostonly="" dracut_instmods --silent -s "drm_crtc_init|drm_dev_register|drm_encoder_init" -S "iw_handler_get_spy" $(<"$i"); then

                 if strstr "$(modinfo -F filename $(<"$i") 2>/dev/null)" radeon.ko; then

                     hostonly='' instmods amdkfd

                 fi

             fi

         done

     else

-        dracut_instmods -o -s "drm_crtc_init|drm_dev_register" "=drivers/gpu/drm" "=drivers/staging"

+        dracut_instmods -o -s "drm_crtc_init|drm_dev_register|drm_encoder_init" "=drivers/gpu/drm" "=drivers/staging"

     fi

 }