From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 23/27] drm/i915: Remove transitional references from intel_plane_atomic_check. Date: Thu, 4 Jun 2015 14:47:53 +0200 Message-ID: <1433422077-14907-24-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433422077-14907-1-git-send-email-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 43D446EAC2 for ; Thu, 4 Jun 2015 05:48:13 -0700 (PDT) In-Reply-To: <1433422077-14907-1-git-send-email-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 QWxsIHRyYW5zaXRpb25hbCBwbGFuZSBoZWxwZXJzIGFyZSBnb25lLCBwYXJ0eSEKClNpZ25lZC1v ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAyMiAr KysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwg MTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUu YwppbmRleCA5YWYxMDUzYWU4YWEuLjZkNWVkZThhOWJmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTEzMSwxNiArMTMxLDE2IEBAIHN0YXRpYyBpbnQg aW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmICgh Y3J0YykKIAkJcmV0dXJuIDA7CiAKLQkvKiBGSVhNRTogdGVtcG9yYXJ5IGhhY2sgbmVjZXNzYXJ5 IHdoaWxlIHdlIHN0aWxsIHVzZSB0aGUgcGxhbmUgdXBkYXRlCi0JICogaGVscGVyLiAqLwotCWlm IChzdGF0ZS0+c3RhdGUpIHsKLQkJY3J0Y19zdGF0ZSA9Ci0JCQlpbnRlbF9hdG9taWNfZ2V0X2Ny dGNfc3RhdGUoc3RhdGUtPnN0YXRlLCBpbnRlbF9jcnRjKTsKLQkJaWYgKElTX0VSUihjcnRjX3N0 YXRlKSkKLQkJCXJldHVybiBQVFJfRVJSKGNydGNfc3RhdGUpOwotCX0gZWxzZSB7Ci0JCWNydGNf c3RhdGUgPSBpbnRlbF9jcnRjLT5jb25maWc7Ci0JfQorCS8qCisJICogTm9ybWFsbHkgd2UgY291 bGQgdXNlIGdldF9leGlzdGluZ19jcnRjX3N0YXRlLCBidXQgdGhlIGluaXRpYWwgaHcKKwkgKiBy ZWFkb3V0IHBhdGggb25seSBzZXRzIHBsYW5lLT5jcnRjLCB3aGljaCBpcyBub3QgcGlja2VkIHVw IGJ5IHRoZQorCSAqIGF0b21pYyBjb3JlLiBJdCdzIGZvcmJpZGRlbiB0byBzZXQgc3RhdGUtPmNy dGMgd2l0aG91dCBhIHZhbGlkCisJICogc3RhdGUtPmZiLCBzbyBnZXR0aW5nIGNydGMgc3RhdGUg aGVyZSBpcyB0aGUgYmVzdCB3ZSBjYW4gZG8uLgorCSAqLworCWNydGNfc3RhdGUgPSBpbnRlbF9h dG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUtPnN0YXRlLCBpbnRlbF9jcnRjKTsKKwlpZiAoSVNf RVJSKGNydGNfc3RhdGUpKQorCQlyZXR1cm4gUFRSX0VSUihjcnRjX3N0YXRlKTsKKwljcnRjX3N0 YXRlLT5iYXNlLnBsYW5lc19jaGFuZ2VkID0gdHJ1ZTsKIAogCS8qCiAJICogVGhlIG9yaWdpbmFs IHNyYy9kZXN0IGNvb3JkaW5hdGVzIGFyZSBzdG9yZWQgaW4gc3RhdGUtPmJhc2UsIGJ1dApAQCAt MTg5LDcgKzE4OSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCX0KIAogCXJldCA9IGludGVsX3BsYW5lLT5jaGVja19wbGFu ZShwbGFuZSwgY3J0Y19zdGF0ZSwgaW50ZWxfc3RhdGUpOwotCWlmIChyZXQgfHwgIXN0YXRlLT5z dGF0ZSkKKwlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJcmV0dXJuIGludGVsX3BsYW5lX2F0 b21pY19jYWxjX2NoYW5nZXMoJmNydGNfc3RhdGUtPmJhc2UsIHN0YXRlKTsKLS0gCjIuMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=