From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 9/9] drm/i915: Eliminate redundancy in intel_primary_plane_create() Date: Tue, 8 Oct 2019 19:14:41 +0300 Message-ID: <20191008161441.12721-9-ville.syrjala@linux.intel.com> References: <20191008161441.12721-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4984B6E858 for ; Tue, 8 Oct 2019 16:15:07 +0000 (UTC) In-Reply-To: <20191008161441.12721-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxv dHMgb2YgcmVkdW5kYW50IGFzc2lnbm1lbnRzIGluc2lkZSBpbnRlbF9wcmltYXJ5X3BsYW5lX2Ny ZWF0ZSgpLgpHZXQgcmlkIG9mIHRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIHwgNDMgKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IGM1NTNhMzQxNzg5MS4u MmFjZWM4MzhmYjhlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuYwpAQCAtMTQ4NzMsNyArMTQ4NzMsNiBAQCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0 ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCWNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgKnBsYW5lX2Z1bmNzOwogCXVuc2lnbmVkIGludCBz dXBwb3J0ZWRfcm90YXRpb25zOwogCXVuc2lnbmVkIGludCBwb3NzaWJsZV9jcnRjczsKLQljb25z dCB1NjQgKm1vZGlmaWVyczsKIAljb25zdCB1MzIgKmZvcm1hdHM7CiAJaW50IG51bV9mb3JtYXRz OwogCWludCByZXQsIHpwb3M7CkBAIC0xNDkwOCw1MyArMTQ5MDcsMzkgQEAgaW50ZWxfcHJpbWFy eV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBp cGUgcGlwZSkKIAlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhk ZXZfcHJpdikpIHsKIAkJZm9ybWF0cyA9IHZsdl9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3Jt YXRzID0gQVJSQVlfU0laRSh2bHZfcHJpbWFyeV9mb3JtYXRzKTsKLQkJbW9kaWZpZXJzID0gaTl4 eF9mb3JtYXRfbW9kaWZpZXJzOwotCi0JCXBsYW5lLT5tYXhfc3RyaWRlID0gaTl4eF9wbGFuZV9t YXhfc3RyaWRlOwotCQlwbGFuZS0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRhdGVfcGxhbmU7Ci0J CXBsYW5lLT5kaXNhYmxlX3BsYW5lID0gaTl4eF9kaXNhYmxlX3BsYW5lOwotCQlwbGFuZS0+Z2V0 X2h3X3N0YXRlID0gaTl4eF9wbGFuZV9nZXRfaHdfc3RhdGU7Ci0JCXBsYW5lLT5jaGVja19wbGFu ZSA9IGk5eHhfcGxhbmVfY2hlY2s7Ci0KLQkJcGxhbmVfZnVuY3MgPSAmaTk2NV9wbGFuZV9mdW5j czsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkgewogCQlmb3JtYXRzID0g aTk2NV9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpOTY1X3By aW1hcnlfZm9ybWF0cyk7Ci0JCW1vZGlmaWVycyA9IGk5eHhfZm9ybWF0X21vZGlmaWVyczsKLQot CQlwbGFuZS0+bWF4X3N0cmlkZSA9IGk5eHhfcGxhbmVfbWF4X3N0cmlkZTsKLQkJcGxhbmUtPnVw ZGF0ZV9wbGFuZSA9IGk5eHhfdXBkYXRlX3BsYW5lOwotCQlwbGFuZS0+ZGlzYWJsZV9wbGFuZSA9 IGk5eHhfZGlzYWJsZV9wbGFuZTsKLQkJcGxhbmUtPmdldF9od19zdGF0ZSA9IGk5eHhfcGxhbmVf Z2V0X2h3X3N0YXRlOwotCQlwbGFuZS0+Y2hlY2tfcGxhbmUgPSBpOXh4X3BsYW5lX2NoZWNrOwot Ci0JCXBsYW5lX2Z1bmNzID0gJmk5NjVfcGxhbmVfZnVuY3M7CiAJfSBlbHNlIHsKIAkJZm9ybWF0 cyA9IGk4eHhfcHJpbWFyeV9mb3JtYXRzOwogCQludW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoaTh4 eF9wcmltYXJ5X2Zvcm1hdHMpOwotCQltb2RpZmllcnMgPSBpOXh4X2Zvcm1hdF9tb2RpZmllcnM7 Ci0KLQkJcGxhbmUtPm1heF9zdHJpZGUgPSBpOXh4X3BsYW5lX21heF9zdHJpZGU7Ci0JCXBsYW5l LT51cGRhdGVfcGxhbmUgPSBpOXh4X3VwZGF0ZV9wbGFuZTsKLQkJcGxhbmUtPmRpc2FibGVfcGxh bmUgPSBpOXh4X2Rpc2FibGVfcGxhbmU7Ci0JCXBsYW5lLT5nZXRfaHdfc3RhdGUgPSBpOXh4X3Bs YW5lX2dldF9od19zdGF0ZTsKLQkJcGxhbmUtPmNoZWNrX3BsYW5lID0gaTl4eF9wbGFuZV9jaGVj azsKKwl9CiAKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KQorCQlwbGFuZV9mdW5jcyA9 ICZpOTY1X3BsYW5lX2Z1bmNzOworCWVsc2UKIAkJcGxhbmVfZnVuY3MgPSAmaTh4eF9wbGFuZV9m dW5jczsKLQl9CisKKwlwbGFuZS0+bWF4X3N0cmlkZSA9IGk5eHhfcGxhbmVfbWF4X3N0cmlkZTsK KwlwbGFuZS0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRhdGVfcGxhbmU7CisJcGxhbmUtPmRpc2Fi bGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfcGxhbmU7CisJcGxhbmUtPmdldF9od19zdGF0ZSA9IGk5 eHhfcGxhbmVfZ2V0X2h3X3N0YXRlOworCXBsYW5lLT5jaGVja19wbGFuZSA9IGk5eHhfcGxhbmVf Y2hlY2s7CiAKIAlwb3NzaWJsZV9jcnRjcyA9IEJJVChwaXBlKTsKIAogCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDUgfHwgSVNfRzRYKGRldl9wcml2KSkKIAkJcmV0ID0gZHJtX3VuaXZlcnNh bF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ZHJtLCAmcGxhbmUtPmJhc2UsCiAJCQkJCSAgICAgICBw b3NzaWJsZV9jcnRjcywgcGxhbmVfZnVuY3MsCi0JCQkJCSAgICAgICBmb3JtYXRzLCBudW1fZm9y bWF0cywgbW9kaWZpZXJzLAorCQkJCQkgICAgICAgZm9ybWF0cywgbnVtX2Zvcm1hdHMsCisJCQkJ CSAgICAgICBpOXh4X2Zvcm1hdF9tb2RpZmllcnMsCiAJCQkJCSAgICAgICBEUk1fUExBTkVfVFlQ RV9QUklNQVJZLAogCQkJCQkgICAgICAgInByaW1hcnkgJWMiLCBwaXBlX25hbWUocGlwZSkpOwog CWVsc2UKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ZHJtLCAm cGxhbmUtPmJhc2UsCiAJCQkJCSAgICAgICBwb3NzaWJsZV9jcnRjcywgcGxhbmVfZnVuY3MsCi0J CQkJCSAgICAgICBmb3JtYXRzLCBudW1fZm9ybWF0cywgbW9kaWZpZXJzLAorCQkJCQkgICAgICAg Zm9ybWF0cywgbnVtX2Zvcm1hdHMsCisJCQkJCSAgICAgICBpOXh4X2Zvcm1hdF9tb2RpZmllcnMs CiAJCQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9QUklNQVJZLAogCQkJCQkgICAgICAgInBsYW5l ICVjIiwKIAkJCQkJICAgICAgIHBsYW5lX25hbWUocGxhbmUtPmk5eHhfcGxhbmUpKTsKLS0gCjIu MjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4