From: Radhakrishna Sripada Subject: [PATCH v4] drm/i915/icl: Fix clockgating issue when using scalers Date: Thu, 28 Mar 2019 10:35:19 -0700 Message-ID: <20190328173519.1856-1-radhakrishna.sripada@intel.com> References: <20190315221838.22444-1-radhakrishna.sripada@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C4E5899DB for ; Thu, 28 Mar 2019 17:34:40 +0000 (UTC) In-Reply-To: <20190315221838.22444-1-radhakrishna.sripada@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 List-Id: intel-gfx@lists.freedesktop.org Rml4ZXMgdGhlIGNsb2NrLWdhdGluZyBpc3N1ZSB3aGVuIHBpcGUgc2NhbGluZyBpcyBlbmFibGVk LgooTGluZWFnZSAjMjAwNjYwNDMxMikKClYyOiBGaXggdHlwbyBpbiBoZWFkbGluZShDaHJpcykK ICAgIEhhbmRsZSB0aGUgbm9uIGRvdWJsZSBidWZmZXJlZCBuYXR1cmUgb2YgdGhlIHJlZ2lzdGVy KFZpbGxlKQpWMzogRml4IGNoZWNrcGF0Y2ggd2FybmluZy4gQkFUIGZhaWx1cmUgZm9yIFYyIG9u IGdlbjMgbG9va3MgdW5yZWxhdGVkLgpWNDogU3BsaXQgdGhlIGljbCBhbmQgc2tsIHdhJ3MoVmls bGUpCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBWaWxs ZSBTeXJqYWxhIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2 aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IEFkaXR5YSBTd2FydXAgPGFkaXR5YS5zd2Fy dXBAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBSYWRoYWtyaXNobmEgU3JpcGFkYSA8cmFkaGFr cmlzaG5hLnNyaXBhZGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyB8IDQ4ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAzNCBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggODU3NmE3Zjc5OWYyLi5jM2NhOWNmZDM2ZmUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ2Niw2ICs0NjYsNyBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGludGVsX2xpbWl0IGludGVsX2xpbWl0c19ieHQgPSB7CiAJLnAyID0geyAucDJf c2xvdyA9IDEsIC5wMl9mYXN0ID0gMjAgfSwKIH07CiAKKy8qIFdBIERpc3BsYXkgIzA4Mjc6IEdl bjk6YWxsICovCiBzdGF0aWMgdm9pZAogc2tsX3dhX2Nsa2dhdGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBpbnQgcGlwZSwgYm9vbCBlbmFibGUpCiB7CkBAIC00NzgsNiArNDc5 LDE3IEBAIHNrbF93YV9jbGtnYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg aW50IHBpcGUsIGJvb2wgZW5hYmxlKQogCQkJICAgfihEVVBTMV9HQVRJTkdfRElTIHwgRFVQUzJf R0FUSU5HX0RJUykpOwogfQogCisvKiBXYV8yMDA2NjA0MzEyOmljbCAqLworc3RhdGljIHZvaWQK K2ljbF93YV9jbGtnYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHBp cGUsIGJvb2wgZW5hYmxlKQoreworCWlmIChlbmFibGUpCisJCUk5MTVfV1JJVEUoQ0xLR0FURV9E SVNfUFNMKHBpcGUpLCBEUEZSX0dBVElOR19ESVMpOworCWVsc2UKKwkJSTkxNV9XUklURShDTEtH QVRFX0RJU19QU0wocGlwZSksCisJCQkgICBJOTE1X1JFQUQoQ0xLR0FURV9ESVNfUFNMKHBpcGUp KSAmIH5EUEZSX0dBVElOR19ESVMpOworfQorCiBzdGF0aWMgYm9vbAogbmVlZHNfbW9kZXNldChj b25zdCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKQogewpAQCAtNTQ4MSwxNCArNTQ5Mywx OCBAQCBzdGF0aWMgYm9vbCBoc3dfcG9zdF91cGRhdGVfZW5hYmxlX2lwcyhjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfcwogCXJldHVybiAhb2xkX2NydGNfc3RhdGUtPmlw c19lbmFibGVkOwogfQogCi1zdGF0aWMgYm9vbCBuZWVkc19udjEyX3dhKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCitzdGF0aWMgYm9vbCBza2xfbmVlZHNfY2xrX3dhKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUpCiB7Ci0JaWYgKCFjcnRjX3N0YXRlLT5udjEyX3BsYW5lcykKLQkJcmV0 dXJuIGZhbHNlOwotCiAJLyogV0EgRGlzcGxheSAjMDgyNzogR2VuOTphbGwgKi8KLQlpZiAoSVNf R0VOKGRldl9wcml2LCA5KSAmJiAhSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJaWYgKCEhY3J0 Y19zdGF0ZS0+bnYxMl9wbGFuZXMgJiYgSVNfR0VOKGRldl9wcml2LCA5KSAmJgorCSAgICAhSVNf R0VNSU5JTEFLRShkZXZfcHJpdikpCisJCXJldHVybiB0cnVlOworCisJLyoKKwkgKiBXYV8yMDA2 NjA0MzEyOmljbAorCSAqLworCWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSAmJiBjcnRjX3N0YXRl LT5wY2hfcGZpdC5lbmFibGVkKQogCQlyZXR1cm4gdHJ1ZTsKIAogCXJldHVybiBmYWxzZTsKQEAg LTU1MjcsMTAgKzU1NDMsMTIgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCQkJaW50ZWxfcG9zdF9l bmFibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSwgcGlwZV9jb25maWcpOwogCX0KIAotCS8qIERpc3Bs YXkgV0EgODI3ICovCi0JaWYgKG5lZWRzX252MTJfd2EoZGV2X3ByaXYsIG9sZF9jcnRjX3N0YXRl KSAmJgotCSAgICAhbmVlZHNfbnYxMl93YShkZXZfcHJpdiwgcGlwZV9jb25maWcpKSB7Ci0JCXNr bF93YV9jbGtnYXRlKGRldl9wcml2LCBjcnRjLT5waXBlLCBmYWxzZSk7CisJaWYgKHNrbF9uZWVk c19jbGtfd2EoZGV2X3ByaXYsIG9sZF9jcnRjX3N0YXRlKSAmJgorCSAgICAhc2tsX25lZWRzX2Ns a193YShkZXZfcHJpdiwgcGlwZV9jb25maWcpKSB7CisJCWlmIChJU19JQ0VMQUtFKGRldl9wcml2 KSkKKwkJCWljbF93YV9jbGtnYXRlKGRldl9wcml2LCBjcnRjLT5waXBlLCBmYWxzZSk7CisJCWVs c2UKKwkJCXNrbF93YV9jbGtnYXRlKGRldl9wcml2LCBjcnRjLT5waXBlLCBmYWxzZSk7CiAJfQog fQogCkBAIC01NTY2LDEwICs1NTg0LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91 cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCQkJaW50ZWxf c2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgY3J0Yy0+cGlwZSwgZmFs c2UpOwogCX0KIAotCS8qIERpc3BsYXkgV0EgODI3ICovCi0JaWYgKCFuZWVkc19udjEyX3dhKGRl dl9wcml2LCBvbGRfY3J0Y19zdGF0ZSkgJiYKLQkgICAgbmVlZHNfbnYxMl93YShkZXZfcHJpdiwg cGlwZV9jb25maWcpKSB7Ci0JCXNrbF93YV9jbGtnYXRlKGRldl9wcml2LCBjcnRjLT5waXBlLCB0 cnVlKTsKKwlpZiAoIXNrbF9uZWVkc19jbGtfd2EoZGV2X3ByaXYsIG9sZF9jcnRjX3N0YXRlKSAm JgorCSAgICBza2xfbmVlZHNfY2xrX3dhKGRldl9wcml2LCBwaXBlX2NvbmZpZykpIHsKKwkJaWYg KElTX0lDRUxBS0UoZGV2X3ByaXYpKQorCQkJaWNsX3dhX2Nsa2dhdGUoZGV2X3ByaXYsIGNydGMt PnBpcGUsIHRydWUpOworCQllbHNlCisJCQlza2xfd2FfY2xrZ2F0ZShkZXZfcHJpdiwgY3J0Yy0+ cGlwZSwgdHJ1ZSk7CiAJfQogCiAJLyoKLS0gCjIuMjAuMC5yYzIuNy5nOTY1Nzk4ZDFmMjk5Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=