From: Tvrtko Ursulin Subject: [PATCH i-g-t 2/4] igt_kms: Merge condition in igt_plane_set_fb Date: Tue, 5 May 2015 10:53:21 +0100 Message-ID: <1430819603-492-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1430819603-492-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id EA2D56E486 for ; Tue, 5 May 2015 02:53:28 -0700 (PDT) In-Reply-To: <1430819603-492-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 aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IGNoYW5kcmEga29uZHVydSA8Y2hhbmRy YS5rb25kdXJ1QGludGVsLmNvbT4KQ2M6IFRob21hcyBXb29kIDx0aG9tYXMud29vZEBpbnRlbC5j b20+Ci0tLQogbGliL2lndF9rbXMuYyB8IDExICsrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21z LmMgYi9saWIvaWd0X2ttcy5jCmluZGV4IDMzZDQzN2QuLmI1YmEyNzMgMTAwNjQ0Ci0tLSBhL2xp Yi9pZ3Rfa21zLmMKKysrIGIvbGliL2lndF9rbXMuYwpAQCAtMTc2NSwxNCArMTc2NSw2IEBAIHZv aWQgaWd0X3BsYW5lX3NldF9mYihpZ3RfcGxhbmVfdCAqcGxhbmUsIHN0cnVjdCBpZ3RfZmIgKmZi KQogCXBsYW5lLT5mYiA9IGZiOwogCS8qIGhhY2sgdG8ga2VlcCB0ZXN0cyB3b3JraW5nIHRoYXQg ZG9uJ3QgY2FsbCBpZ3RfcGxhbmVfc2V0X3NpemUoKSAqLwogCWlmIChmYikgewotCQlwbGFuZS0+ Y3J0Y193ID0gZmItPndpZHRoOwotCQlwbGFuZS0+Y3J0Y19oID0gZmItPmhlaWdodDsKLQl9IGVs c2UgewotCQlwbGFuZS0+Y3J0Y193ID0gMDsKLQkJcGxhbmUtPmNydGNfaCA9IDA7Ci0JfQotCi0J aWYgKGZiKSB7CiAJCS8qIHNldCBkZWZhdWx0IHBsYW5lIHBvcy9zaXplIGFzIGZiIHNpemUgKi8K IAkJcGxhbmUtPmNydGNfeCA9IDA7CiAJCXBsYW5lLT5jcnRjX3kgPSAwOwpAQCAtMTc4NCw2ICsx Nzc2LDkgQEAgdm9pZCBpZ3RfcGxhbmVfc2V0X2ZiKGlndF9wbGFuZV90ICpwbGFuZSwgc3RydWN0 IGlndF9mYiAqZmIpCiAJCWZiLT5zcmNfeSA9IDA7CiAJCWZiLT5zcmNfdyA9IGZiLT53aWR0aDsK IAkJZmItPnNyY19oID0gZmItPmhlaWdodDsKKwl9IGVsc2UgeworCQlwbGFuZS0+Y3J0Y193ID0g MDsKKwkJcGxhbmUtPmNydGNfaCA9IDA7CiAJfQogCiAJcGxhbmUtPmZiX2NoYW5nZWQgPSB0cnVl OwotLSAKMi4zLjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==