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: Thu, 11 Apr 2019 16:08:15 -0700
Message-ID: <20190411230815.30083-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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 560ED8991C
 for <intel-gfx@lists.freedesktop.org>; Thu, 11 Apr 2019 23:08:06 +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
Sm9zZSBhbmQgTHVjYXMpCgpDYzogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBp
bnRlbC5jb20+CkNjOiBMdWNhcyBEZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4K
U2lnbmVkLW9mZi1ieTogQm9iIFBhYXV3ZSA8Ym9iLmoucGFhdXdlQGludGVsLmNvbT4KU2lnbmVk
LW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICAgICAgfCA2ICsrKy0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jICB8IDYgKysrLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jIHwgOCArKysrLS0tLQogMyBmaWxlcyBjaGFuZ2Vk
LCAxMCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u
YwppbmRleCA4ZTgyNmE2YWI2MmUuLjczNTdiZGRmOWFkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w
bS5jCkBAIC00NTMwLDEwICs0NTMwLDEwIEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3Qg
aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCW1lbXNldCgmd20tPndtW2xldmVsXSwgMCwg
c2l6ZW9mKHdtLT53bVtsZXZlbF0pKTsKIAogCQkJLyoKLQkJCSAqIFdhXzE0MDg5NjEwMDg6aWNs
CisJCQkgKiBXYV8xNDA4OTYxMDA4OmljbCwgZWhsCiAJCQkgKiBVbmRlcnJ1bnMgd2l0aCBXTTEr
IGRpc2FibGVkCiAJCQkgKi8KLQkJCWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSAmJgorCQkJaWYg
KElTX0dFTihkZXZfcHJpdiwgMTEpICYmCiAJCQkgICAgbGV2ZWwgPT0gMSAmJiB3bS0+d21bMF0u
cGxhbmVfZW4pIHsKIAkJCQl3bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19iID0gd20tPndtWzBdLnBs
YW5lX3Jlc19iOwogCQkJCXdtLT53bVtsZXZlbF0ucGxhbmVfcmVzX2wgPSB3bS0+d21bMF0ucGxh
bmVfcmVzX2w7CkBAIC05NTczLDcgKzk1NzMsNyBAQCBzdGF0aWMgdm9pZCBub3BfaW5pdF9jbG9j
a19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogICovCiB2b2lkIGlu
dGVsX2luaXRfY2xvY2tfZ2F0aW5nX2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdikKIHsKLQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpCisJaWYgKElTX0dFTihkZXZfcHJp
diwgMTEpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGljbF9pbml0
X2Nsb2NrX2dhdGluZzsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkKIAkJZGV2
X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBjbmxfaW5pdF9jbG9ja19nYXRpbmc7
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggMzEwN2E3NDJkOGFk
Li5mY2QzODhlODk3OGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1
bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMK
QEAgLTM0NDgsNyArMzQ0OCw3IEBAIGludCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqIFRoZSBlbmFibGluZyBvcmRlciB3aWxs
IGJlIGZyb20gbG93ZXIgdG8gaGlnaGVyIGluZGV4ZWQgd2VsbHMsCiAJICogdGhlIGRpc2FibGlu
ZyBvcmRlciBpcyByZXZlcnNlZC4KIAkgKi8KLQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsK
KwlpZiAoSVNfR0VOKGRldl9wcml2LCAxMSkpIHsKIAkJZXJyID0gc2V0X3Bvd2VyX3dlbGxzKHBv
d2VyX2RvbWFpbnMsIGljbF9wb3dlcl93ZWxscyk7CiAJfSBlbHNlIGlmIChJU19DQU5OT05MQUtF
KGRldl9wcml2KSkgewogCQllcnIgPSBzZXRfcG93ZXJfd2VsbHMocG93ZXJfZG9tYWlucywgY25s
X3Bvd2VyX3dlbGxzKTsKQEAgLTQwNjEsNyArNDA2MSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9t
YWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sIHJlc3VtZSkK
IAogCXBvd2VyX2RvbWFpbnMtPmluaXRpYWxpemluZyA9IHRydWU7CiAKLQlpZiAoSVNfSUNFTEFL
RShpOTE1KSkgeworCWlmIChJTlRFTF9HRU4oaTkxNSkgPj0gMTEpIHsKIAkJaWNsX2Rpc3BsYXlf
Y29yZV9pbml0KGk5MTUsIHJlc3VtZSk7CiAJfSBlbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUp
KSB7CiAJCWNubF9kaXNwbGF5X2NvcmVfaW5pdChpOTE1LCByZXN1bWUpOwpAQCAtNDIwOSw3ICs0
MjA5LDcgQEAgdm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmk5MTUsCiAJCWludGVsX3Bvd2VyX2RvbWFpbnNfdmVyaWZ5X3N0YXRlKGk5MTUp
OwogCX0KIAotCWlmIChJU19JQ0VMQUtFKGk5MTUpKQorCWlmIChJU19HRU4oaTkxNSwgMTEpKQog
CQlpY2xfZGlzcGxheV9jb3JlX3VuaW5pdChpOTE1KTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtF
KGk5MTUpKQogCQljbmxfZGlzcGxheV9jb3JlX3VuaW5pdChpOTE1KTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCmluZGV4IGEwNGRiYzU4ZWMxYy4uYzA5NzcwMzZkYjc5
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKQEAgLTU2OSw3ICs1
NjksNyBAQCB2b2lkIGludGVsX2VuZ2luZV9pbml0X2N0eF93YShzdHJ1Y3QgaW50ZWxfZW5naW5l
X2NzICplbmdpbmUpCiAKIAl3YV9pbml0X3N0YXJ0KHdhbCwgImNvbnRleHQiKTsKIAotCWlmIChJ
U19JQ0VMQUtFKGk5MTUpKQorCWlmIChJU19HRU4oaTkxNSwgMTEpKQogCQlpY2xfY3R4X3dvcmth
cm91bmRzX2luaXQoZW5naW5lKTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUpKQogCQlj
bmxfY3R4X3dvcmthcm91bmRzX2luaXQoZW5naW5lKTsKQEAgLTg2Nyw3ICs4NjcsNyBAQCBpY2xf
Z3Rfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgc3RydWN0
IGk5MTVfd2FfbGlzdCAqd2FsKQogc3RhdGljIHZvaWQKIGd0X2luaXRfd29ya2Fyb3VuZHMoc3Ry
dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHN0cnVjdCBpOTE1X3dhX2xpc3QgKndhbCkKIHsK
LQlpZiAoSVNfSUNFTEFLRShpOTE1KSkKKwlpZiAoSVNfR0VOKGk5MTUsIDExKSkKIAkJaWNsX2d0
X3dvcmthcm91bmRzX2luaXQoaTkxNSwgd2FsKTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5
MTUpKQogCQljbmxfZ3Rfd29ya2Fyb3VuZHNfaW5pdChpOTE1LCB3YWwpOwpAQCAtMTA2NCw3ICsx
MDY0LDcgQEAgdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF93aGl0ZWxpc3Qoc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqZW5naW5lKQogCiAJd2FfaW5pdF9zdGFydCh3LCAid2hpdGVsaXN0Iik7CiAKLQlp
ZiAoSVNfSUNFTEFLRShpOTE1KSkKKwlpZiAoSVNfR0VOKGk5MTUsIDExKSkKIAkJaWNsX3doaXRl
bGlzdF9idWlsZCh3KTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUpKQogCQljbmxfd2hp
dGVsaXN0X2J1aWxkKHcpOwpAQCAtMTExMiw3ICsxMTEyLDcgQEAgcmNzX2VuZ2luZV93YV9pbml0
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgc3RydWN0IGk5MTVfd2FfbGlzdCAqd2Fs
KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gZW5naW5lLT5pOTE1OwogCi0J
aWYgKElTX0lDRUxBS0UoaTkxNSkpIHsKKwlpZiAoSVNfR0VOKGk5MTUsIDExKSkgewogCQkvKiBU
aGlzIGlzIG5vdCBhbiBXYS4gRW5hYmxlIGZvciBiZXR0ZXIgaW1hZ2UgcXVhbGl0eSAqLwogCQl3
YV9tYXNrZWRfZW4od2FsLAogCQkJICAgICBfM0RfQ0hJQ0tFTjMsCi0tIAoyLjIwLjEKCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls
aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy
ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==