From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH -next 05/15] drm/vmwgfx: Fix atomic mode set check Date: Tue, 3 Jul 2018 21:14:50 +0200 Message-ID: <20180703191500.2374-6-thellstrom@vmware.com> References: <20180703191500.2374-1-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from NAM05-BY2-obe.outbound.protection.outlook.com (mail-eopbgr710056.outbound.protection.outlook.com [40.107.71.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id F11466E8C1 for ; Tue, 3 Jul 2018 19:16:33 +0000 (UTC) In-Reply-To: <20180703191500.2374-1-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Thomas Hellstrom , linux-graphics-maintainer@vmware.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2luY2xhaXIgWWVoIDxzeWVoQHZtd2FyZS5jb20+Cgp2bXdfa21zX2F0b21pY19jaGVj a19tb2Rlc2V0KCkgaXMgY3VycmVudGx5IGNoZWNraW5nIGNvbmZpZyB1c2luZyB0aGUKbGVnYWN5 IHN0YXRlLCB3aGljaCBpcyB1cGRhdGVkIGFmdGVyIGEgY29tbWl0IGhhcyBoYXBwZW5lZC4KClRo aXMgbWVhbnMgdm13X2ttc19hdG9taWNfY2hlY2tfbW9kZXNldCgpIHdpbGwgcmVqZWN0IGFuIGlu dmFsaWQgY29uZmlnCm9uIHRoZSBuZXh0IHVwZGF0ZSByYXRoZXIgdGhhbiB0aGUgY3VycmVudCBv bmUuCgpGaXggdGhpcyBieSB1c2luZyB0aGUgbmV3IHN0YXRlcyBmb3IgY29uZmlnIGNoZWNraW5n CgpTaWduZWQtb2ZmLWJ5OiBTaW5jbGFpciBZZWggPHN5ZWhAdm13YXJlLmNvbT4KUmV2aWV3ZWQt Ynk6IERlZXBhayBSYXdhdCA8ZHJhd2F0QHZtd2FyZS5jb20+ClNpZ25lZC1vZmYtYnk6IFRob21h cyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9rbXMuYyB8IDQwICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMgYi9kcml2ZXJzL2dwdS9k cm0vdm13Z2Z4L3Ztd2dmeF9rbXMuYwppbmRleCBlN2E3YTJlNzNiYmYuLjZiODU0MWY5MjE1ZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMKQEAgLTE1MjYsMzMgKzE1MjYsNDUgQEAg c3RhdGljIGludAogdm13X2ttc19hdG9taWNfY2hlY2tfbW9kZXNldChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQkJICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq bmV3X2NydGNfc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRl OworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlz dHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2ID0gdm13X3ByaXYoZGV2KTsKLQlpbnQgaTsKKwlp bnQgaSwgcmV0LCBjcHAgPSAwOwogCi0JZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUs IGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJdW5zaWduZWQgbG9uZyByZXF1ZXN0ZWRfYmJfbWVt ID0gMDsKKwlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVjayhkZXYsIHN0YXRlKTsKIAotCQlp ZiAoZGV2X3ByaXYtPmFjdGl2ZV9kaXNwbGF5X3VuaXQgPT0gdm13X2R1X3NjcmVlbl90YXJnZXQp IHsKLQkJCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gY3J0Yy0+cHJpbWFyeTsKLQkJCXN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCS8qIElmIHRoaXMgaXMgbm90IGEgU1RE VSwgdGhlbiBubyBtb3JlIGNoZWNraW5nIGlzIG5lY2Vzc2FyeSAqLworCWlmIChyZXQgfHwgZGV2 X3ByaXYtPmFjdGl2ZV9kaXNwbGF5X3VuaXQgIT0gdm13X2R1X3NjcmVlbl90YXJnZXQpCisJCXJl dHVybiByZXQ7CiAKLQkJCXBsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0 YXRlKHN0YXRlLCBwbGFuZSk7CisJZm9yX2VhY2hfbmV3X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBw bGFuZSwgbmV3X3BsYW5lX3N0YXRlLCBpKSB7CisJCWlmIChuZXdfcGxhbmVfc3RhdGUtPmZiKSB7 CisJCQlpbnQgY3VycmVudF9jcHAgPSBuZXdfcGxhbmVfc3RhdGUtPmZiLT5waXRjaGVzWzBdIC8K KwkJCQkJICBuZXdfcGxhbmVfc3RhdGUtPmZiLT53aWR0aDsKIAotCQkJaWYgKHBsYW5lX3N0YXRl ICYmIHBsYW5lX3N0YXRlLT5mYikgewotCQkJCWludCBjcHAgPSBwbGFuZV9zdGF0ZS0+ZmItPmZv cm1hdC0+Y3BwWzBdOworCQkJaWYgKGNwcCA9PSAwKQorCQkJCWNwcCA9IGN1cnJlbnRfY3BwOwor CQkJZWxzZSBpZiAoY3VycmVudF9jcHAgIT0gY3BwKQorCQkJCXJldHVybiAtRUlOVkFMOworCQl9 CisJfQogCi0JCQkJcmVxdWVzdGVkX2JiX21lbSArPSBjcnRjLT5tb2RlLmhkaXNwbGF5ICogY3Bw ICoKLQkJCQkJCSAgICBjcnRjLT5tb2RlLnZkaXNwbGF5OwotCQkJfQorCWZvcl9lYWNoX25ld19j cnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgeworCQl1bnNpZ25l ZCBsb25nIHJlcXVlc3RlZF9iYl9tZW0gPSAwOworCisJCWlmIChkcm1fYXRvbWljX2NydGNfbmVl ZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpIHsKKwkJCXJlcXVlc3RlZF9iYl9tZW0gKz0gbmV3 X2NydGNfc3RhdGUtPm1vZGUuaGRpc3BsYXkgKgorCQkJCQkgICAgbmV3X2NydGNfc3RhdGUtPm1v ZGUudmRpc3BsYXkgKgorCQkJCQkgICAgY3BwOwogCiAJCQlpZiAocmVxdWVzdGVkX2JiX21lbSA+ IGRldl9wcml2LT5wcmltX2JiX21lbSkKIAkJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCX0KIAot CXJldHVybiBkcm1fYXRvbWljX2hlbHBlcl9jaGVjayhkZXYsIHN0YXRlKTsKKwlyZXR1cm4gcmV0 OwogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9tb2RlX2NvbmZpZ19mdW5jcyB2bXdfa21z X2Z1bmNzID0gewotLSAKMi4xOC4wLnJjMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg==