FAILED: patch "[PATCH] drm/nouveau/mpeg: mthd returns true on success now" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 22, 2017

Subsystems (4)

Stable branch DRM drivers DRM misc nouveau

lore

Share & tools

lore

[email protected]

author maintainer

2017-05-22 16:50 UTC #0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From ad01a91a820cd9f0d880c407bf556b67298dcc93 Mon Sep 17 00:00:00 2001

From: Ilia Mirkin <[email protected]>
Date: Sat, 18 Mar 2017 21:53:05 -0400
Subject: [PATCH] drm/nouveau/mpeg: mthd returns true on success now

Signed-off-by Ilia Mirkin <[email protected]>

Fixes 590801c1a3 ("drm/nouveau/mpeg: remove dependence on namedb/engctx lookup")

Cc [email protected] # v4.3+

Signed-off-by Ben Skeggs <[email protected]>

drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c +1 -1

index 003ac915eaad..8a8895246d26 100644
@@ -198,7 +198,7 @@ nv31_mpeg_intr(struct nvkm_engine *engine)
 		}
 
 		if (type == 0x00000010) {
-			if (!nv31_mpeg_mthd(mpeg, mthd, data))
+			if (nv31_mpeg_mthd(mpeg, mthd, data))
 				show &= ~0x01000000;
 		}
 	}

drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c +1 -1

index e536f37e24b0..c3cf02ed468e 100644
@@ -172,7 +172,7 @@ nv44_mpeg_intr(struct nvkm_engine *engine)
 		}
 
 		if (type == 0x00000010) {
-			if (!nv44_mpeg_mthd(subdev->device, mthd, data))
+			if (nv44_mpeg_mthd(subdev->device, mthd, data))
 				show &= ~0x01000000;
 		}
 	}