From: Jani Nikula Subject: [dim PATCH 2/2] dim: rewrite dim_cherry_pick_branch Date: Tue, 14 Mar 2017 18:03:55 +0200 Message-ID: <1489507435-12456-2-git-send-email-jani.nikula@intel.com> References: <1489507435-12456-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48A6E6E797 for ; Tue, 14 Mar 2017 16:04:10 +0000 (UTC) In-Reply-To: <1489507435-12456-1-git-send-email-jani.nikula@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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyBpcyB3aGF0IEkgY3VycmVudGx5IHVzZSBmb3IgY2hlcnJ5LXBpY2tpbmcgZml4ZXMuIENv bXBsZXRlbHkKbm9uLWludGVyYWN0aXZlIGFuZCBzdGF0ZWxlc3MuCgpTaWduZWQtb2ZmLWJ5OiBK YW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRpbSB8IDkzICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RpbSBiL2RpbQppbmRleCA2MjFmNjA0NzE2OTcuLmE2OGNjMjhmZDRiMiAx MDA3NTUKLS0tIGEvZGltCisrKyBiL2RpbQpAQCAtNzAxLDYzICs3MDEsOTIgQEAgZnVuY3Rpb24g ZGltX2NoZXJyeV9waWNrCiAJJERSWSBnaXQgY2hlcnJ5LXBpY2sgLXMgLXggLWUgJDEKIH0KIAor ZnVuY3Rpb24gZ2l0X2xpc3RfZml4ZXMKK3sKKwlnaXQgbG9nIC0tcmV2ZXJzZSAtLWZvcm1hdD1m b3JtYXQ6JUggLS1yZWdleHAtaWdub3JlLWNhc2UgXAorCSAgICAtLWdyZXA9Il5DYzouKmRybS1p bnRlbC1maXhlc0BsaXN0c1wuZnJlZWRlc2t0b3BcLm9yZyIgXAorCSAgICAtLWdyZXA9Il5DYzou KnN0YWJsZUB2Z2VyXC5rZXJuZWxcLm9yZyIgXAorCSAgICAtLWdyZXA9Il5GaXhlczogIiBcCisJ ICAgICIkQCIKK30KKwogZnVuY3Rpb24gZGltX2NoZXJyeV9waWNrX2JyYW5jaAogeworCWxvY2Fs IGJyYW5jaCBsb2cgZmFpbF9sb2cgbmVlZGVkIGhhdmVfZml4ZXMKKworCWJyYW5jaD0iJDEiCisJ bG9nPSQobWt0ZW1wKQorCWZhaWxfbG9nPSQobWt0ZW1wKQorCiAJIyBMb29rIGZvciBjb21taXRz IGluIGRpbnEgdGFnZ2VkIGFzIGZpeGVzLgotCWZvciBjb21taXQgaW4gJChnaXQgbG9nIC0tcmV2 ZXJzZSAtLWZvcm1hdD1mb3JtYXQ6JWggLS1ncmVwPSJkcm0taW50ZWwtZml4ZXNAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnIiAtLWdyZXA9InN0YWJsZUB2Z2VyLmtlcm5lbC5vcmciIG9yaWdpbi9tYXN0 ZXIuLiRESU1fRFJNX0lOVEVMX1JFTU9URS9kcm0taW50ZWwtbmV4dC1xdWV1ZWQgLS0gZHJpdmVy cy9ncHUvZHJtL2k5MTUpOyBkbwotCQllY2hvICJDb25zaWRlcmluZyAkKGdpdCAtLW5vLXBhZ2Vy IGxvZyAtLW9uZWxpbmUgLTEgJGNvbW1pdCkiCi0JCWxvZz0kKG1rdGVtcCkKKwlmb3IgY29tbWl0 IGluICQoZ2l0X2xpc3RfZml4ZXMgJERJTV9EUk1fSU5URUxfUkVNT1RFLyRicmFuY2guLiRESU1f RFJNX0lOVEVMX1JFTU9URS9kcm0taW50ZWwtbmV4dC1xdWV1ZWQgLS0gZHJpdmVycy9ncHUvZHJt L2k5MTUpOyBkbworCQllY2hvIC1uICJDb25zaWRlcmluZyAkKGRpbV9jaXRlICRjb21taXQpLi4u ICIKIAogCQkjIExvb2sgYXQgaGlzdG9yeSBmb3IgYWxyZWFkeSBjaGVycnktcGlja2VkIGZpeGVz LgogCQkjIE5vdGU6IHVzZSAqbG9jYWwqIGJyYW5jaGVzIHRvIGFjY291bnQgZm9yIHVucHVzaGVk IGNvbW1pdHMuCi0JCWdpdCBsb2cgZHJtLWludGVsLWZpeGVzIC0tYWZ0ZXI9MTJtb250aHMgLS1v bmVsaW5lIFwKKwkJZ2l0IGxvZyBkcm0taW50ZWwtZml4ZXMgLS1mb3JtYXQ9Zm9ybWF0OiVoIC0t YWZ0ZXI9Nm1vbnRocyBcCiAJCSAgICAtLWdyZXA9ImNoZXJyeSBwaWNrZWQgLiogJGNvbW1pdCIg PiAkbG9nCiAJCWlmIFsgIiQoY2F0ICRsb2cpIiA9ICIiIF07IHRoZW4KLQkJCWdpdCBsb2cgZHJt LWludGVsLW5leHQtZml4ZXMgLS1hZnRlcj0xMm1vbnRocyAtLW9uZWxpbmUgXAorCQkJZ2l0IGxv ZyBkcm0taW50ZWwtbmV4dC1maXhlcyAtLWZvcm1hdD1mb3JtYXQ6JWggLS1hZnRlcj02bW9udGhz IFwKIAkJCSAgICAtLWdyZXA9ImNoZXJyeSBwaWNrZWQgLiogJGNvbW1pdCIgPiAkbG9nCiAJCWZp CiAKLQkJaWYgWyAiJChjYXQgJGxvZykiID0gIiIgXTsgdGhlbgotCQkJIyBUcnkgY2hlcnJ5LXBp Y2ssIG9mZmVyIG9wdGlvbnMgb24gZmFpbC4KLQkJCWlmICEgZ2l0IGNoZXJyeS1waWNrIC1lIC14 IC1zICRjb21taXQ7IHRoZW4KLQkJCQlzZWxlY3QgY2hvaWNlIGluICJEaWZmIiAiUmVzb2x2ZSIg IlNraXAiICJBYm9ydCI7IGRvCi0JCQkJCWNhc2UgJGNob2ljZSBpbgotCQkJCQkJRGlmZikKLQkJ CQkJCQlnaXQgZGlmZgotCQkJCQkJCTs7Ci0JCQkJCQlSZXNvbHZlKQotCQkJCQkJCWV4aXQKLQkJ CQkJCQk7OwotCQkJCQkJU2tpcCkKLQkJCQkJCQlnaXQgY2hlcnJ5LXBpY2sgLS1hYm9ydAotCQkJ CQkJCWJyZWFrCi0JCQkJCQkJOzsKLQkJCQkJCUFib3J0KQotCQkJCQkJCWdpdCBjaGVycnktcGlj ayAtLWFib3J0Ci0JCQkJCQkJZXhpdAotCQkJCQkJCTs7Ci0JCQkJCWVzYWMKLQkJCQlkb25lCisJ CWlmIFsgIiQoY2F0ICRsb2cpIiAhPSAiIiBdOyB0aGVuCisJCQllY2hvICJBbHJlYWR5IGJhY2tw b3J0ZWQgYXMgJCh0ciAiXG4iICIgIiA8ICRsb2cpLiBPSy4iCisJCQljb250aW51ZQorCQlmaQor CisJCWhhdmVfZml4ZXM9CisJCW5lZWRlZD0KKwkJZm9yIGZpeGVzIGluICQoZ2l0IHNob3cgLXMg JGNvbW1pdCB8IGdyZXAgLWkgIl4gICAgRml4ZXM6ICpbMC05YS1mQS1GXSIgfCBzZWQgJ3MvXiAq W0ZmXWl4ZXM6ICpcKFswLTlhLWZBLUZdXCtcKS4qL1wxLycpOyBkbworCQkJaGF2ZV9maXhlcz0x CisJCQlmaXhlcz0kKGdpdCBsb2cgLTEgLS1mb3JtYXQ9Zm9ybWF0OiVIICRmaXhlcyAyPi9kZXYv bnVsbCB8fCB0cnVlKQorCQkJaWYgW1sgLXogIiRmaXhlcyIgXV07IHRoZW4KKwkJCQljb250aW51 ZQogCQkJZmkKLQkJZWxzZQotCQkJZWNobyAiQWxyZWFkeSBiYWNrcG9ydGVkIGFzOiIKLQkJCXNl ZCAncy9eL1x0LycgPCAkbG9nCisKKwkJCSMgRklYTUU6IHNlZSBpZiB0aGUgY29tbWl0IHRvIGJl IGZpeGVkIGhhcyBiZWVuCisJCQkjIGJhY2twb3J0ZWQhCisJCQllY2hvIC1uICJGaXhlczogJChk aW1fY2l0ZSAkZml4ZXMpLiAiCisJCQlpZiBbWyAiJChnaXQgbWVyZ2UtYmFzZSAkYnJhbmNoICRm aXhlcykiID0gIiRmaXhlcyIgXV07IHRoZW4KKwkJCQluZWVkZWQ9MQorCQkJZmkKKwkJZG9uZQor CisJCSMgTm90ZTogQ2M6IHN0YWJsZSB3aWxsIG92ZXJydWxlIEZpeGVzOgorCQlpZiBbWyAtbiAi JGhhdmVfZml4ZXMiICYmIC16ICIkbmVlZGVkIiBdXTsgdGhlbgorCQkJZWNobyAiRml4ZXMgYSBj b21taXQgbm90IGluICRicmFuY2guIE9LLiIKKwkJCWNvbnRpbnVlCiAJCWZpCiAKLQkJcm0gLWYg JGxvZworCQllY2hvICJUcnkgdG8gY2hlcnJ5LXBpY2suIgorCQljb21taXRfbGlzdF9yZWZlcmVu Y2VzICRjb21taXQKKwkJaWYgISBnaXQgY2hlcnJ5LXBpY2sgLXggLXMgJGNvbW1pdDsgdGhlbgor CQkJZWNobyAiRkFJTEVEOiAkKGRpbV9jaXRlICRjb21taXQpIgorCQkJZWNobyAiJChkaW1fY2l0 ZSAkY29tbWl0KSIgPj4gJGZhaWxfbG9nCisJCQlnaXQgY2hlcnJ5LXBpY2sgLS1hYm9ydAorCQlm aQogCWRvbmUKKworCSMgRklYTUU6IGV2b2x2ZSB0aGlzIGludG8gYW4gZW1haWwgcmVwb3J0IHRv IGNvbW1pdCBhdXRob3JzIGV0Yy4KKwlpZiBbICIkKGNhdCAkZmFpbF9sb2cpIiAhPSAiIiBdOyB0 aGVuCisJCWVjaG8gIkZhaWxlZCB0byBjaGVycnktcGljazoiCisJCWNhdCAkZmFpbF9sb2cKKwlm aQorCisJcm0gLWYgJGxvZyAkZmFpbF9sb2cKIH0KIAogZnVuY3Rpb24gZGltX2NoZXJyeV9waWNr X2ZpeGVzCiB7CiAJYXNzZXJ0X2JyYW5jaCBkcm0taW50ZWwtZml4ZXMKLQlkaW1fY2hlcnJ5X3Bp Y2tfYnJhbmNoICIkQCIKKwlkaW1fY2hlcnJ5X3BpY2tfYnJhbmNoIGRybS1pbnRlbC1maXhlcyAi JEAiCiB9CiAKIGZ1bmN0aW9uIGRpbV9jaGVycnlfcGlja19uZXh0X2ZpeGVzCiB7CiAJYXNzZXJ0 X2JyYW5jaCBkcm0taW50ZWwtbmV4dC1maXhlcwotCWRpbV9jaGVycnlfcGlja19icmFuY2ggIiRA IgorCWRpbV9jaGVycnlfcGlja19icmFuY2ggZHJtLWludGVsLW5leHQtZml4ZXMgIiRAIgogfQog CiBkaW1fYWxpYXNfYXI9YXBwbHktcmVzb2x2ZWQKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK