From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH] drm/i915: Wait until after wm optimization to drop runtime PM reference Date: Fri, 4 Mar 2016 15:59:39 -0800 Message-ID: <1457135979-23727-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BA086E86E for ; Sat, 5 Mar 2016 00:00:11 +0000 (UTC) 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 QXQgdGhlIGVuZCBvZiBhbiBhdG9taWMgY29tbWl0LCB3ZSBjdXJyZW50bHkgd2FpdCBmb3IgdmJs YW5rcyB0bwpjb21wbGV0ZSwgY2FsbCBwdXQoKSBvbiB0aGUgdmFyaW91cyBydW50aW1lIFBNIHJl ZmVyZW5jZXMsIGFuZCB0aGVuIHRyeQp0byBvcHRpbWl6ZSBvdXIgd2F0ZXJtYXJrcyAob24gcGxh dGZvcm1zIHRoYXQgbmVlZCB0d28tc3RlcCB3YXRlcm1hcmsKcHJvZ3JhbW1pbmcpLiAgVGhpcyBj YW4gbGVhZCB0byB3YXRlcm1hcmsgcmVnaXN0ZXJzIGJlaW5nIHByb2dyYW1tZWQKd2hpbGUgdGhl IHBvd2VyIHdlbGwgaXMgcG93ZXJlZCBkb3duLiAgV2UgbmVlZCB0byB3YWl0IHVudGlsIGFmdGVy CndhdGVybWFyayBvcHRpbWl6YXRpb24gaXMgY29tcGxldGUgYmVmb3JlIGRyb3BwaW5nIG91ciBy dW50aW1lIHBvd2VyCnJlZmVyZW5jZXMuCgpOb3RlIHRoYXQgaW4gdGhlIGZ1dHVyZSB0aGUgd2F0 ZXJtYXJrIG9wdGltaXphdGlvbiBpcyBwcm9iYWJseSBnb2luZyB0bwptb3ZlIHRvIGFuIGFzeW5j aHJvbm91cyB3b3JrcXVldWUgdGFzayB0aGF0IGhhcHBlbnMgYXQgc29tZSBhcmJpdHJhcnkKcG9p bnQgYWZ0ZXIgdmJsYW5rLiAgV2hlbiB3ZSBtYWtlIHRoYXQgY2hhbmdlLCB3ZSdsbCBubyBsb25n ZXIKbmVjZXNzYXJpbHkgYmUgb3BlcmF0aW5nIHVuZGVyIHRoZSBwb3dlciByZWZlcmVuY2UgaGVs ZCBoZXJlLCBzbyB3ZSdsbApuZWVkIHRvIHdyYXAgdGhlIHdhdGVybWFyayByZWdpc3RlciBwcm9n cmFtbWluIGluIGEgY2FsbCB0bwppbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2UoKSBvciBz aW1pbGFyLgoKQ2M6IGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tCkNjOiB2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbQpDYzogbWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t CkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05 NDM0OQpGaXhlczogZWQ0YTZhN2NhODUzICgiZHJtL2k5MTU6IEFkZCB0d28tc3RhZ2UgSUxLLXN0 eWxlIHdhdGVybWFyayBwcm9ncmFtbWluZyAodjExKSIpClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9w ZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIHwgMjAgKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxMCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggNjJkMzZhNy4uMGFmMDhkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMTM3ODksMTYgKzEzNzg5LDYgQEAgc3RhdGljIGludCBpbnRlbF9h dG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKCFzdGF0ZS0+bGVnYWN5 X2N1cnNvcl91cGRhdGUpCiAJCWludGVsX2F0b21pY193YWl0X2Zvcl92YmxhbmtzKGRldiwgZGV2 X3ByaXYsIGNydGNfdmJsYW5rX21hc2spOwogCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0 ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZSh0b19p bnRlbF9jcnRjKGNydGMpKTsKLQotCQlpZiAocHV0X2RvbWFpbnNbaV0pCi0JCQltb2Rlc2V0X3B1 dF9wb3dlcl9kb21haW5zKGRldl9wcml2LCBwdXRfZG9tYWluc1tpXSk7Ci0JfQotCi0JaWYgKGlu dGVsX3N0YXRlLT5tb2Rlc2V0KQotCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwg UE9XRVJfRE9NQUlOX01PREVTRVQpOwotCiAJLyoKIAkgKiBOb3cgdGhhdCB0aGUgdmJsYW5rIGhh cyBwYXNzZWQsIHdlIGNhbiBnbyBhaGVhZCBhbmQgcHJvZ3JhbSB0aGUKIAkgKiBvcHRpbWFsIHdh dGVybWFya3Mgb24gcGxhdGZvcm1zIHRoYXQgbmVlZCB0d28tc3RlcCB3YXRlcm1hcmsKQEAgLTEz ODEzLDYgKzEzODAzLDE2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQkJZGV2X3ByaXYtPmRpc3BsYXkub3B0aW1pemVfd2F0ZXJtYXJr cyhpbnRlbF9jc3RhdGUpOwogCX0KIAorCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy dGMsIGNydGNfc3RhdGUsIGkpIHsKKwkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUodG9faW50ZWxf Y3J0YyhjcnRjKSk7CisKKwkJaWYgKHB1dF9kb21haW5zW2ldKQorCQkJbW9kZXNldF9wdXRfcG93 ZXJfZG9tYWlucyhkZXZfcHJpdiwgcHV0X2RvbWFpbnNbaV0pOworCX0KKworCWlmIChpbnRlbF9z dGF0ZS0+bW9kZXNldCkKKwkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsIFBPV0VS X0RPTUFJTl9NT0RFU0VUKTsKKwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlk cm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKIAltdXRleF91bmxv Y2soJmRldi0+c3RydWN0X211dGV4KTsKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK