From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 5 Dec 2016 23:03:04 +0000 (+1000)
Subject: drm/nouveau/mxm: handle DCB 4.1 modification
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f6bf17391fbb94086a1142a18f6301c24535df30;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/nouveau/mxm: handle DCB 4.1 modification

Allows MXM DCB modification to be handled on GM20x and newer boards.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
index db14fad2ddfc..d4ecc43b9275 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
@@ -190,7 +190,7 @@ mxm_dcb_sanitise(struct nvkm_mxm *mxm)
 	struct nvkm_bios *bios = subdev->device->bios;
 	u8  ver, hdr, cnt, len;
 	u16 dcb = dcb_table(bios, &ver, &hdr, &cnt, &len);
-	if (dcb == 0x0000 || ver != 0x40) {
+	if (dcb == 0x0000 || (ver != 0x40 && ver != 0x41)) {
 		nvkm_debug(subdev, "unsupported DCB version\n");
 		return;
 	}