patchsets: change to apply offline patches

as tuxsuite does not support git revert with
the following error:
    + git revert --no-edit 09077bc31165
    fatal: bad revision '09077bc31165'

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ida49d9948c2d9ba36adf15b2d9eaaf34b4f21125

3 files changed, 80 insertions, 2 deletions

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
new file mode 100644
index 0000000..d65bafe
--- /dev/null
+++ b/patchsets/0001-Revert-drm-bridge_connector-enable-HPD-by-default-if.patch
@@ -0,0 +1,30 @@
+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/0002-Revert-drm-omapdrm-Do-no-allocate-non-scanout-GEMs-t.patch b/patchsets/0002-Revert-drm-omapdrm-Do-no-allocate-non-scanout-GEMs-t.patch
new file mode 100644
index 0000000..5d7394b
--- /dev/null
+++ b/patchsets/0002-Revert-drm-omapdrm-Do-no-allocate-non-scanout-GEMs-t.patch
@@ -0,0 +1,44 @@
+From 61950987b8b6b57667cf3f0ddf63d77d23368cc8 Mon Sep 17 00:00:00 2001
+From: Yongqin Liu <yongqin.liu@linaro.org>
+Date: Sun, 14 Aug 2022 09:45:30 +0800
+Subject: [PATCH 2/2] Revert "drm: omapdrm: Do no allocate non-scanout GEMs
+ through DMM/TILER"
+
+This reverts commit 3ccd59f93004c369cc4c0f0939f80cb069f0fc2d.
+---
+ drivers/gpu/drm/omapdrm/omap_gem.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
+index cf571796fd26..41c1a6d83b2b 100644
+--- a/drivers/gpu/drm/omapdrm/omap_gem.c
++++ b/drivers/gpu/drm/omapdrm/omap_gem.c
+@@ -821,12 +821,10 @@ int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr)
+ 			if (ret)
+ 				goto fail;
+ 
+-			if (omap_obj->flags & OMAP_BO_SCANOUT) {
+-				if (priv->has_dmm) {
+-					ret = omap_gem_pin_tiler(obj);
+-					if (ret)
+-						goto fail;
+-				}
++			if (priv->has_dmm) {
++				ret = omap_gem_pin_tiler(obj);
++				if (ret)
++					goto fail;
+ 			}
+ 		} else {
+ 			refcount_inc(&omap_obj->pin_cnt);
+@@ -863,8 +861,6 @@ static void omap_gem_unpin_locked(struct drm_gem_object *obj)
+ 			kfree(omap_obj->sgt);
+ 			omap_obj->sgt = NULL;
+ 		}
+-		if (!(omap_obj->flags & OMAP_BO_SCANOUT))
+-			return;
+ 		if (priv->has_dmm) {
+ 			ret = tiler_unpin(omap_obj->block);
+ 			if (ret) {
+-- 
+2.25.1
+
diff --git a/patchsets/apply.sh b/patchsets/apply.sh
index 2b0445a..414304e 100755
--- a/patchsets/apply.sh
+++ b/patchsets/apply.sh
@@ -1,9 +1,13 @@
 #!/bin/bash -ex
 
+dir_parent=$(dirname "${0}")
+
 ## drm/bridge_connector: enable HPD by default if supported
 ## kernel panic reported with this change
-git revert --no-edit 09077bc31165
+## 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
+## git revert --no-edit 3ccd59f93004
+git am "${dir_parent}/0002-Revert-drm-omapdrm-Do-no-allocate-non-scanout-GEMs-t.patch"