From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 05/14] drm/i915: fix S4 suspend while switcheroo state is off Date: Thu, 23 Oct 2014 19:23:19 +0300 Message-ID: <1414081408-20498-6-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CF936E4B7 for ; Thu, 23 Oct 2014 09:23:56 -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 SWYgdGhlIGRldmljZSBpcyBzdXNwZW5kZWQgYWxyZWFkeSB0aHJvdWdoIHRoZSBzd2l0Y2hlcm9v IGludGVyZmFjZSB3ZQpzaG91bGRuJ3Qgc3VzcGVuZCBpdCBhZ2FpbiBvciByZXN1bWUgaXQgYWZ0 ZXIgc3VzcGVuZC4gV2UgaGF2ZSB0aGUKY29ycmVzcG9uZGluZyBjaGVjayBmb3IgUzMgc3VzcGVu ZCBhbHJlYWR5LCBhZGQgaXQgZm9yIGFsbCB0aGUgb3RoZXIKUzMgYW5kIFM0IGhhbmRsZXJzLiBB bHNvIG1vdmUgdGhlIGNoZWNrIGZyb20gaTkxNV9yZXN1bWVfZWFybHkoKSB0bwppOTE1X3Jlc3Vt ZV9sZWdhY3koKSwgc28gdGhhdCBpdCdzIGRvbmUgaW4gdGhlIGhpZ2ggbGV2ZWwgaGFuZGxlciBm b3IKYWxsIFBNIGV2ZW50cy4KCnYyOgotIGZpeCB0aGUgcmVzdW1lIHBhdGggdG9vLCB3ZSBkb24n dCBuZWVkIHRvIHNwZWNpYWwgY2FzZSB0aGVyZQogIERSTV9TV0lUQ0hfUE9XRVJfT0ZGIHdpdGgg dGhlIGRldmljZSBiZWluZyBlbmFibGVkIChpbiB3aGljaCBjYXNlIHdlJ2QKICBoYXZlIHRvIGRp c2FibGUgdGhlIGRldmljZSksIHNpbmNlIHRoYXQgbmV2ZXIgaGFwcGVucyAoVmlsbGUpCgpTaWdu ZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAyNyArKysrKysrKysrKysrKysrKysrKysrKyst LS0KIDEgZmlsZSBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDIwM2JkODIuLjY5OTM2MzIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwpAQCAtNzY2LDkgKzc2Niw2IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fdGhhdyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiBzdGF0aWMgaW50IGk5MTVfcmVzdW1lX2Vhcmx5KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0JaWYgKGRldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID09 IERSTV9TV0lUQ0hfUE9XRVJfT0ZGKQotCQlyZXR1cm4gMDsKLQogCS8qCiAJICogV2UgaGF2ZSBh IHJlc3VtZSBvcmRlcmluZyBpc3N1ZSB3aXRoIHRoZSBzbmQtaGRhIGRyaXZlciBhbHNvCiAJICog cmVxdWlyaW5nIG91ciBkZXZpY2UgdG8gYmUgcG93ZXIgdXAuIER1ZSB0byB0aGUgbGFjayBvZiBh CkBAIC04MDgsNiArODA1LDkgQEAgc3RhdGljIGludCBpOTE1X3Jlc3VtZV9sZWdhY3koc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIHsKIAlpbnQgcmV0OwogCisJaWYgKGRldi0+c3dpdGNoX3Bvd2Vy X3N0YXRlID09IERSTV9TV0lUQ0hfUE9XRVJfT0ZGKQorCQlyZXR1cm4gMDsKKwogCXJldCA9IGk5 MTVfcmVzdW1lX2Vhcmx5KGRldik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTk5Nyw2 ICs5OTcsOSBAQCBzdGF0aWMgaW50IGk5MTVfcG1fcmVzdW1lX2Vhcmx5KHN0cnVjdCBkZXZpY2Ug KmRldikKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3BjaV9kZXYoZGV2KTsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKIAorCWlmIChkcm1f ZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCisJCXJldHVy biAwOworCiAJcmV0dXJuIGk5MTVfcmVzdW1lX2Vhcmx5KGRybV9kZXYpOwogfQogCkBAIC0xMDA1 LDYgKzEwMDgsOSBAQCBzdGF0aWMgaW50IGk5MTVfcG1fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRl dikKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3BjaV9kZXYoZGV2KTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKIAorCWlmIChkcm1fZGV2 LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCisJCXJldHVybiAw OworCiAJcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZShkcm1fZGV2KTsKIH0KIApAQCAtMTAxOCw2ICsx MDI0LDkgQEAgc3RhdGljIGludCBpOTE1X3BtX2ZyZWV6ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJ CXJldHVybiAtRU5PREVWOwogCX0KIAorCWlmIChkcm1fZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUg PT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCisJCXJldHVybiAwOworCiAJcmV0dXJuIGk5MTVfZHJt X2ZyZWV6ZShkcm1fZGV2KTsKIH0KIApAQCAtMTAyNyw2ICsxMDM2LDkgQEAgc3RhdGljIGludCBp OTE1X3BtX2ZyZWV6ZV9sYXRlKHN0cnVjdCBkZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkcm1fZGV2LT5kZXZfcHJpdmF0ZTsKIAorCWlmIChkcm1fZGV2LT5z d2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCisJCXJldHVybiAwOwor CiAJcmV0dXJuIGludGVsX3N1c3BlbmRfY29tcGxldGUoZGV2X3ByaXYpOwogfQogCkBAIC0xMDM1 LDYgKzEwNDcsOSBAQCBzdGF0aWMgaW50IGk5MTVfcG1fdGhhd19lYXJseShzdHJ1Y3QgZGV2aWNl ICpkZXYpCiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldik7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRybV9kZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7CiAKKwlpZiAoZHJt X2Rldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID09IERSTV9TV0lUQ0hfUE9XRVJfT0ZGKQorCQlyZXR1 cm4gMDsKKwogCXJldHVybiBpOTE1X2RybV90aGF3X2Vhcmx5KGRybV9kZXYpOwogfQogCkBAIC0x MDQzLDYgKzEwNTgsOSBAQCBzdGF0aWMgaW50IGk5MTVfcG1fdGhhdyhzdHJ1Y3QgZGV2aWNlICpk ZXYpCiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldik7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRybV9kZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7CiAKKwlpZiAoZHJtX2Rl di0+c3dpdGNoX3Bvd2VyX3N0YXRlID09IERSTV9TV0lUQ0hfUE9XRVJfT0ZGKQorCQlyZXR1cm4g MDsKKwogCXJldHVybiBpOTE1X2RybV90aGF3KGRybV9kZXYpOwogfQogCkBAIC0xMDUxLDYgKzEw NjksOSBAQCBzdGF0aWMgaW50IGk5MTVfcG1fcG93ZXJvZmYoc3RydWN0IGRldmljZSAqZGV2KQog CXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gdG9fcGNpX2RldihkZXYpOwogCXN0cnVjdCBkcm1fZGV2 aWNlICpkcm1fZGV2ID0gcGNpX2dldF9kcnZkYXRhKHBkZXYpOwogCisJaWYgKGRybV9kZXYtPnN3 aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1fU1dJVENIX1BPV0VSX09GRikKKwkJcmV0dXJuIDA7CisK IAlyZXR1cm4gaTkxNV9kcm1fZnJlZXplKGRybV9kZXYpOwogfQogCi0tIAoxLjguNAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK