From: Tvrtko Ursulin Subject: [PATCH 3/4] igt_kms: Merge condition in igt_plane_set_fb Date: Tue, 12 May 2015 11:06:36 +0100 Message-ID: <1431425197-29991-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1431425197-29991-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 70B996E2FE for ; Tue, 12 May 2015 03:06:57 -0700 (PDT) In-Reply-To: <1431425197-29991-1-git-send-email-tvrtko.ursulin@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 Cc: Thomas Wood List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZXJlIHdl cmUgdHdvIHBhdGhzIGZvciBmYiBhbmQgIWZiLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IGNoYW5kcmEga29uZHVy dSA8Y2hhbmRyYS5rb25kdXJ1QGludGVsLmNvbT4KQ2M6IFRob21hcyBXb29kIDx0aG9tYXMud29v ZEBpbnRlbC5jb20+Ci0tLQogbGliL2lndF9rbXMuYyB8IDExICsrKy0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xp Yi9pZ3Rfa21zLmMgYi9saWIvaWd0X2ttcy5jCmluZGV4IDMzZDQzN2QuLmI1YmEyNzMgMTAwNjQ0 Ci0tLSBhL2xpYi9pZ3Rfa21zLmMKKysrIGIvbGliL2lndF9rbXMuYwpAQCAtMTc2NSwxNCArMTc2 NSw2IEBAIHZvaWQgaWd0X3BsYW5lX3NldF9mYihpZ3RfcGxhbmVfdCAqcGxhbmUsIHN0cnVjdCBp Z3RfZmIgKmZiKQogCXBsYW5lLT5mYiA9IGZiOwogCS8qIGhhY2sgdG8ga2VlcCB0ZXN0cyB3b3Jr aW5nIHRoYXQgZG9uJ3QgY2FsbCBpZ3RfcGxhbmVfc2V0X3NpemUoKSAqLwogCWlmIChmYikgewot CQlwbGFuZS0+Y3J0Y193ID0gZmItPndpZHRoOwotCQlwbGFuZS0+Y3J0Y19oID0gZmItPmhlaWdo dDsKLQl9IGVsc2UgewotCQlwbGFuZS0+Y3J0Y193ID0gMDsKLQkJcGxhbmUtPmNydGNfaCA9IDA7 Ci0JfQotCi0JaWYgKGZiKSB7CiAJCS8qIHNldCBkZWZhdWx0IHBsYW5lIHBvcy9zaXplIGFzIGZi IHNpemUgKi8KIAkJcGxhbmUtPmNydGNfeCA9IDA7CiAJCXBsYW5lLT5jcnRjX3kgPSAwOwpAQCAt MTc4NCw2ICsxNzc2LDkgQEAgdm9pZCBpZ3RfcGxhbmVfc2V0X2ZiKGlndF9wbGFuZV90ICpwbGFu ZSwgc3RydWN0IGlndF9mYiAqZmIpCiAJCWZiLT5zcmNfeSA9IDA7CiAJCWZiLT5zcmNfdyA9IGZi LT53aWR0aDsKIAkJZmItPnNyY19oID0gZmItPmhlaWdodDsKKwl9IGVsc2UgeworCQlwbGFuZS0+ Y3J0Y193ID0gMDsKKwkJcGxhbmUtPmNydGNfaCA9IDA7CiAJfQogCiAJcGxhbmUtPmZiX2NoYW5n ZWQgPSB0cnVlOwotLSAKMi40LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==