summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2022-08-12 13:37:00 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2022-08-12 13:37:00 +0800
commitf6fcc4a039aad8c7e753c5cb3870f16c144dfe79 (patch)
treee3219215acb96cbb5780e9a60678afd6311184c3
parentf8fa407bacbf53fb7483842399708b02e1f87d78 (diff)
downloadomap-modules-f6fcc4a039aad8c7e753c5cb3870f16c144dfe79.tar.gz
patchsets: revert two commits to have it boot
The discussions are here: [PATCH] drm/bridge_connector: enable HPD by default if supported https://lore.kernel.org/lkml/20211225063151.2110878-1-nikita.yoush@cogentembedded.com/ [PATCH 3/3] drm: omapdrm: Do no allocate non-scanout GEMs through DMM/TILER https://lore.kernel.org/lkml/47dbc690-bff2-8839-f01f-9287403a7562@gmail.com/T/#m3e02107dfde933c41f3af6e880ba08e9659f5b71 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Ica26f7862b199b4d44432d7029f2b98e1c4d51d4
-rw-r--r--build.config.x153
-rwxr-xr-xpatchsets/apply.sh10
2 files changed, 12 insertions, 1 deletions
diff --git a/build.config.x15 b/build.config.x15
index 4253e1b..0e85334 100644
--- a/build.config.x15
+++ b/build.config.x15
@@ -7,8 +7,9 @@ KERNEL_DIR=common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm
+HACK_PATCHSETS="cd ${ROOT_DIR}/${KERNEL_DIR} && ${ROOT_DIR}/${LOCAL_DIR}/patchsets/apply.sh && cd -"
DEFCONFIG=ti_sdk_am57x_android_release_defconfig
-PRE_DEFCONFIG_CMDS="cp -vf ${ROOT_DIR}/${LOCAL_DIR}/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/arch/arm/configs/${DEFCONFIG}"
+PRE_DEFCONFIG_CMDS="${HACK_PATCHSETS}; cp -vf ${ROOT_DIR}/${LOCAL_DIR}/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/arch/arm/configs/${DEFCONFIG}"
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm/configs/${DEFCONFIG}"
EXT_MODULES="${LOCAL_DIR}"
diff --git a/patchsets/apply.sh b/patchsets/apply.sh
new file mode 100755
index 0000000..b1260ac
--- /dev/null
+++ b/patchsets/apply.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -ex
+
+exit 0
+## drm/bridge_connector: enable HPD by default if supported
+## kernel panic reported with this change
+git revert --no-edit 09077bc31165
+
+## 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