From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Remove early return in prepare/cleanup plane Date: Mon, 8 Aug 2016 13:23:22 +0200 Message-ID: <1470655403-24036-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1470655403-24036-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 969966E0EC for ; Mon, 8 Aug 2016 11:23:28 +0000 (UTC) In-Reply-To: <1470655403-24036-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 VGhpcyBpcyBhIG5vb3AgaW4gcHJlcGFyZV9wbGFuZSwgd2hpY2ggYWxyZWFkeSBjYXJlZnVsbHkg aGFuZGxlcyB0aGlzCndpdGggaWYgZ3VhcmRzIGFuZCBlYXJseSByZXR1cm4uCgpjbGVhbnVwX3Bs YW5lX2ZiIGhhcyBpdCBhcyBhIG5vb3AgdG9vLCBpdCBvbmx5IHVucGlucyBvbGRfZmIgYW5kCnVu c2V0cyB3YWl0X3JlcS4gVGhlIGxhdHRlciBpcyBhIG5vb3AgYmVjYXVzZSBwcmVwYXJlX3BsYW5l IHdvbid0CnNldCB3YWl0X3JlcSB3aGVuIG9iaiA9PSBOVUxMLiBJdCdzIGFsc28gZGFuZ2Vyb3Vz IHRvIGtlZXAgYmVjYXVzZQpwbGFuZS0+c3RhdGUgbWF5IGNoYW5nZSBiZWZvcmUgY2xlYW51cF9w bGFuZV9mYiBpcyBjYWxsZWQuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyB8IDEyICsrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5z ZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IGIxMmM4MzAyNTgwZi4uZjU2NzA3Mjg5NjE1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC0xNDExNyw5ICsxNDExNyw2IEBAIGludGVsX3ByZXBhcmVfcGxh bmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IHJlc2VydmF0aW9uX29iamVj dCAqcmVzdjsKIAlpbnQgcmV0ID0gMDsKIAotCWlmICghb2JqICYmICFvbGRfb2JqKQotCQlyZXR1 cm4gMDsKLQogCWlmIChvbGRfb2JqKSB7CiAJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSA9CiAJCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKG5ld19zdGF0ZS0+ c3RhdGUsIHBsYW5lLT5zdGF0ZS0+Y3J0Yyk7CkBAIC0xNDE5MywxNSArMTQxOTAsMTAgQEAgaW50 ZWxfY2xlYW51cF9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJICAgICAgIGNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9p bnRlbF9zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRlID0gdG9f aW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2xkX29iaiA9IGludGVsX2ZiX29iaihvbGRfc3RhdGUtPmZiKTsKLQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKHBsYW5lLT5zdGF0ZS0+ZmIpOwot Ci0Jb2xkX2ludGVsX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUob2xkX3N0YXRlKTsKLQot CWlmICghb2JqICYmICFvbGRfb2JqKQotCQlyZXR1cm47CisJc3RydWN0IGludGVsX3BsYW5lX3N0 YXRlICpvbGRfaW50ZWxfc3RhdGUgPQorCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfc3RhdGUp OwogCiAJaWYgKG9sZF9vYmogJiYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNP UiB8fAogCSAgICAhSU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpKQotLSAK Mi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=