From: Maarten Lankhorst Subject: [PATCH 5/8] drm/i915: Remove last references to drm_atomic_get_existing* macros Date: Thu, 20 Jul 2017 15:15:16 +0200 Message-ID: <20170720131519.30104-6-maarten.lankhorst@linux.intel.com> References: <20170720131519.30104-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 CDD546E6A0 for ; Thu, 20 Jul 2017 13:15:27 +0000 (UTC) In-Reply-To: <20170720131519.30104-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 cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTcgKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMzAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDhiZDhlZDM2 MmUxYS4uZDk1YjNiYTFmZTQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC00OTU2LDI3ICs0OTU2LDI1IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJ c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSA9IG9sZF9jcnRjX3N0YXRlLT5iYXNl LnN0YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9Ci0JCXRvX2lu dGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CisJCWludGVsX2F0b21pY19nZXRfbmV3 X2NydGNfc3RhdGUob2xkX3N0YXRlLCBjcnRjKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5 ID0gY3J0Yy0+YmFzZS5wcmltYXJ5OwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmlf c3RhdGUgPQotCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUs IHByaW1hcnkpOworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmltYXJ5X3N0YXRlID0K KwkJZHJtX2F0b21pY19nZXRfb2xkX3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwgcHJpbWFyeSk7CiAK IAlpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwKHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpLCBwaXBlX2Nv bmZpZy0+ZmJfYml0cyk7CiAKIAlpZiAocGlwZV9jb25maWctPnVwZGF0ZV93bV9wb3N0ICYmIHBp cGVfY29uZmlnLT5iYXNlLmFjdGl2ZSkKIAkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7 CiAKLQlpZiAob2xkX3ByaV9zdGF0ZSkgewotCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBy aW1hcnlfc3RhdGUgPQotCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocHJpbWFyeS0+c3RhdGUpOwot CQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wcmltYXJ5X3N0YXRlID0KLQkJCXRvX2lu dGVsX3BsYW5lX3N0YXRlKG9sZF9wcmlfc3RhdGUpOworCWlmIChvbGRfcHJpbWFyeV9zdGF0ZSkg eworCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfcHJpbWFyeV9zdGF0ZSA9CisJCQlkcm1f YXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUob2xkX3N0YXRlLCBwcmltYXJ5KTsKIAogCQlpbnRl bF9mYmNfcG9zdF91cGRhdGUoY3J0Yyk7CiAKLQkJaWYgKHByaW1hcnlfc3RhdGUtPmJhc2Uudmlz aWJsZSAmJgorCQlpZiAobmV3X3ByaW1hcnlfc3RhdGUtPnZpc2libGUgJiYKIAkJICAgIChuZWVk c19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkgfHwKLQkJICAgICAhb2xkX3ByaW1hcnlfc3Rh dGUtPmJhc2UudmlzaWJsZSkpCisJCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkK IAkJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwogCX0KIH0KQEAgLTQ5 ODksMjIgKzQ5ODcsMjEgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpvbGRfc3RhdGUgPSBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgZHJtX3Bs YW5lICpwcmltYXJ5ID0gY3J0Yy0+YmFzZS5wcmltYXJ5OwotCXN0cnVjdCBkcm1fcGxhbmVfc3Rh dGUgKm9sZF9wcmlfc3RhdGUgPQotCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0 ZShvbGRfc3RhdGUsIHByaW1hcnkpOworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmlt YXJ5X3N0YXRlID0KKwkJZHJtX2F0b21pY19nZXRfb2xkX3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwg cHJpbWFyeSk7CiAJYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldCgmcGlwZV9jb25maWctPmJh c2UpOwogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKm9sZF9pbnRlbF9zdGF0ZSA9CiAJCXRv X2ludGVsX2F0b21pY19zdGF0ZShvbGRfc3RhdGUpOwogCi0JaWYgKG9sZF9wcmlfc3RhdGUpIHsK LQkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmltYXJ5X3N0YXRlID0KLQkJCXRvX2ludGVs X3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsKLQkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpvbGRfcHJpbWFyeV9zdGF0ZSA9Ci0JCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfcHJpX3N0 YXRlKTsKKwlpZiAob2xkX3ByaW1hcnlfc3RhdGUpIHsKKwkJc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqbmV3X3ByaW1hcnlfc3RhdGUgPQorCQkJZHJtX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRl KG9sZF9zdGF0ZSwgcHJpbWFyeSk7CiAKLQkJaW50ZWxfZmJjX3ByZV91cGRhdGUoY3J0YywgcGlw ZV9jb25maWcsIHByaW1hcnlfc3RhdGUpOworCQlpbnRlbF9mYmNfcHJlX3VwZGF0ZShjcnRjLCBw aXBlX2NvbmZpZywKKwkJCQkgICAgIHRvX2ludGVsX3BsYW5lX3N0YXRlKG5ld19wcmltYXJ5X3N0 YXRlKSk7CiAKLQkJaWYgKG9sZF9wcmltYXJ5X3N0YXRlLT5iYXNlLnZpc2libGUgJiYKLQkJICAg IChtb2Rlc2V0IHx8ICFwcmltYXJ5X3N0YXRlLT5iYXNlLnZpc2libGUpKQorCQlpZiAob2xkX3By aW1hcnlfc3RhdGUtPnZpc2libGUgJiYKKwkJICAgIChtb2Rlc2V0IHx8ICFuZXdfcHJpbWFyeV9z dGF0ZS0+dmlzaWJsZSkpCiAJCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNl KTsKIAl9CiAKQEAgLTEwODIyLDcgKzEwODE5LDcgQEAgc3RhdGljIGJvb2wgY2hlY2tfZGlnaXRh bF9wb3J0X2NvbmZsaWN0cyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCXN0cnVj dCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7CiAJCXN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyOwogCi0JCWNvbm5lY3Rvcl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4 aXN0aW5nX2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yKTsKKwkJY29ubmVjdG9yX3N0 YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9y KTsKIAkJaWYgKCFjb25uZWN0b3Jfc3RhdGUpCiAJCQljb25uZWN0b3Jfc3RhdGUgPSBjb25uZWN0 b3ItPnN0YXRlOwogCkBAIC0xMTAzOSwxNSArMTEwMzYsMTUgQEAgaW50ZWxfbW9kZXNldF91cGRh dGVfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAkvKiBEb3Vi bGUgY2hlY2sgc3RhdGUuICovCiAJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy dGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5l X3N0YXRlOwogCQl0b19pbnRlbF9jcnRjKGNydGMpLT5jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0 YXRlKG5ld19jcnRjX3N0YXRlKTsKIAogCQkvKgogCQkgKiBVcGRhdGUgbGVnYWN5IHN0YXRlIHRv IHNhdGlzZnkgZmJjIGNvZGUuIFRoaXMgY2FuCiAJCSAqIGJlIHJlbW92ZWQgd2hlbiBmYmMgdXNl cyB0aGUgYXRvbWljIHN0YXRlLgogCQkgKi8KLQkJaWYgKGRybV9hdG9taWNfZ2V0X2V4aXN0aW5n X3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLT5wcmltYXJ5KSkgewotCQkJc3RydWN0IGRybV9wbGFu ZV9zdGF0ZSAqcGxhbmVfc3RhdGUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZTsKLQorCQlwbGFuZV9z dGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0Yy0+cHJpbWFy eSk7CisJCWlmIChwbGFuZV9zdGF0ZSkgewogCQkJY3J0Yy0+cHJpbWFyeS0+ZmIgPSBwbGFuZV9z dGF0ZS0+ZmI7CiAJCQljcnRjLT54ID0gcGxhbmVfc3RhdGUtPnNyY194ID4+IDE2OwogCQkJY3J0 Yy0+eSA9IHBsYW5lX3N0YXRlLT5zcmNfeSA+PiAxNjsKQEAgLTEyMjUwLDYgKzEyMjQ3LDkgQEAg c3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRlKG5l d19jcnRjX3N0YXRlKTsKIAlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0 YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSA9CisJCWlu dGVsX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKG9sZF9jcnRjX3N0YXRlLT5zdGF0ZSwKKwkJ CQkJCSB0b19pbnRlbF9wbGFuZShjcnRjLT5wcmltYXJ5KSk7CiAKIAlpZiAobW9kZXNldCkgewog CQl1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KGludGVsX2NydGMpOwpAQCAtMTIyNTksMTEgKzEyMjU5 LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCQkJCSAgICAgICBwaXBlX2NvbmZpZyk7CiAJfQogCi0JaWYgKGRybV9hdG9taWNfZ2V0X2V4 aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLT5wcmltYXJ5KSkgewotCQlpbnRlbF9mYmNf ZW5hYmxlKAotCQkgICAgaW50ZWxfY3J0YywgcGlwZV9jb25maWcsCi0JCSAgICB0b19pbnRlbF9w bGFuZV9zdGF0ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSkpOwotCX0KKwlpZiAobmV3X3BsYW5lX3N0 YXRlKQorCQlpbnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMsIHBpcGVfY29uZmlnLCBuZXdfcGxh bmVfc3RhdGUpOwogCiAJZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKG9s ZF9jcnRjX3N0YXRlKTsKIApAQCAtMTI3MzksNyArMTI3MzYsNyBAQCBpbnRlbF9wcmVwYXJlX3Bs YW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJaWYgKG9sZF9vYmopIHsKIAkJc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KLQkJCWRybV9hdG9taWNfZ2V0X2V4aXN0 aW5nX2NydGNfc3RhdGUobmV3X3N0YXRlLT5zdGF0ZSwKKwkJCWRybV9hdG9taWNfZ2V0X25ld19j cnRjX3N0YXRlKG5ld19zdGF0ZS0+c3RhdGUsCiAJCQkJCQkJICAgcGxhbmUtPnN0YXRlLT5jcnRj KTsKIAogCQkvKiBCaWcgSGFtbWVyLCB3ZSBhbHNvIG5lZWQgdG8gZW5zdXJlIHRoYXQgYW55IHBl bmRpbmcKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==