From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 18/19] drm/i915: Remove transitional references from intel_plane_atomic_check. Date: Mon, 15 Jun 2015 12:33:55 +0200 Message-ID: <1434364436-6366-19-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434364436-6366-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 F058E6E73C for ; Mon, 15 Jun 2015 03:34:14 -0700 (PDT) In-Reply-To: <1434364436-6366-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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAxOSAr KysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAxMyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCmlu ZGV4IDEwYThlY2VkYzk0Mi4uZjFhYjhlNGI5YzExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTE1LDYgKzExNSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf cGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxh bmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpp bnRlbF9zdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKTsKKwlzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKmRybV9jcnRjX3N0YXRlOwogCWludCByZXQ7CiAKIAljcnRjID0gY3J0YyA/IGNy dGMgOiBwbGFuZS0+c3RhdGUtPmNydGM7CkBAIC0xMjksMTkgKzEzMCwxMSBAQCBzdGF0aWMgaW50 IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAo IWNydGMpCiAJCXJldHVybiAwOwogCi0JLyogRklYTUU6IHRlbXBvcmFyeSBoYWNrIG5lY2Vzc2Fy eSB3aGlsZSB3ZSBzdGlsbCB1c2UgdGhlIHBsYW5lIHVwZGF0ZQotCSAqIGhlbHBlci4gKi8KLQlp ZiAoc3RhdGUtPnN0YXRlKSB7Ci0JCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqZHJtX2NydGNfc3Rh dGUgPQotCQkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZS0+c3RhdGUs IGNydGMpOworCWRybV9jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19z dGF0ZShzdGF0ZS0+c3RhdGUsIGNydGMpOworCWlmIChXQVJOX09OKCFkcm1fY3J0Y19zdGF0ZSkp CisJCXJldHVybiAtRUlOVkFMOwogCi0JCWlmIChXQVJOX09OKCFkcm1fY3J0Y19zdGF0ZSkpCi0J CQlyZXR1cm4gLUVJTlZBTDsKLQotCQljcnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShk cm1fY3J0Y19zdGF0ZSk7Ci0JfSBlbHNlIHsKLQkJY3J0Y19zdGF0ZSA9IGludGVsX2NydGMtPmNv bmZpZzsKLQl9CisJY3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoZHJtX2NydGNfc3Rh dGUpOwogCiAJLyoKIAkgKiBUaGUgb3JpZ2luYWwgc3JjL2Rlc3QgY29vcmRpbmF0ZXMgYXJlIHN0 b3JlZCBpbiBzdGF0ZS0+YmFzZSwgYnV0CkBAIC0xOTEsNyArMTg0LDcgQEAgc3RhdGljIGludCBp bnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAlpbnRl bF9zdGF0ZS0+dmlzaWJsZSA9IGZhbHNlOwogCXJldCA9IGludGVsX3BsYW5lLT5jaGVja19wbGFu ZShwbGFuZSwgY3J0Y19zdGF0ZSwgaW50ZWxfc3RhdGUpOwotCWlmIChyZXQgfHwgIXN0YXRlLT5z dGF0ZSkKKwlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJcmV0dXJuIGludGVsX3BsYW5lX2F0 b21pY19jYWxjX2NoYW5nZXMoJmNydGNfc3RhdGUtPmJhc2UsIHN0YXRlKTsKLS0gCjIuMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=