From: Maarten Lankhorst Subject: [PATCH 3/4] drm/i915: Remove last references to drm_atomic_get_existing* macros Date: Mon, 9 Apr 2018 14:46:55 +0200 Message-ID: <20180409124656.39886-3-maarten.lankhorst@linux.intel.com> References: <20180409124656.39886-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id A624B6E101 for ; Mon, 9 Apr 2018 12:47:01 +0000 (UTC) In-Reply-To: <20180409124656.39886-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QWxsIHRoZSByZWZlcmVuY2VzIHRvIGdldF9leGlzdGluZ19zdGF0ZSBjYW4gYmUgY29udmVydGVk IHRvCmdldF9uZXdfc3RhdGUgb3IgZ2V0X29sZF9zdGF0ZSwgd2hpY2ggbWVhbnMgdGhhdCBpOTE1 IGlzIG5vdwpnZXRfZXhpc3Rpbmdfc3RhdGUgZnJlZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTEgKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMjggZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQ0MmI2MzVj NjgwNy4uNDg3YTZlMjM1MjIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC01MTQ4LDggKzUxNDgsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJCWludGVsX2F0b21pY19n ZXRfbmV3X2NydGNfc3RhdGUodG9faW50ZWxfYXRvbWljX3N0YXRlKG9sZF9zdGF0ZSksCiAJCQkJ CQljcnRjKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+YmFzZS5wcmltYXJ5 OwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmlfc3RhdGUgPQotCQlkcm1fYXRvbWlj X2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHByaW1hcnkpOworCXN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKm9sZF9wcmltYXJ5X3N0YXRlID0KKwkJZHJtX2F0b21pY19nZXRfb2xk X3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwgcHJpbWFyeSk7CiAKIAlpbnRlbF9mcm9udGJ1ZmZlcl9m bGlwKHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpLCBwaXBlX2NvbmZpZy0+ZmJfYml0cyk7CiAKQEAg LTUxNTksMTkgKzUxNTksMTYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCWlmIChoc3dfcG9zdF91 cGRhdGVfZW5hYmxlX2lwcyhvbGRfY3J0Y19zdGF0ZSwgcGlwZV9jb25maWcpKQogCQloc3dfZW5h YmxlX2lwcyhwaXBlX2NvbmZpZyk7CiAKLQlpZiAob2xkX3ByaV9zdGF0ZSkgewotCQlzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnByaW1hcnlfc3RhdGUgPQotCQkJaW50ZWxfYXRvbWljX2dldF9u ZXdfcGxhbmVfc3RhdGUodG9faW50ZWxfYXRvbWljX3N0YXRlKG9sZF9zdGF0ZSksCi0JCQkJCQkJ IHRvX2ludGVsX3BsYW5lKHByaW1hcnkpKTsKLQkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpv bGRfcHJpbWFyeV9zdGF0ZSA9Ci0JCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfcHJpX3N0YXRl KTsKLQkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwcmltYXJ5X3N0YXRlLT5iYXNlLmZi OworCWlmIChvbGRfcHJpbWFyeV9zdGF0ZSkgeworCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpu ZXdfcHJpbWFyeV9zdGF0ZSA9CisJCQlkcm1fYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUob2xk X3N0YXRlLCBwcmltYXJ5KTsKKwkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBuZXdfcHJp bWFyeV9zdGF0ZS0+ZmI7CiAKIAkJaW50ZWxfZmJjX3Bvc3RfdXBkYXRlKGNydGMpOwogCi0JCWlm IChwcmltYXJ5X3N0YXRlLT5iYXNlLnZpc2libGUgJiYKKwkJaWYgKG5ld19wcmltYXJ5X3N0YXRl LT52aXNpYmxlICYmCiAJCSAgICAobmVlZHNfbW9kZXNldCgmcGlwZV9jb25maWctPmJhc2UpIHx8 Ci0JCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT5iYXNlLnZpc2libGUpKQorCQkgICAgICFvbGRf cHJpbWFyeV9zdGF0ZS0+dmlzaWJsZSkpCiAJCQlpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KCZj cnRjLT5iYXNlLCBwaXBlX2NvbmZpZyk7CiAKIAkJLyogRGlzcGxheSBXQSA4MjcgKi8KQEAgLTUx OTIsOCArNTE4OSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq b2xkX3N0YXRlID0gb2xkX2NydGNfc3RhdGUtPmJhc2Uuc3RhdGU7CiAJc3RydWN0IGRybV9wbGFu ZSAqcHJpbWFyeSA9IGNydGMtPmJhc2UucHJpbWFyeTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpvbGRfcHJpX3N0YXRlID0KLQkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUo b2xkX3N0YXRlLCBwcmltYXJ5KTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcHJpbWFy eV9zdGF0ZSA9CisJCWRybV9hdG9taWNfZ2V0X29sZF9wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHBy aW1hcnkpOwogCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNl KTsKIAlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpvbGRfaW50ZWxfc3RhdGUgPQogCQl0b19p bnRlbF9hdG9taWNfc3RhdGUob2xkX3N0YXRlKTsKQEAgLTUyMDEsMTMgKzUxOTgsMTEgQEAgc3Rh dGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq b2xkX2NydGNfc3RhdGUsCiAJaWYgKGhzd19wcmVfdXBkYXRlX2Rpc2FibGVfaXBzKG9sZF9jcnRj X3N0YXRlLCBwaXBlX2NvbmZpZykpCiAJCWhzd19kaXNhYmxlX2lwcyhvbGRfY3J0Y19zdGF0ZSk7 CiAKLQlpZiAob2xkX3ByaV9zdGF0ZSkgewotCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBy aW1hcnlfc3RhdGUgPQorCWlmIChvbGRfcHJpbWFyeV9zdGF0ZSkgeworCQlzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKm5ld19wcmltYXJ5X3N0YXRlID0KIAkJCWludGVsX2F0b21pY19nZXRfbmV3 X3BsYW5lX3N0YXRlKG9sZF9pbnRlbF9zdGF0ZSwKIAkJCQkJCQkgdG9faW50ZWxfcGxhbmUocHJp bWFyeSkpOwotCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wcmltYXJ5X3N0YXRlID0K LQkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKG9sZF9wcmlfc3RhdGUpOwotCQlzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpmYiA9IHByaW1hcnlfc3RhdGUtPmJhc2UuZmI7CisJCXN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmZiID0gbmV3X3ByaW1hcnlfc3RhdGUtPmJhc2UuZmI7CiAKIAkJLyogRGlzcGxh eSBXQSA4MjcgKi8KIAkJaWYgKChJTlRFTF9HRU4oZGV2X3ByaXYpID09IDkgJiYgIUlTX0dFTUlO SUxBS0UoZGV2X3ByaXYpKSB8fApAQCAtNTIxNiwxMyArNTIxMSwxMyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19z dGF0ZSwKIAkJCQlza2xfd2FfY2xrZ2F0ZShkZXZfcHJpdiwgY3J0Yy0+cGlwZSwgdHJ1ZSk7CiAJ CX0KIAotCQlpbnRlbF9mYmNfcHJlX3VwZGF0ZShjcnRjLCBwaXBlX2NvbmZpZywgcHJpbWFyeV9z dGF0ZSk7CisJCWludGVsX2ZiY19wcmVfdXBkYXRlKGNydGMsIHBpcGVfY29uZmlnLCBuZXdfcHJp bWFyeV9zdGF0ZSk7CiAJCS8qCiAJCSAqIEdlbjIgcmVwb3J0cyBwaXBlIHVuZGVycnVucyB3aGVu ZXZlciBhbGwgcGxhbmVzIGFyZSBkaXNhYmxlZC4KIAkJICogU28gZGlzYWJsZSB1bmRlcnJ1biBy ZXBvcnRpbmcgYmVmb3JlIGFsbCB0aGUgcGxhbmVzIGdldCBkaXNhYmxlZC4KIAkJICovCi0JCWlm IChJU19HRU4yKGRldl9wcml2KSAmJiBvbGRfcHJpbWFyeV9zdGF0ZS0+YmFzZS52aXNpYmxlICYm Ci0JCSAgICAobW9kZXNldCB8fCAhcHJpbWFyeV9zdGF0ZS0+YmFzZS52aXNpYmxlKSkKKwkJaWYg KElTX0dFTjIoZGV2X3ByaXYpICYmIG9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCisJCSAg ICAobW9kZXNldCB8fCAhbmV3X3ByaW1hcnlfc3RhdGUtPmJhc2UudmlzaWJsZSkpCiAJCQlpbnRl bF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBjcnRjLT5waXBlLCBm YWxzZSk7CiAJfQogCkBAIC0xMDgzNiw3ICsxMDgzMSw3IEBAIHN0YXRpYyBib29sIGNoZWNrX2Rp Z2l0YWxfcG9ydF9jb25mbGljdHMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlz dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwogCQlzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAotCQljb25uZWN0b3Jfc3RhdGUgPSBkcm1fYXRvbWljX2dl dF9leGlzdGluZ19jb25uZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5lY3Rvcik7CisJCWNvbm5lY3Rv cl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jb25uZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5l Y3Rvcik7CiAJCWlmICghY29ubmVjdG9yX3N0YXRlKQogCQkJY29ubmVjdG9yX3N0YXRlID0gY29u bmVjdG9yLT5zdGF0ZTsKIApAQCAtMTIxOTksNiArMTIxOTQsOSBAQCBzdGF0aWMgdm9pZCBpbnRl bF91cGRhdGVfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpOwog CWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOworCXN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlID0KKwkJaW50ZWxfYXRvbWljX2dldF9u ZXdfcGxhbmVfc3RhdGUodG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKSwKKwkJCQkJCSB0b19p bnRlbF9wbGFuZShjcnRjLT5wcmltYXJ5KSk7CiAKIAlpZiAobW9kZXNldCkgewogCQl1cGRhdGVf c2NhbmxpbmVfb2Zmc2V0KGludGVsX2NydGMpOwpAQCAtMTIyMTEsMTEgKzEyMjA5LDggQEAgc3Rh dGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAg ICAgICBwaXBlX2NvbmZpZyk7CiAJfQogCi0JaWYgKGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3Bs YW5lX3N0YXRlKHN0YXRlLCBjcnRjLT5wcmltYXJ5KSkgewotCQlpbnRlbF9mYmNfZW5hYmxlKAot CQkgICAgaW50ZWxfY3J0YywgcGlwZV9jb25maWcsCi0JCSAgICB0b19pbnRlbF9wbGFuZV9zdGF0 ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSkpOwotCX0KKwlpZiAobmV3X3BsYW5lX3N0YXRlKQorCQlp bnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMsIHBpcGVfY29uZmlnLCBuZXdfcGxhbmVfc3RhdGUp OwogCiAJZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKG9sZF9jcnRjX3N0 YXRlKTsKIH0KQEAgLTEyNzk2LDcgKzEyNzkxLDcgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCWlmIChvbGRfb2JqKSB7CiAJCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9Ci0JCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRj X3N0YXRlKG5ld19zdGF0ZS0+c3RhdGUsCisJCQlkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0 ZShuZXdfc3RhdGUtPnN0YXRlLAogCQkJCQkJCSAgIHBsYW5lLT5zdGF0ZS0+Y3J0Yyk7CiAKIAkJ LyogQmlnIEhhbW1lciwgd2UgYWxzbyBuZWVkIHRvIGVuc3VyZSB0aGF0IGFueSBwZW5kaW5nCi0t IAoyLjE2LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=