diff --git a/N_amdgpu-present-Check-tiling-for-newer-versions-too.patch b/N_amdgpu-present-Check-tiling-for-newer-versions-too.patch
new file mode 100644
index 0000000..2c64321
--- /dev/null
+++ b/N_amdgpu-present-Check-tiling-for-newer-versions-too.patch
@@ -0,0 +1,32 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: present: Check tiling for newer versions, too
+Patch-mainline: Never, temporary workaround
+References: bsc#1169222
+
+This is essentially a partial revert of the commit a2b32e72fdaf
+  present: Don't check tiling parameters with DC & DRM minor version >= 31
+
+that caused a crash when DPMS is changed while an external HDMI
+monitor is connected on the laptop.
+
+Note that it's a temporary workaround until the actual cause gets
+fixed in the kernel DRM side.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ src/amdgpu_present.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/amdgpu_present.c
++++ b/src/amdgpu_present.c
+@@ -305,7 +305,8 @@ amdgpu_present_check_flip(RRCrtcPtr crtc
+ 			return FALSE;
+ 	}
+ 
+-	if (!dc_enabled || info->dri2.pKernelDRMVersion->version_minor < 31) {
++	/* FIXME: reverted the DRM minor version check below (bsc#1169222) */
++	if (1 /*!dc_enabled || info->dri2.pKernelDRMVersion->version_minor < 31*/) {
+ 		/* The kernel driver doesn't handle flipping between BOs with
+ 		 * different tiling parameters correctly
+ 		 */
diff --git a/xf86-video-amdgpu.changes b/xf86-video-amdgpu.changes
index 0716d1f..8546c37 100644
--- a/xf86-video-amdgpu.changes
+++ b/xf86-video-amdgpu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  7 12:46:02 CEST 2020 - tiwai@suse.de
+
+- N_amdgpu-present-Check-tiling-for-newer-versions-too.patch:
+  * fix crash with external HDMI and DPMS change (bsc#1169222)
+
 -------------------------------------------------------------------
 Thu Jan  9 23:39:11 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xf86-video-amdgpu.spec b/xf86-video-amdgpu.spec
index 0fac61f..1423961 100644
--- a/xf86-video-amdgpu.spec
+++ b/xf86-video-amdgpu.spec
@@ -32,6 +32,7 @@ Source1:        http://xorg.freedesktop.org/releases/individual/driver/%{name}-%
 Source2:        %{name}.keyring
 Source3:        amdgpu.ids
 Patch0:         u_fno-common.patch
+Patch1:         N_amdgpu-present-Check-tiling-for-newer-versions-too.patch
 BuildRequires:  autoconf >= 2.6.0
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -66,6 +67,7 @@ Its autodetects whether your hardware has a CI or newer AMD Graphics Card
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 autoreconf -fiv