From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH] drm/i915/ehl: Inherit Ice Lake conditional code
Date: Fri, 12 Apr 2019 11:09:20 -0700
Message-ID: <20190412180920.22347-1-rodrigo.vivi@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga17.intel.com (mga17.intel.com [192.55.52.151])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 9E60F89A4B
 for <intel-gfx@lists.freedesktop.org>; Fri, 12 Apr 2019 18:09:11 +0000 (UTC)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogQm9iIFBhYXV3ZSA8Ym9iLmoucGFhdXdlQGludGVsLmNvbT4KCk1vc3Qgb2YgdGhlIGNv
bmRpdGlvbmFsIGNvZGUgZm9yIElDRUxBS0UgYWxzbyBhcHBsaWVzIHRvIEVMS0hBUlRMQUtFCnNv
IHVzZSBJU19HRU4oZGV2X3ByaXYsIDExKSBldmVuIGZvciBQTSBhbmQgV29ya2Fyb3VuZHMgZm9y
IG5vdy4KCnYyOiAtIFJlbmFtZSBjb21taXQgKEpvc2UpCiAgICAtIEluY2x1ZGUgYSB3bSB3b3Jr
YXJvdW5kIChKb3NlIGFuZCBMdWNhcykKICAgIC0gSW5jbHVkZSBkaXNwbGF5IGNvcmUgaW5pdCAo
Sm9zZSBhbmQgTHVjYXMpCnYzOiBBZGQgYSBtaXNzaW5nIGNhc2Ugb2YgZ2VuIGdyZWF0ZXItdGhh
biAxMSAoSm9zZSkKCkNjOiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVs
LmNvbT4KQ2M6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpTaWdu
ZWQtb2ZmLWJ5OiBCb2IgUGFhdXdlIDxib2Iuai5wYWF1d2VAaW50ZWwuY29tPgpTaWduZWQtb2Zm
LWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBK
b3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyAgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYyB8IDggKysrKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg
MTAgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK
aW5kZXggOGU4MjZhNmFiNjJlLi43MzU3YmRkZjlhZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u
YwpAQCAtNDUzMCwxMCArNDUzMCwxMCBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGlu
dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQltZW1zZXQoJndtLT53bVtsZXZlbF0sIDAsIHNp
emVvZih3bS0+d21bbGV2ZWxdKSk7CiAKIAkJCS8qCi0JCQkgKiBXYV8xNDA4OTYxMDA4OmljbAor
CQkJICogV2FfMTQwODk2MTAwODppY2wsIGVobAogCQkJICogVW5kZXJydW5zIHdpdGggV00xKyBk
aXNhYmxlZAogCQkJICovCi0JCQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikgJiYKKwkJCWlmIChJ
U19HRU4oZGV2X3ByaXYsIDExKSAmJgogCQkJICAgIGxldmVsID09IDEgJiYgd20tPndtWzBdLnBs
YW5lX2VuKSB7CiAJCQkJd20tPndtW2xldmVsXS5wbGFuZV9yZXNfYiA9IHdtLT53bVswXS5wbGFu
ZV9yZXNfYjsKIAkJCQl3bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19sID0gd20tPndtWzBdLnBsYW5l
X3Jlc19sOwpAQCAtOTU3Myw3ICs5NTczLDcgQEAgc3RhdGljIHZvaWQgbm9wX2luaXRfY2xvY2tf
Z2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogdm9pZCBpbnRl
bF9pbml0X2Nsb2NrX2dhdGluZ19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYpCiB7Ci0JaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKQorCWlmIChJU19HRU4oZGV2X3ByaXYs
IDExKSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBpY2xfaW5pdF9j
bG9ja19nYXRpbmc7CiAJZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpCiAJCWRldl9w
cml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0gY25sX2luaXRfY2xvY2tfZ2F0aW5nOwpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IDMxMDdhNzQyZDhhZC4u
ZDRmNDI2MmQwZmVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50
aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBA
IC0zNDQ4LDcgKzM0NDgsNyBAQCBpbnQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBUaGUgZW5hYmxpbmcgb3JkZXIgd2lsbCBi
ZSBmcm9tIGxvd2VyIHRvIGhpZ2hlciBpbmRleGVkIHdlbGxzLAogCSAqIHRoZSBkaXNhYmxpbmcg
b3JkZXIgaXMgcmV2ZXJzZWQuCiAJICovCi0JaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKSB7CisJ
aWYgKElTX0dFTihkZXZfcHJpdiwgMTEpKSB7CiAJCWVyciA9IHNldF9wb3dlcl93ZWxscyhwb3dl
cl9kb21haW5zLCBpY2xfcG93ZXJfd2VsbHMpOwogCX0gZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShk
ZXZfcHJpdikpIHsKIAkJZXJyID0gc2V0X3Bvd2VyX3dlbGxzKHBvd2VyX2RvbWFpbnMsIGNubF9w
b3dlcl93ZWxscyk7CkBAIC00MDYxLDcgKzQwNjEsNyBAQCB2b2lkIGludGVsX3Bvd2VyX2RvbWFp
bnNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCByZXN1bWUpCiAK
IAlwb3dlcl9kb21haW5zLT5pbml0aWFsaXppbmcgPSB0cnVlOwogCi0JaWYgKElTX0lDRUxBS0Uo
aTkxNSkpIHsKKwlpZiAoSU5URUxfR0VOKGk5MTUpID49IDExKSB7CiAJCWljbF9kaXNwbGF5X2Nv
cmVfaW5pdChpOTE1LCByZXN1bWUpOwogCX0gZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShpOTE1KSkg
ewogCQljbmxfZGlzcGxheV9jb3JlX2luaXQoaTkxNSwgcmVzdW1lKTsKQEAgLTQyMDksNyArNDIw
OSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICppOTE1LAogCQlpbnRlbF9wb3dlcl9kb21haW5zX3ZlcmlmeV9zdGF0ZShpOTE1KTsK
IAl9CiAKLQlpZiAoSVNfSUNFTEFLRShpOTE1KSkKKwlpZiAoSU5URUxfR0VOKGk5MTUpID49IDEx
KQogCQlpY2xfZGlzcGxheV9jb3JlX3VuaW5pdChpOTE1KTsKIAllbHNlIGlmIChJU19DQU5OT05M
QUtFKGk5MTUpKQogCQljbmxfZGlzcGxheV9jb3JlX3VuaW5pdChpOTE1KTsKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCmluZGV4IGEwNGRiYzU4ZWMxYy4uYzA5NzcwMzZk
Yjc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKQEAgLTU2OSw3
ICs1NjksNyBAQCB2b2lkIGludGVsX2VuZ2luZV9pbml0X2N0eF93YShzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzICplbmdpbmUpCiAKIAl3YV9pbml0X3N0YXJ0KHdhbCwgImNvbnRleHQiKTsKIAotCWlm
IChJU19JQ0VMQUtFKGk5MTUpKQorCWlmIChJU19HRU4oaTkxNSwgMTEpKQogCQlpY2xfY3R4X3dv
cmthcm91bmRzX2luaXQoZW5naW5lKTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUpKQog
CQljbmxfY3R4X3dvcmthcm91bmRzX2luaXQoZW5naW5lKTsKQEAgLTg2Nyw3ICs4NjcsNyBAQCBp
Y2xfZ3Rfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgc3Ry
dWN0IGk5MTVfd2FfbGlzdCAqd2FsKQogc3RhdGljIHZvaWQKIGd0X2luaXRfd29ya2Fyb3VuZHMo
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHN0cnVjdCBpOTE1X3dhX2xpc3QgKndhbCkK
IHsKLQlpZiAoSVNfSUNFTEFLRShpOTE1KSkKKwlpZiAoSVNfR0VOKGk5MTUsIDExKSkKIAkJaWNs
X2d0X3dvcmthcm91bmRzX2luaXQoaTkxNSwgd2FsKTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtF
KGk5MTUpKQogCQljbmxfZ3Rfd29ya2Fyb3VuZHNfaW5pdChpOTE1LCB3YWwpOwpAQCAtMTA2NCw3
ICsxMDY0LDcgQEAgdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF93aGl0ZWxpc3Qoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqZW5naW5lKQogCiAJd2FfaW5pdF9zdGFydCh3LCAid2hpdGVsaXN0Iik7CiAK
LQlpZiAoSVNfSUNFTEFLRShpOTE1KSkKKwlpZiAoSVNfR0VOKGk5MTUsIDExKSkKIAkJaWNsX3do
aXRlbGlzdF9idWlsZCh3KTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUpKQogCQljbmxf
d2hpdGVsaXN0X2J1aWxkKHcpOwpAQCAtMTExMiw3ICsxMTEyLDcgQEAgcmNzX2VuZ2luZV93YV9p
bml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgc3RydWN0IGk5MTVfd2FfbGlzdCAq
d2FsKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gZW5naW5lLT5pOTE1Owog
Ci0JaWYgKElTX0lDRUxBS0UoaTkxNSkpIHsKKwlpZiAoSVNfR0VOKGk5MTUsIDExKSkgewogCQkv
KiBUaGlzIGlzIG5vdCBhbiBXYS4gRW5hYmxlIGZvciBiZXR0ZXIgaW1hZ2UgcXVhbGl0eSAqLwog
CQl3YV9tYXNrZWRfZW4od2FsLAogCQkJICAgICBfM0RfQ0hJQ0tFTjMsCi0tIAoyLjIwLjEKCl9f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt
YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz
LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==