Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22460C433E2 for ; Wed, 16 Sep 2020 02:41:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D6D812083B for ; Wed, 16 Sep 2020 02:41:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6D812083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 58B556E947; Wed, 16 Sep 2020 02:41:34 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id A98356E947 for ; Wed, 16 Sep 2020 02:41:31 +0000 (UTC) IronPort-SDR: A4Crdcaws8o+Z5J5n1HkluLR3OGyHUx5s60RRG5tkXbw841en7PHTsDMcBo5L+TC5LIPaPTaes NAO7PgE6NsqQ== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="147079629" X-IronPort-AV: E=Sophos;i="5.76,430,1592895600"; d="scan'208";a="147079629" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2020 19:41:31 -0700 IronPort-SDR: jatZDXjaBWGiZEZCfuTZ7CzU0nFEIqTkjzNuwdYH/X20VtJnDsMczewid4MAUJYzxwSM5c2b1x e/y/gC6fDFeQ== X-IronPort-AV: E=Sophos;i="5.76,430,1592895600"; d="scan'208";a="507002737" Received: from betsyca-mobl1.amr.corp.intel.com (HELO josouza-MOBL2.amr.corp.intel.com) ([10.255.87.166]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2020 19:41:30 -0700 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= To: intel-gfx@lists.freedesktop.org Date: Tue, 15 Sep 2020 19:44:10 -0700 Message-Id: <20200916024410.9248-2-jose.souza@intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200916024410.9248-1-jose.souza@intel.com> References: <20200916024410.9248-1-jose.souza@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915/display: Check PSR parameter and flag only in state compute phase X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RHVlIHRvIHRoZSBkZWJ1Z2ZzIGZsYWcsIGhhc19wc3IyIGluIENSVEMgc3RhdGUgY291bGQgaGF2 ZSBhIGRpZmZlcmVudAp2YWx1ZSB0aGFuIHBzci5wc3IyX2VuYWJsZWQgYW5kIGl0IHdhcyBjYXVz aW5nIFBTUjIgc3ViZmVhdHVyZXMoREMzQ08KYW5kIHNlbGVjdGl2ZSBmZXRjaCkgdG8gYmUgc2V0 IHRvIG5vdCBhIGV4cGVjdGVkIHN0YXRlLgoKU28gaGVyZSBvbmx5IHRha2luZyBpbiBjb25zaWRl cmF0aW9uIHRoZSBwYXJhbWV0ZXIgYW5kIGRlYnVnZnMgZmxhZwp3aGVuIGNvbXB1dGluZyBQU1Ig c3RhdGUsIHRoaXMgd2F5IHRoZSBDUlRDIHN0YXRlIHdpbGwgYWxzbyBoYXZlCnRoZSBjb3JyZWN0 IHN0YXRlLgoKaW50ZWxfcHNyX2Zhc3RzZXRfZm9yY2UoKSB3YXMgYWxyZWFkeSBicm9rZW4gYXMK aW50ZWxfcHNyX2NvbXB1dGVfY29uZmlnKCkgd2FzIGFscmVhZHkgb25seSBlbmFibGluZyBQU1Ig d2hlbgpwc3JfZ2xvYmFsX2VuYWJsZWQoKSBhbmQgYWxsIG90aGVyIFBTUiByZXF1aXJlbWVudHMg YXJlIG1ldC4KU28gc29tZSBjaGFuZ2VzIHdhcyByZXF1aXJlZCBpbiB0aGlzIGZ1bmN0aW9uLCBu b3cgaXQgaXRlcmF0ZXMgb3ZlcgphbGwgY29ubmVjdG9ycywgaWYgaXQgaXMgYSBlRFAgY29ubmVj dG9yIGFuZCBpcyBhY3RpdmUgZm9yY2UgYSBtb2Rlc2V0CmluIHRoZSBDUlRDIGRyaXZpbmcgdGhp cyBjb25uZWN0b3IsIHdoYXQgd2lsbCBjYXVzZSB0aGUgbmV3IFBTUiBzdGF0ZQp0byBiZSBzZXQg YmFzZWQgb24gdGhlIGRlYnVnZnMgZmxhZy4KCkNjOiBHd2FuLWd5ZW9uZyBNdW4gPGd3YW4tZ3ll b25nLm11bkBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3Nl LnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X3Bzci5jIHwgNjUgKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzcg aW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfcHNyLmMKaW5kZXggNGUwOWFlNjFkNGFhLi4zODNiNjZkOWYyZjIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9wc3IuYwpAQCAtOTEsMTkgKzkxLDE0IEBAIHN0 YXRpYyBib29sIHBzcl9nbG9iYWxfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSkKIAl9CiB9CiAKLXN0YXRpYyBib29sIGludGVsX3BzcjJfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgYm9vbCBwc3IyX2dsb2JhbF9lbmFibGVkKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQkvKiBDYW5ub3QgZW5hYmxlIERTQyBh bmQgUFNSMiBzaW11bHRhbmVvdXNseSAqLwotCWRybV9XQVJOX09OKCZkZXZfcHJpdi0+ZHJtLCBj cnRjX3N0YXRlLT5kc2MuY29tcHJlc3Npb25fZW5hYmxlICYmCi0JCSAgICBjcnRjX3N0YXRlLT5o YXNfcHNyMik7Ci0KIAlzd2l0Y2ggKGRldl9wcml2LT5wc3IuZGVidWcgJiBJOTE1X1BTUl9ERUJV R19NT0RFX01BU0spIHsKIAljYXNlIEk5MTVfUFNSX0RFQlVHX0RJU0FCTEU6CiAJY2FzZSBJOTE1 X1BTUl9ERUJVR19GT1JDRV9QU1IxOgogCQlyZXR1cm4gZmFsc2U7CiAJZGVmYXVsdDoKLQkJcmV0 dXJuIGNydGNfc3RhdGUtPmhhc19wc3IyOworCQlyZXR1cm4gdHJ1ZTsKIAl9CiB9CiAKQEAgLTcy OSw2ICs3MjQsMTEgQEAgc3RhdGljIGJvb2wgaW50ZWxfcHNyMl9jb25maWdfdmFsaWQoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCwKIAkJcmV0dXJuIGZhbHNlOwogCX0KIAorCWlmICghcHNyMl9n bG9iYWxfZW5hYmxlZChkZXZfcHJpdikpIHsKKwkJZHJtX2RiZ19rbXMoJmRldl9wcml2LT5kcm0s ICJQU1IyIGRpc2FibGVkIGJ5IGZsYWdcbiIpOworCQlyZXR1cm4gZmFsc2U7CisJfQorCiAJLyoK IAkgKiBEU0MgYW5kIFBTUjIgY2Fubm90IGJlIGVuYWJsZWQgc2ltdWx0YW5lb3VzbHkuIElmIGEg cmVxdWVzdGVkCiAJICogcmVzb2x1dGlvbiByZXF1aXJlcyBEU0MgdG8gYmUgZW5hYmxlZCwgcHJp b3JpdHkgaXMgZ2l2ZW4gdG8gRFNDCkBAIC04MTcsOCArODE3LDExIEBAIHZvaWQgaW50ZWxfcHNy X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJaWYgKGludGVsX2Rw ICE9IGRldl9wcml2LT5wc3IuZHApCiAJCXJldHVybjsKIAotCWlmICghcHNyX2dsb2JhbF9lbmFi bGVkKGRldl9wcml2KSkKKwlpZiAoIXBzcl9nbG9iYWxfZW5hYmxlZChkZXZfcHJpdikpIHsKKwkJ ZHJtX2RiZ19rbXMoJmRldl9wcml2LT5kcm0sICJQU1IgZGlzYWJsZWQgYnkgZmxhZ1xuIik7CiAJ CXJldHVybjsKKwl9CisKIAkvKgogCSAqIEhTVyBzcGVjIGV4cGxpY2l0bHkgc2F5cyBQU1IgaXMg dGllZCB0byBwb3J0IEEuCiAJICogQkRXKyBwbGF0Zm9ybXMgaGF2ZSBhIGluc3RhbmNlIG9mIFBT UiByZWdpc3RlcnMgcGVyIHRyYW5zY29kZXIgYnV0CkBAIC05NTksNyArOTYyLDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfcHNyX2VuYWJsZV9sb2NrZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCiAJZHJtX1dBUk5fT04oJmRldl9wcml2LT5kcm0sIGRldl9wcml2LT5wc3IuZW5h YmxlZCk7CiAKLQlkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCA9IGludGVsX3BzcjJfZW5hYmxl ZChkZXZfcHJpdiwgY3J0Y19zdGF0ZSk7CisJZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQgPSBj cnRjX3N0YXRlLT5oYXNfcHNyMjsKIAlkZXZfcHJpdi0+cHNyLmJ1c3lfZnJvbnRidWZmZXJfYml0 cyA9IDA7CiAJZGV2X3ByaXYtPnBzci5waXBlID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT51 YXBpLmNydGMpLT5waXBlOwogCWRldl9wcml2LT5wc3IuZGMzY29fZW5hYmxlZCA9ICEhY3J0Y19z dGF0ZS0+ZGMzY29fZXhpdGxpbmU7CkBAIC0xMDI5LDE1ICsxMDMyLDcgQEAgdm9pZCBpbnRlbF9w c3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJZHJtX1dBUk5fT04oJmRldl9w cml2LT5kcm0sIGRldl9wcml2LT5kcnJzLmRwKTsKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT5w c3IubG9jayk7Ci0KLQlpZiAoIXBzcl9nbG9iYWxfZW5hYmxlZChkZXZfcHJpdikpIHsKLQkJZHJt X2RiZ19rbXMoJmRldl9wcml2LT5kcm0sICJQU1IgZGlzYWJsZWQgYnkgZmxhZ1xuIik7Ci0JCWdv dG8gdW5sb2NrOwotCX0KLQogCWludGVsX3Bzcl9lbmFibGVfbG9ja2VkKGRldl9wcml2LCBjcnRj X3N0YXRlLCBjb25uX3N0YXRlKTsKLQotdW5sb2NrOgogCW11dGV4X3VubG9jaygmZGV2X3ByaXYt PnBzci5sb2NrKTsKIH0KIApAQCAtMTIyMiw4ICsxMjE3LDggQEAgdm9pZCBpbnRlbF9wc3JfdXBk YXRlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ cHNyLmxvY2spOwogCi0JZW5hYmxlID0gY3J0Y19zdGF0ZS0+aGFzX3BzciAmJiBwc3JfZ2xvYmFs X2VuYWJsZWQoZGV2X3ByaXYpOwotCXBzcjJfZW5hYmxlID0gaW50ZWxfcHNyMl9lbmFibGVkKGRl dl9wcml2LCBjcnRjX3N0YXRlKTsKKwllbmFibGUgPSBjcnRjX3N0YXRlLT5oYXNfcHNyOworCXBz cjJfZW5hYmxlID0gY3J0Y19zdGF0ZS0+aGFzX3BzcjI7CiAKIAlpZiAoZW5hYmxlID09IHBzci0+ ZW5hYmxlZCAmJiBwc3IyX2VuYWJsZSA9PSBwc3ItPnBzcjJfZW5hYmxlZCkgewogCQkvKiBGb3Jj ZSBhIFBTUiBleGl0IHdoZW4gZW5hYmxpbmcgQ1JDIHRvIGF2b2lkIENSQyB0aW1lb3V0cyAqLwpA QCAtMTMyMCwxMCArMTMxNSwxMSBAQCBzdGF0aWMgYm9vbCBfX3Bzcl93YWl0X2Zvcl9pZGxlX2xv Y2tlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyBpbnQgaW50 ZWxfcHNyX2Zhc3RzZXRfZm9yY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog eworCXN0cnVjdCBkcm1fY29ubmVjdG9yX2xpc3RfaXRlciBjb25uX2l0ZXI7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwogCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1 aXJlX2N0eCBjdHg7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0cnVjdCBp bnRlbF9jcnRjICpjcnRjOworCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uOwogCWludCBlcnI7 CiAKIAlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKQEAgLTEzMzQsMjEgKzEz MzAsMzQgQEAgc3RhdGljIGludCBpbnRlbF9wc3JfZmFzdHNldF9mb3JjZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3RhdGUtPmFjcXVpcmVfY3R4ID0gJmN0eDsKIAogcmV0 cnk6Ci0JZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUgPQotCQkJaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0 YXRlLCBjcnRjKTsKIAorCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2JlZ2luKGRldiwgJmNvbm5f aXRlcik7CisJZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rvcl9pdGVyKGNvbm4sICZjb25uX2l0ZXIpIHsK KwkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGU7CisJCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKworCQlpZiAoY29ubi0+Y29ubmVjdG9yX3R5cGUgIT0g RFJNX01PREVfQ09OTkVDVE9SX2VEUCkKKwkJCWNvbnRpbnVlOworCisJCWNvbm5fc3RhdGUgPSBk cm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm4pOworCQlpZiAoSVNfRVJS KGNvbm5fc3RhdGUpKSB7CisJCQllcnIgPSBQVFJfRVJSKGNvbm5fc3RhdGUpOworCQkJZ290byBl cnJvcjsKKwkJfQorCisJCWlmICghY29ubl9zdGF0ZS0+Y3J0YykKKwkJCWNvbnRpbnVlOworCisJ CWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjb25uX3N0YXRl LT5jcnRjKTsKIAkJaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewogCQkJZXJyID0gUFRSX0VSUihj cnRjX3N0YXRlKTsKIAkJCWdvdG8gZXJyb3I7CiAJCX0KIAotCQlpZiAoY3J0Y19zdGF0ZS0+aHcu YWN0aXZlICYmIGNydGNfc3RhdGUtPmhhc19wc3IpIHsKLQkJCS8qIE1hcmsgbW9kZSBhcyBjaGFu Z2VkIHRvIHRyaWdnZXIgYSBwaXBlLT51cGRhdGUoKSAqLwotCQkJY3J0Y19zdGF0ZS0+dWFwaS5t b2RlX2NoYW5nZWQgPSB0cnVlOwotCQkJYnJlYWs7Ci0JCX0KKwkJLyogTWFyayBtb2RlIGFzIGNo YW5nZWQgdG8gdHJpZ2dlciBhIHBpcGUtPnVwZGF0ZSgpICovCisJCWNydGNfc3RhdGUtPm1vZGVf Y2hhbmdlZCA9IHRydWU7CiAJfQorCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2VuZCgmY29ubl9p dGVyKTsKIAogCWVyciA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKIAotLSAKMi4yOC4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK