From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 13/14] drm/i915: unify switcheroo and legacy suspend/resume handlers Date: Thu, 23 Oct 2014 19:23:27 +0300 Message-ID: <1414081408-20498-14-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id DB9116E4C4 for ; Thu, 23 Oct 2014 09:25:22 -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 Qnkgbm93IHdlIGhhbmRsZSBzd2l0Y2hlcm9vIGFuZCBsZWdhY3kgc3VzcGVuZC9yZXN1bWUgdGhl IHNhbWUgd2F5LCBzbwpubyBuZWVkIHRvIGtlZXAgc2VwYXJhdGUgZnVuY3Rpb25zIGZvciB0aGVt LgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUu ZGVha0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMg fCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgMTEgKysrLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgNCArKy0tCiAzIGZpbGVzIGNo YW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZG1hLmMKaW5kZXggMWIzOTgwNy4uOWE3MzUzMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBA IC0xMjc1LDEyICsxMjc1LDEyIEBAIHN0YXRpYyB2b2lkIGk5MTVfc3dpdGNoZXJvb19zZXRfc3Rh dGUoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGVudW0gdmdhX3N3aXRjaGVyb29fCiAJCWRldi0+c3dp dGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dFUl9DSEFOR0lORzsKIAkJLyogaTkxNSBy ZXN1bWUgaGFuZGxlciBkb2Vzbid0IHNldCB0byBEMCAqLwogCQlwY2lfc2V0X3Bvd2VyX3N0YXRl KGRldi0+cGRldiwgUENJX0QwKTsKLQkJaTkxNV9yZXN1bWUoZGV2KTsKKwkJaTkxNV9yZXN1bWVf bGVnYWN5KGRldik7CiAJCWRldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dF Ul9PTjsKIAl9IGVsc2UgewogCQlwcl9lcnIoInN3aXRjaGVkIG9mZlxuIik7CiAJCWRldi0+c3dp dGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dFUl9DSEFOR0lORzsKLQkJaTkxNV9zdXNw ZW5kKGRldiwgcG1tKTsKKwkJaTkxNV9zdXNwZW5kX2xlZ2FjeShkZXYsIHBtbSk7CiAJCWRldi0+ c3dpdGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dFUl9PRkY7CiAJfQogfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmMKaW5kZXggODA4ZjY1OS4uYmNlNThkMyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCkBAIC02NDksNyArNjQ5LDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYpCiAJcmV0dXJuIDA7CiB9CiAKLWludCBpOTE1 X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgcG1fbWVzc2FnZV90IHN0YXRlKQoraW50 IGk5MTVfc3VzcGVuZF9sZWdhY3koc3RydWN0IGRybV9kZXZpY2UgKmRldiwgcG1fbWVzc2FnZV90 IHN0YXRlKQogewogCWludCBlcnJvcjsKIApAQCAtNzcxLDcgKzc3MSw3IEBAIHN0YXRpYyBpbnQg aTkxNV9kcm1fcmVzdW1lX2Vhcmx5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIHJl dDsKIH0KIAotc3RhdGljIGludCBpOTE1X3Jlc3VtZV9sZWdhY3koc3RydWN0IGRybV9kZXZpY2Ug KmRldikKK2ludCBpOTE1X3Jlc3VtZV9sZWdhY3koc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsK IAlpbnQgcmV0OwogCkBAIC03ODUsMTEgKzc4NSw2IEBAIHN0YXRpYyBpbnQgaTkxNV9yZXN1bWVf bGVnYWN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZShk ZXYpOwogfQogCi1pbnQgaTkxNV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQly ZXR1cm4gaTkxNV9yZXN1bWVfbGVnYWN5KGRldik7Ci19Ci0KIC8qKgogICogaTkxNV9yZXNldCAt IHJlc2V0IGNoaXAgYWZ0ZXIgYSBoYW5nCiAgKiBAZGV2OiBkcm0gZGV2aWNlIHRvIHJlc2V0CkBA IC0xNTkyLDcgKzE1ODcsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgZHJpdmVyID0gewog CS5zZXRfYnVzaWQgPSBkcm1fcGNpX3NldF9idXNpZCwKIAogCS8qIFVzZWQgaW4gcGxhY2Ugb2Yg aTkxNV9wbV9vcHMgZm9yIG5vbi1EUklWRVJfTU9ERVNFVCAqLwotCS5zdXNwZW5kID0gaTkxNV9z dXNwZW5kLAorCS5zdXNwZW5kID0gaTkxNV9zdXNwZW5kX2xlZ2FjeSwKIAkucmVzdW1lID0gaTkx NV9yZXN1bWVfbGVnYWN5LAogCiAJLmRldmljZV9pc19hZ3AgPSBpOTE1X2RyaXZlcl9kZXZpY2Vf aXNfYWdwLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMzIxMmQ2Mi4uMDU5MzMwYyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMjIxLDggKzIyMjEsOCBAQCBzdHJ1Y3QgZHJtX2k5 MTVfY21kX3RhYmxlIHsKIGV4dGVybiBjb25zdCBzdHJ1Y3QgZHJtX2lvY3RsX2Rlc2MgaTkxNV9p b2N0bHNbXTsKIGV4dGVybiBpbnQgaTkxNV9tYXhfaW9jdGw7CiAKLWV4dGVybiBpbnQgaTkxNV9z dXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHBtX21lc3NhZ2VfdCBzdGF0ZSk7Ci1leHRl cm4gaW50IGk5MTVfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBp OTE1X3N1c3BlbmRfbGVnYWN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHBtX21lc3NhZ2VfdCBz dGF0ZSk7CitleHRlcm4gaW50IGk5MTVfcmVzdW1lX2xlZ2FjeShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIGV4dGVybiBpbnQgaTkxNV9tYXN0ZXJfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBkcm1fbWFzdGVyICptYXN0ZXIpOwogZXh0ZXJuIHZvaWQgaTkxNV9tYXN0ZXJf ZGVzdHJveShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX21hc3RlciAqbWFzdGVy KTsKIAotLSAKMS44LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==