From: Ville Syrjala Subject: [PATCH 4/4] drm/i915: Don't mangle the CTM on pre-HSW Date: Thu, 22 Feb 2018 23:42:32 +0200 Message-ID: <20180222214232.6064-4-ville.syrjala@linux.intel.com> References: <20180222214232.6064-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC13B6ECBB for ; Thu, 22 Feb 2018 21:42:47 +0000 (UTC) In-Reply-To: <20180222214232.6064-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 Cc: Johnson Lin List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IHByZS1IU1cgd2UgaGF2ZSBkZWRpY2F0ZWQgaGFyZHdhcmUgZm9yIHRoZSBSR0IgbGltaXRlZCBy YW5nZQpoYW5kbGluZywgYW5kIHNvIHdlIGRvbid0IHdhbnQgdG8gY29tcHJlc3Mgd2l0aCB0aGUg Q1NDIG1hdHJpeC4KClRvc3MgaW4gYSBGSVhNRSBhYm91dCBnYW1tYSBMVVQgdnMuIGxpbWl0ZWQg cmFuZ2UgdXNpbmcgdGhlIENTQy4KCkNjOiBKb2huc29uIExpbiA8am9obnNvbi5saW5AaW50ZWwu Y29tPgpDYzogVW1hIFNoYW5rYXIgPHVtYS5zaGFua2FyQGludGVsLmNvbT4KQ2M6IFNoYXNoYW5r IFNoYXJtYSA8c2hhc2hhbmsuc2hhcm1hQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIHwgMTYgKysrKysrKysrKysrLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NvbG9yLmMKaW5kZXggYWYxZTYxZDNiYWNkLi44OWFiMGY3MGFhMjIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfY29sb3IuYwpAQCAtMTQwLDYgKzE0MCwxNCBAQCBzdGF0aWMgdm9pZCBpbGtf bG9hZF9jc2NfbWF0cml4KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlpbnQg aSwgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJdWludDE2X3QgY29lZmZzWzldID0geyAwLCB9 OwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jcnRjX3N0YXRlID0gdG9faW50ZWxf Y3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKKwlib29sIGxpbWl0ZWRfY29sb3JfcmFuZ2UgPSBmYWxz ZTsKKworCS8qCisJICogRklYTUUgaWYgdGhlcmUncyBhIGdhbW1hIExVVCBhZnRlciB0aGUgQ1ND LCB3ZSBzaG91bGQKKwkgKiBkbyB0aGUgcmFuZ2UgY29tcHJlc3Npb24gdXNpbmcgdGhlIGdhbW1h IExVVCBpbnN0ZWFkLgorCSAqLworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDggfHwgSVNf SEFTV0VMTChkZXZfcHJpdikpCisJCWxpbWl0ZWRfY29sb3JfcmFuZ2UgPSBpbnRlbF9jcnRjX3N0 YXRlLT5saW1pdGVkX2NvbG9yX3JhbmdlOwogCiAJaWYgKGludGVsX2NydGNfc3RhdGUtPnljYmNy NDIwKSB7CiAJCWlsa19sb2FkX3ljYmNyX2NvbnZlcnNpb25fbWF0cml4KGludGVsX2NydGMpOwpA QCAtMTUwLDcgKzE1OCw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCQljb25zdCB1NjQgKmlucHV0OwogCQl1NjQg dGVtcFs5XTsKIAotCQlpZiAoaW50ZWxfY3J0Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkK KwkJaWYgKGxpbWl0ZWRfY29sb3JfcmFuZ2UpCiAJCQlpbnB1dCA9IGN0bV9tdWx0X2J5X2xpbWl0 ZWQodGVtcCwgY3RtLT5tYXRyaXgpOwogCQllbHNlCiAJCQlpbnB1dCA9IGN0bS0+bWF0cml4OwpA QCAtMjAwLDcgKzIwOCw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCQkgKiBpbnRvIGNvbnNpZGVyYXRpb24uCiAJ CSAqLwogCQlmb3IgKGkgPSAwOyBpIDwgMzsgaSsrKSB7Ci0JCQlpZiAoaW50ZWxfY3J0Y19zdGF0 ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKKwkJCWlmIChsaW1pdGVkX2NvbG9yX3JhbmdlKQogCQkJ CWNvZWZmc1tpICogMyArIGldID0KIAkJCQkJSUxLX0NTQ19DT0VGRl9MSU1JVEVEX1JBTkdFOwog CQkJZWxzZQpAQCAtMjI0LDcgKzIzMiw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRy aXgoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID4gNikgewogCQl1aW50MTZfdCBwb3N0b2ZmID0gMDsKIAotCQlpZiAoaW50ZWxfY3J0 Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKKwkJaWYgKGxpbWl0ZWRfY29sb3JfcmFuZ2Up CiAJCQlwb3N0b2ZmID0gKDE2ICogKDEgPDwgMTIpIC8gMjU1KSAmIDB4MWZmZjsKIAogCQlJOTE1 X1dSSVRFKFBJUEVfQ1NDX1BPU1RPRkZfSEkocGlwZSksIHBvc3RvZmYpOwpAQCAtMjM1LDcgKzI0 Myw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogCX0gZWxzZSB7CiAJCXVpbnQzMl90IG1vZGUgPSBDU0NfTU9ERV9Z VVZfVE9fUkdCOwogCi0JCWlmIChpbnRlbF9jcnRjX3N0YXRlLT5saW1pdGVkX2NvbG9yX3Jhbmdl KQorCQlpZiAobGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJCW1vZGUgfD0gQ1NDX0JMQUNLX1NDUkVF Tl9PRkZTRVQ7CiAKIAkJSTkxNV9XUklURShQSVBFX0NTQ19NT0RFKHBpcGUpLCBtb2RlKTsKLS0g CjIuMTYuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==