Revert "Revert "ODROID-C5: drm: remove 'DUMMY-1' connector""
This reverts commit 666bfc69abfe563c0ab7182711ddeb3d38d6ba39.
Reason for revert: <Weston fails to start>
weston:20291130 INFO: ../libweston/modepolicy/ModePolicy.cpp:1620 setPosition curMode:1080p60hz left:0 top:0 width:1920 height:1080
weston:20291245 Invalid modeline "1920x1080@60 0:0" for output HDMI-A-1
weston:20291261
drm_help_update_display 364 current connector type is HDMI, current_mode(1920 1080)
weston:20291271 DEBUG: ../libweston/modepolicy/modepolicy_aml.cpp:899 curr: 1920x1080@60000
weston:20291320 Output 'HDMI-A-1' using color profile: built-in default sRGB SDR profile
weston:20291540 Chosen EGL config details: id: 7 rgba: 8 8 8 8 buf: 32 dep: 0 stcl: 0 int: 0-0 type: win|pbf|swap_preserved vis_id: ABGR8888 (0x34324241)
weston:20291591 drm_output_enable video plane for current output id:57 is_video_plane:1 video plane:0
weston:20291603 drm_output_enable video plane for current output id:62 is_video_plane:1 video plane:1
weston:20291614 Output HDMI-A-1 (crtc 67) video modes:
1920x1080@60.0, preferred, current, 148.5 MHz(MESON_DRM_FIX_UI_SIZE)
1920x1080@60.0, 74.2 MHz
1920x1080@50.0, 148.5 MHz
1920x1080@50.0, 74.2 MHz
1280x720@60.0, 74.2 MHz
1280x720@50.0, 74.2 MHz
720x576@50.0, 27.0 MHz
720x480@59.9, 27.0 MHz
weston:20291705 associating input device event3 with output HDMI-A-1 (none by udev)
weston:20291715 associating input device event4 with output HDMI-A-1 (none by udev)
weston:20291724 associating input device event5 with output HDMI-A-1 (none by udev)
weston:20291733 associating input device event6 with output HDMI-A-1 (none by udev)
weston:20291742 associating input device event7 with output HDMI-A-1 (none by udev)
weston:20291751 associating input device event8 with output HDMI-A-1 (none by udev)
weston:20291760 associating input device event1 with output HDMI-A-1 (none by udev)
weston:20291769 associating input device event2 with output HDMI-A-1 (none by udev)
weston:20291790 Output 'HDMI-A-1' enabled with head(s) HDMI-A-1
weston:20291811
WESTON_USE_GBM_MODIFIERS :(null)
weston:20291825
weston_config_fixed_UIsize_for_output 253 invalid parameter return
Change-Id: I1ebd76e4f76ecb0b0e8b10a697724446c0f4c98d
diff --git a/drivers/drm/Makefile b/drivers/drm/Makefile
index 952faef..e56daec 100644
--- a/drivers/drm/Makefile
+++ b/drivers/drm/Makefile
@@ -38,7 +38,6 @@
meson_vpu_pipeline_private.o \
meson_debugfs.o meson_vpu_util.o \
meson_drm_bind.o\
- meson_dummyl.o meson_dummyp.o \
meson_drm_rdma.o \
vpu-hw/meson_vpu_video_wrapper.o \
vpu-hw/meson_vpu_osd_mif.o \
@@ -51,6 +50,10 @@
vpu-hw/meson_osd_csc.o \
vpu-hw/meson_vpu_postblend.o \
+ifeq ($(CONFIG_ARCH_MESON_ODROID_COMMON),)
+ $(MESON_DRM_MODULE_NAME)-y += meson_dummyl.o meson_dummyp.o
+endif
+
ifeq ($(CONFIG_AMLOGIC_ZAPPER_CUT),)
$(MESON_DRM_MODULE_NAME)-y += meson_lcd.o
endif
diff --git a/drivers/drm/meson_drm_bind.c b/drivers/drm/meson_drm_bind.c
index e17f1d5..62b3f4c 100644
--- a/drivers/drm/meson_drm_bind.c
+++ b/drivers/drm/meson_drm_bind.c
@@ -55,11 +55,13 @@
return meson_panel_dev_bind(drm, type, intf);
#endif
+#ifndef CONFIG_ARCH_MESON_ODROID_COMMON
case DRM_MODE_CONNECTOR_MESON_DUMMY_L:
return meson_dummyl_dev_bind(drm, type, intf);
case DRM_MODE_CONNECTOR_MESON_DUMMY_P:
return meson_dummyp_dev_bind(drm, type, intf);
+#endif
default:
pr_err("unknown connector tye %d\n", type);
@@ -103,11 +105,13 @@
return meson_panel_dev_unbind(drm, type, connector_id);
#endif
+#ifndef CONFIG_ARCH_MESON_ODROID_COMMON
case DRM_MODE_CONNECTOR_MESON_DUMMY_L:
return meson_dummyl_dev_unbind(drm, type, connector_id);
case DRM_MODE_CONNECTOR_MESON_DUMMY_P:
return meson_dummyp_dev_unbind(drm, type, connector_id);
+#endif
default:
pr_err("unknown connector tye %d\n", type);