From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 10/14] drm/i915: unify S3 and S4 suspend/resume handlers Date: Thu, 23 Oct 2014 19:23:24 +0300 Message-ID: <1414081408-20498-11-git-send-email-imre.deak@intel.com> References: <1414081408-20498-1-git-send-email-imre.deak@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 A22396E028 for ; Thu, 23 Oct 2014 09:24:25 -0700 (PDT) In-Reply-To: <1414081408-20498-1-git-send-email-imre.deak@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: shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlIFMzIGFuZCBTNCBldmVudHMgYXJlIG5vdyBoYW5kbGVkIHRoZSBzYW1lIHdheSBpbnRlcm5h bGx5LCB0aGVyZSBpcyBubwpuZWVkIHRvIGtlZXAgc2VwYXJhdGUgd3JhcHBlciBmdW5jdGlvbnMg YXJvdW5kIHRoZW0uIFNpbXBseSByZXVzZSB0aGUKc3VzcGVuZC9yZXN1bWUgdmVyc2lvbnMgZXZl cnl3aGVyZS4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFr IDxpbXJlLmRlYWtAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jIHwgMTA0ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCA4NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwppbmRleCBiZTRjYjFkLi4yMTkwZDBmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKQEAgLTY3MywyMiArNjczLDYgQEAgaW50IGk5MTVfc3VzcGVuZChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBwbV9tZXNzYWdlX3Qgc3RhdGUpCiAJcmV0dXJuIGk5MTVfZHJtX3N1c3BlbmRf bGF0ZShkZXYpOwogfQogCi1zdGF0aWMgaW50IGk5MTVfZHJtX3RoYXdfZWFybHkoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwotCWludCByZXQ7Ci0KLQlyZXQgPSBpbnRlbF9yZXN1bWVfcHJlcGFy ZShkZXZfcHJpdiwgZmFsc2UpOwotCWlmIChyZXQpCi0JCURSTV9FUlJPUigiUmVzdW1lIHByZXBh cmUgZmFpbGVkOiAlZCxDb250aW51aW5nIHJlc3VtZVxuIiwgcmV0KTsKLQotCWludGVsX3VuY29y ZV9lYXJseV9zYW5pdGl6ZShkZXYsIHRydWUpOwotCWludGVsX3VuY29yZV9zYW5pdGl6ZShkZXYp OwotCWludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdF9odyhkZXZfcHJpdik7Ci0KLQlyZXR1cm4gcmV0 OwotfQotCiBzdGF0aWMgaW50IF9faTkxNV9kcm1fdGhhdyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CkBAIC03NTcsMTMgKzc0MSwxMSBAQCBzdGF0aWMgaW50IF9faTkxNV9kcm1fdGhhdyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGk5MTVfZHJt X3RoYXcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQlyZXR1cm4gX19pOTE1X2RybV90aGF3 KGRldik7Ci19Ci0KIHN0YXRpYyBpbnQgaTkxNV9yZXN1bWVfZWFybHkoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOworCWludCByZXQ7CisKIAkvKgogCSAqIFdlIGhhdmUgYSByZXN1bWUgb3JkZXJp bmcgaXNzdWUgd2l0aCB0aGUgc25kLWhkYSBkcml2ZXIgYWxzbwogCSAqIHJlcXVpcmluZyBvdXIg ZGV2aWNlIHRvIGJlIHBvd2VyIHVwLiBEdWUgdG8gdGhlIGxhY2sgb2YgYQpAQCAtNzc4LDcgKzc2 MCwxNSBAQCBzdGF0aWMgaW50IGk5MTVfcmVzdW1lX2Vhcmx5KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAlwY2lfc2V0X21hc3RlcihkZXYtPnBkZXYpOwogCi0JcmV0dXJuIGk5MTVfZHJtX3Ro YXdfZWFybHkoZGV2KTsKKwlyZXQgPSBpbnRlbF9yZXN1bWVfcHJlcGFyZShkZXZfcHJpdiwgZmFs c2UpOworCWlmIChyZXQpCisJCURSTV9FUlJPUigiUmVzdW1lIHByZXBhcmUgZmFpbGVkOiAlZCxD b250aW51aW5nIHJlc3VtZVxuIiwgcmV0KTsKKworCWludGVsX3VuY29yZV9lYXJseV9zYW5pdGl6 ZShkZXYsIHRydWUpOworCWludGVsX3VuY29yZV9zYW5pdGl6ZShkZXYpOworCWludGVsX3Bvd2Vy X2RvbWFpbnNfaW5pdF9odyhkZXZfcHJpdik7CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMg aW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtOTk5LDY2ICs5 ODksNiBAQCBzdGF0aWMgaW50IGk5MTVfcG1fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikKIAly ZXR1cm4gaTkxNV9kcm1fcmVzdW1lKGRybV9kZXYpOwogfQogCi1zdGF0aWMgaW50IGk5MTVfcG1f ZnJlZXplKHN0cnVjdCBkZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRv X3BjaV9kZXYoZGV2KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2 ZGF0YShwZGV2KTsKLQotCWlmICghZHJtX2RldiB8fCAhZHJtX2Rldi0+ZGV2X3ByaXZhdGUpIHsK LQkJZGV2X2VycihkZXYsICJEUk0gbm90IGluaXRpYWxpemVkLCBhYm9ydGluZyBzdXNwZW5kLlxu Iik7Ci0JCXJldHVybiAtRU5PREVWOwotCX0KLQotCWlmIChkcm1fZGV2LT5zd2l0Y2hfcG93ZXJf c3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCi0JCXJldHVybiAwOwotCi0JcmV0dXJuIGk5 MTVfZHJtX2ZyZWV6ZShkcm1fZGV2KTsKLX0KLQotc3RhdGljIGludCBpOTE1X3BtX2ZyZWV6ZV9s YXRlKHN0cnVjdCBkZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3Bj aV9kZXYoZGV2KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2ZGF0 YShwZGV2KTsKLQotCWlmIChkcm1fZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRD SF9QT1dFUl9PRkYpCi0JCXJldHVybiAwOwotCi0JcmV0dXJuIGk5MTVfZHJtX3N1c3BlbmRfbGF0 ZShkcm1fZGV2KTsKLX0KLQotc3RhdGljIGludCBpOTE1X3BtX3RoYXdfZWFybHkoc3RydWN0IGRl dmljZSAqZGV2KQotewotCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gdG9fcGNpX2RldihkZXYpOwot CXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gcGNpX2dldF9kcnZkYXRhKHBkZXYpOwotCi0J aWYgKGRybV9kZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1fU1dJVENIX1BPV0VSX09GRikK LQkJcmV0dXJuIDA7Ci0KLQlyZXR1cm4gaTkxNV9yZXN1bWVfZWFybHkoZHJtX2Rldik7Ci19Ci0K LXN0YXRpYyBpbnQgaTkxNV9wbV90aGF3KHN0cnVjdCBkZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3Qg cGNpX2RldiAqcGRldiA9IHRvX3BjaV9kZXYoZGV2KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZHJt X2RldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKLQotCWlmIChkcm1fZGV2LT5zd2l0Y2hfcG93 ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCi0JCXJldHVybiAwOwotCi0JcmV0dXJu IGk5MTVfZHJtX3RoYXcoZHJtX2Rldik7Ci19Ci0KLXN0YXRpYyBpbnQgaTkxNV9wbV9wb3dlcm9m ZihzdHJ1Y3QgZGV2aWNlICpkZXYpCi17Ci0Jc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lf ZGV2KGRldik7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSBwY2lfZ2V0X2RydmRhdGEo cGRldik7Ci0KLQlpZiAoZHJtX2Rldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID09IERSTV9TV0lUQ0hf UE9XRVJfT0ZGKQotCQlyZXR1cm4gMDsKLQotCXJldHVybiBpOTE1X2RybV9mcmVlemUoZHJtX2Rl dik7Ci19Ci0KIHN0YXRpYyBpbnQgaHN3X3N1c3BlbmRfY29tcGxldGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewogCWhzd19lbmFibGVfcGM4KGRldl9wcml2KTsKQEAgLTE2 MTgsMTEgKzE1NDgsMTEgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkZXZfcG1fb3BzIGk5MTVfcG1f b3BzID0gewogCS5zdXNwZW5kX2xhdGUgPSBpOTE1X3BtX3N1c3BlbmRfbGF0ZSwKIAkucmVzdW1l X2Vhcmx5ID0gaTkxNV9wbV9yZXN1bWVfZWFybHksCiAJLnJlc3VtZSA9IGk5MTVfcG1fcmVzdW1l LAotCS5mcmVlemUgPSBpOTE1X3BtX2ZyZWV6ZSwKLQkuZnJlZXplX2xhdGUgPSBpOTE1X3BtX2Zy ZWV6ZV9sYXRlLAotCS50aGF3X2Vhcmx5ID0gaTkxNV9wbV90aGF3X2Vhcmx5LAotCS50aGF3ID0g aTkxNV9wbV90aGF3LAotCS5wb3dlcm9mZiA9IGk5MTVfcG1fcG93ZXJvZmYsCisJLmZyZWV6ZSA9 IGk5MTVfcG1fc3VzcGVuZCwKKwkuZnJlZXplX2xhdGUgPSBpOTE1X3BtX3N1c3BlbmRfbGF0ZSwK KwkudGhhd19lYXJseSA9IGk5MTVfcG1fcmVzdW1lX2Vhcmx5LAorCS50aGF3ID0gaTkxNV9wbV9y ZXN1bWUsCisJLnBvd2Vyb2ZmID0gaTkxNV9wbV9zdXNwZW5kLAogCS5yZXN0b3JlX2Vhcmx5ID0g aTkxNV9wbV9yZXN1bWVfZWFybHksCiAJLnJlc3RvcmUgPSBpOTE1X3BtX3Jlc3VtZSwKIAkucnVu dGltZV9zdXNwZW5kID0gaW50ZWxfcnVudGltZV9zdXNwZW5kLAotLSAKMS44LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==