From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH 4/4] drm/i915: Also disable SAGV on fifo underrun. Date: Mon, 26 Feb 2018 12:53:09 -0800 Message-ID: <20180226205309.2438-4-rodrigo.vivi@intel.com> References: <20180226205309.2438-1-rodrigo.vivi@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 230FA6E526 for ; Mon, 26 Feb 2018 20:53:13 +0000 (UTC) In-Reply-To: <20180226205309.2438-1-rodrigo.vivi@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: Ashar Shaikh , Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gdW5kZXJydW4gc2l0dWF0aW9ucyBhbmQgU0FHViBlbmFibGVkIHdlIGNhbiBmYWNlIGhhcmQg aGFuZ3MuCgpTbyBsZXQncyByZXVzZSB0aGUgRkJDIHdvcmthcm91bmQgYW5kIGV4cGFuZCB0aGF0 IHRvIFNBR1YKb24gdGhlIGhvcGUgdGhhdCBpdCBpcyBub3QgYWxyZWFkeSB0b28gbGF0ZSBmb3Ig dGhhdC4KCkNjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IEFz aGFyIFNoYWlraCA8YXpoYXIuc2hhaWtoQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogUm9kcmln byBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oICAgICAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9mYmMuYyAgICAgICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlm b191bmRlcnJ1bi5jIHwgMTcgKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgICAgICAgICAgICB8IDQ1ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogNCBm aWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCmluZGV4IDNjYTI3Y2M4NzAwZC4uMTY5YWY4NTNmNmZmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMjAwMywxMCArMjAwMywxMiBAQCB2b2lkIHNrbF9waXBl X3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkgICAgICBzdHJ1Y3Qg c2tsX3BpcGVfd20gKm91dCk7CiB2b2lkIGc0eF93bV9zYW5pdGl6ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCB2bHZfd21fc2FuaXRpemUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKK2Jvb2wgaW50ZWxfaGFzX3NhZ3Yoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIGJvb2wgaW50ZWxfY2FuX2VuYWJsZV9zYWd2KHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiB1OCBpbnRlbF9zYWd2X2Jsb2NrX3RpbWUoY29uc3Qg c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfZW5hYmxlX3Nh Z3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfZGlzYWJs ZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cit2b2lkIGludGVsX3Nh Z3ZfdW5kZXJydW5fZGV0ZWN0ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK IGJvb2wgc2tsX3dtX2xldmVsX2VxdWFscyhjb25zdCBzdHJ1Y3Qgc2tsX3dtX2xldmVsICpsMSwK IAkJCSBjb25zdCBzdHJ1Y3Qgc2tsX3dtX2xldmVsICpsMik7CiBib29sIHNrbF9kZGJfYWxsb2Nh dGlvbl9vdmVybGFwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZiYy5jCmluZGV4IGM2MzU2ODU2NGI3Ny4uYTVkOTgwMjI3NzA4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9mYmMuYwpAQCAtMTIzNSw2ICsxMjM1LDkgQEAgdm9pZCBpbnRlbF9mYmNf dW5kZXJydW5fZGV0ZWN0ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewog CXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZfcHJpdi0+ZmJjOwogCisJaWYgKCFmYmNfc3Vw cG9ydGVkKGRldl9wcml2KSkKKwkJcmV0dXJuOworCiAJbXV0ZXhfbG9jaygmZmJjLT5sb2NrKTsK IAogCS8qIE1heWJlIHdlIHdlcmUgc2NoZWR1bGVkIHR3aWNlLiAqLwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1bi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1bi5jCmluZGV4IDZhMjkwNjIxMTc3Yi4uZGVhMTg5Yjgz ODI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9maWZvX3VuZGVycnVu LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1bi5jCkBAIC0z NTYsMjMgKzM1NiwyNCBAQCBzdGF0aWMgdm9pZCBpbnRlbF91bmRlcnJ1bl93b3JrX2ZuKHN0cnVj dCB3b3JrX3N0cnVjdCAqd29yaykKIAkJY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBkcm1faTkx NV9wcml2YXRlLCB1bmRlcnJ1bi53b3JrKTsKIAogCWludGVsX2ZiY191bmRlcnJ1bl9kZXRlY3Rl ZChkZXZfcHJpdik7CisJaW50ZWxfc2Fndl91bmRlcnJ1bl9kZXRlY3RlZChkZXZfcHJpdik7CiB9 CiAKIC8qCi0gKiBpbnRlbF9oYW5kbGVfZmlmb191bmRlcnJ1bl9pcnEgLSBkaXNhYmxlIEZCQyB3 aGVuIHdlIGdldCBhIEZJRk8gdW5kZXJydW4KKyAqIGludGVsX2hhbmRsZV9maWZvX3VuZGVycnVu X2lycSAtIGRpc2FibGUgRkJDIGFuZCBTQUdWIG9uIGEgRklGTyB1bmRlcnJ1bgogICoKLSAqIFdp dGhvdXQgRkJDLCBtb3N0IHVuZGVycnVucyBhcmUgaGFybWxlc3MgYW5kIGRvbid0IHJlYWxseSBj YXVzZSB0b28gbWFueQotICogcHJvYmxlbXMsIGV4Y2VwdCBmb3IgYW4gYW5ub3lpbmcgbWVzc2Fn ZSBvbiBkbWVzZy4gV2l0aCBGQkMsIHVuZGVycnVucyBjYW4KLSAqIGJlY29tZSBibGFjayBzY3Jl ZW5zIG9yIGV2ZW4gd29yc2UsIGVzcGVjaWFsbHkgd2hlbiBwYWlyZWQgd2l0aCBiYWQKLSAqIHdh dGVybWFya3MuIFNvIGluIG9yZGVyIGZvciB1cyB0byBiZSBvbiB0aGUgc2FmZSBzaWRlLCBjb21w bGV0ZWx5IGRpc2FibGUgRkJDCi0gKiBpbiBjYXNlIHdlIGV2ZXIgZGV0ZWN0IGEgRklGTyB1bmRl cnJ1biBvbiBhbnkgcGlwZS4gQW4gdW5kZXJydW4gb24gYW55IHBpcGUKLSAqIGFscmVhZHkgc3Vn Z2VzdHMgdGhhdCB3YXRlcm1hcmtzIG1heSBiZSBiYWQsIHNvIHRyeSB0byBiZSBhcyBzYWZlIGFz CisgKiBXaXRob3V0IEZCQyBvciBTQUdWLCBtb3N0IHVuZGVycnVucyBhcmUgaGFybWxlc3MgYW5k IGRvbid0IHJlYWxseSBjYXVzZSB0b28KKyAqIG1hbnkgcHJvYmxlbXMsIGV4Y2VwdCBmb3IgYW4g YW5ub3lpbmcgbWVzc2FnZSBvbiBkbWVzZy4gV2l0aCB0aGVtLCB1bmRlcnJ1bnMKKyAqIGNhbiBi ZWNvbWUgYmxhY2sgc2NyZWVucyBvciBldmVuIHdvcnNlLCBlc3BlY2lhbGx5IHdoZW4gcGFpcmVk IHdpdGggYmFkCisgKiB3YXRlcm1hcmtzLiBTbyBpbiBvcmRlciBmb3IgdXMgdG8gYmUgb24gdGhl IHNhZmUgc2lkZSwgY29tcGxldGVseSBkaXNhYmxlCisgKiB0aGVtIGluIGNhc2Ugd2UgZXZlciBk ZXRlY3QgYSBGSUZPIHVuZGVycnVuIG9uIGFueSBwaXBlLiBBbiB1bmRlcnJ1biBvbiBhbnkKKyAq IHBpcGUgYWxyZWFkeSBzdWdnZXN0cyB0aGF0IHdhdGVybWFya3MgbWF5IGJlIGJhZCwgc28gdHJ5 IHRvIGJlIGFzIHNhZmUgYXMKICAqIHBvc3NpYmxlLgogICoKICAqLwogc3RhdGljIHZvaWQgaW50 ZWxfaGFuZGxlX2ZpZm9fdW5kZXJydW5faXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKLQlpZiAoIUhBU19GQkMoZGV2X3ByaXYpKQorCWlmICghSEFTX0ZCQyhkZXZfcHJp dikgJiYgIWludGVsX2hhc19zYWd2KGRldl9wcml2KSkKIAkJcmV0dXJuOwogCiAJc3Bpbl9sb2Nr KCZkZXZfcHJpdi0+dW5kZXJydW4ubG9jayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBl MWVjOWMyZmQwOGEuLjg0ZWRhZjE2MWZlMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0z NTgxLDggKzM1ODEsNyBAQCBzdGF0aWMgYm9vbCBza2xfbmVlZHNfbWVtb3J5X2J3X3dhKHN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXJldHVybiBmYWxzZTsKIH0KIAotc3RhdGlj IGJvb2wKLWludGVsX2hhc19zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK K2Jvb2wgaW50ZWxfaGFzX3NhZ3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog ewogCWJvb2wgcmV0ID0gZmFsc2U7CiAKQEAgLTM2NDgsNiArMzY0NywyMiBAQCB2b2lkIGludGVs X2VuYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAltdXRleF91 bmxvY2soJmRldl9wcml2LT5zYWd2LmxvY2spOwogfQogCitzdGF0aWMgaW50IF9faW50ZWxfZGlz YWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlpbnQgcmV0 OworCisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKKworCS8qIGJzcGVjIHNheXMg dG8ga2VlcCByZXRyeWluZyBmb3IgYXQgbGVhc3QgMSBtcyAqLworCXJldCA9IHNrbF9wY29kZV9y ZXF1ZXN0KGRldl9wcml2LCBHRU45X1BDT0RFX1NBR1ZfQ09OVFJPTCwKKwkJCQlHRU45X1NBR1Zf RElTQUJMRSwKKwkJCQlHRU45X1NBR1ZfSVNfRElTQUJMRUQsIEdFTjlfU0FHVl9JU19ESVNBQkxF RCwKKwkJCQkxKTsKKwltdXRleF91bmxvY2soJmRldl9wcml2LT5wY3VfbG9jayk7CisKKwlyZXR1 cm4gcmV0OworfQorCiB2b2lkIGludGVsX2Rpc2FibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IHJldDsKQEAgLTM2NjAsMTQgKzM2NzUsOCBAQCB2b2lk IGludGVsX2Rpc2FibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ CWdvdG8gb3V0OwogCiAJRFJNX0RFQlVHX0tNUygiRGlzYWJsaW5nIHRoZSBTQUdWXG4iKTsKLQlt dXRleF9sb2NrKCZkZXZfcHJpdi0+cGN1X2xvY2spOwogCi0JLyogYnNwZWMgc2F5cyB0byBrZWVw IHJldHJ5aW5nIGZvciBhdCBsZWFzdCAxIG1zICovCi0JcmV0ID0gc2tsX3Bjb2RlX3JlcXVlc3Qo ZGV2X3ByaXYsIEdFTjlfUENPREVfU0FHVl9DT05UUk9MLAotCQkJCUdFTjlfU0FHVl9ESVNBQkxF LAotCQkJCUdFTjlfU0FHVl9JU19ESVNBQkxFRCwgR0VOOV9TQUdWX0lTX0RJU0FCTEVELAotCQkJ CTEpOwotCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnBjdV9sb2NrKTsKKwlyZXQgPSBfX2ludGVs X2Rpc2FibGVfc2FndihkZXZfcHJpdik7CiAKIAkvKgogCSAqIFNvbWUgc2tsIHN5c3RlbXMsIHBy ZS1yZWxlYXNlIG1hY2hpbmVzIGluIHBhcnRpY3VsYXIsCkBAIC0zNjg3LDYgKzM2OTYsMjQgQEAg dm9pZCBpbnRlbF9kaXNhYmxlX3NhZ3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnNhZ3YubG9jayk7CiB9CiAKK3ZvaWQgaW50ZWxf c2Fndl91bmRlcnJ1bl9kZXRlY3RlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Cit7CisJaWYgKCFpbnRlbF9oYXNfc2FndihkZXZfcHJpdikpCisJCXJldHVybjsKKworCW11dGV4 X2xvY2soJmRldl9wcml2LT5zYWd2LmxvY2spOworCisJaWYgKGRldl9wcml2LT5zYWd2LnN0YXR1 cyA9PSBJOTE1X1NBR1ZfTk9UX0NPTlRST0xMRUQpCisJCWdvdG8gb3V0OworCisJRFJNX0RFQlVH X0tNUygiRGlzYWJsaW5nIFNBR1YgZHVlIHRvIEZJRk8gdW5kZXJydW4uXG4iKTsKKwlfX2ludGVs X2Rpc2FibGVfc2FndihkZXZfcHJpdik7CisJZGV2X3ByaXYtPnNhZ3Yuc3RhdHVzID0gSTkxNV9T QUdWX05PVF9DT05UUk9MTEVEOworCitvdXQ6CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+c2Fn di5sb2NrKTsKK30KKwogYm9vbCBpbnRlbF9jYW5fZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2 OwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK