diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2023-04-10 11:11:26 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2023-04-10 11:14:10 +0800 |
| commit | de171f0fad4ec02d98d575e0936ddb6dbe292b1b (patch) | |
| tree | b027485014bd4a5722e5632303cbb5444a874cb2 | |
| parent | 577e286cd9b192dc1a25e8a27b288377fc5744cf (diff) | |
| download | omap-modules-de171f0fad4ec02d98d575e0936ddb6dbe292b1b.tar.gz | |
Fix build errors with 6.2.0-4d578751dedb
ERROR: The following kernel modules are built but not copied. Add these lines to the module_outs attribute of @//omap-modules/android-mainline:x15:
"fs/netfs/netfs.ko",
"drivers/i2c/algos/i2c-algo-bit.ko",
Alternatively, install buildozer and execute:
2023-04-05 18:39:47.409383 - INFO - Applying: Revert "drm/bridge_connector: enable HPD by default if supported"
Patch failed at 0001 Revert "drm/bridge_connector: enable HPD by default if supported"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ifedd7a19519c055ec55f7860f5dc7167ff450caa
| -rw-r--r-- | BUILD.bazel | 2 | ||||
| -rw-r--r-- | patchsets/0001-Revert-drm-bridge_connector-enable-HPD-by-default-if.patch | 30 | ||||
| -rwxr-xr-x | patchsets/apply.sh | 5 |
3 files changed, 2 insertions, 35 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 15e1d6b..4124a43 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -96,6 +96,7 @@ kernel_build( "drivers/hwmon/ina2xx.ko", "drivers/hwmon/ntc_thermistor.ko", "drivers/hwmon/pwm-fan.ko", + "drivers/i2c/algos/i2c-algo-bit.ko", "drivers/i2c/busses/i2c-aspeed.ko", "drivers/i2c/busses/i2c-emev2.ko", "drivers/i2c/busses/i2c-gpio.ko", @@ -442,6 +443,7 @@ kernel_build( "drivers/watchdog/omap_wdt.ko", "fs/cifs/cifs.ko", "fs/efivarfs/efivarfs.ko", + "fs/netfs/netfs.ko", "fs/smbfs_common/cifs_arc4.ko", "fs/smbfs_common/cifs_md4.ko", "lib/crc4.ko", diff --git a/patchsets/0001-Revert-drm-bridge_connector-enable-HPD-by-default-if.patch b/patchsets/0001-Revert-drm-bridge_connector-enable-HPD-by-default-if.patch deleted file mode 100644 index d65bafe..0000000 --- a/patchsets/0001-Revert-drm-bridge_connector-enable-HPD-by-default-if.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bb11f2e0688ad8141da42cef7bfd92c8fa2f21bf Mon Sep 17 00:00:00 2001 -From: Yongqin Liu <yongqin.liu@linaro.org> -Date: Sun, 14 Aug 2022 09:45:24 +0800 -Subject: [PATCH 1/2] Revert "drm/bridge_connector: enable HPD by default if - supported" - -This reverts commit 09077bc3116581f4d1cb961ec359ad56586e370b. ---- - drivers/gpu/drm/drm_bridge_connector.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c -index 6b3dad03d77d..60923cdfe8e1 100644 ---- a/drivers/gpu/drm/drm_bridge_connector.c -+++ b/drivers/gpu/drm/drm_bridge_connector.c -@@ -384,10 +384,8 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, - connector_type, ddc); - drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs); - -- if (bridge_connector->bridge_hpd) { -+ if (bridge_connector->bridge_hpd) - connector->polled = DRM_CONNECTOR_POLL_HPD; -- drm_bridge_connector_enable_hpd(connector); -- } - else if (bridge_connector->bridge_detect) - connector->polled = DRM_CONNECTOR_POLL_CONNECT - | DRM_CONNECTOR_POLL_DISCONNECT; --- -2.25.1 - diff --git a/patchsets/apply.sh b/patchsets/apply.sh index 809bc38..8551db2 100755 --- a/patchsets/apply.sh +++ b/patchsets/apply.sh @@ -6,11 +6,6 @@ if [ "X${SKIP_SYNC}" = "Xtrue" ]; then exit 0 fi -## drm/bridge_connector: enable HPD by default if supported -## kernel panic reported with this change -## git revert --no-edit 09077bc31165 -git am "${dir_parent}/0001-Revert-drm-bridge_connector-enable-HPD-by-default-if.patch" - ## drm: omapdrm: Do no allocate non-scanout GEMs through DMM/TILER ## no display on the hdmi monitor with this change ## git revert --no-edit 3ccd59f93004 |