From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 04/14] drm/i915: vlv: fix switcheroo/legacy suspend/resume Date: Thu, 23 Oct 2014 19:23:18 +0300 Message-ID: <1414081408-20498-5-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 554326E028 for ; Thu, 23 Oct 2014 09:25:09 -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: Sagar Kamble , shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org RHVyaW5nIHN3aXRjaGVyb28vbGVnYWN5IHN1c3BlbmQgd2UgZG9uJ3QgY2FsbCB0aGUgc3VzcGVu ZF9sYXRlIGhhbmRsZXIKYnV0IHdoZW4gcmVzdW1pbmcgYWZ0ZXJ3YXJkcyB3ZSBjYWxsIHJlc3Vt ZV9lYXJseS4gVGhpcyBoYXBwZW5lZCB0byB3b3JrCnNvIGZhciwgc2luY2Ugc3VzcGVuZF9sYXRl IG9ubHkgZGlzYWJsZWQgdGhlIFBDSSBkZXZpY2UuIFRoaXMgY2hhbmdlZCBpbgoKY29tbWl0IDAx Njk3MGJlYjA1ZGE2Mjg1YzJmM2VkMmJlZTFjNjc2Y2I3NTk3MmUKQXV0aG9yOiBTYWdhciBLYW1i bGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KRGF0ZTogICBXZWQgQXVnIDEzIDIzOjA3OjA2 IDIwMTQgKzA1MzAKCiAgICBkcm0vaTkxNTogU2hhcmluZyBwbGF0Zm9ybSBzcGVjaWZpYyBzZXF1 ZW5jZSBiZXR3ZWVuIHJ1bnRpbWUgYW5kIHN5c3RlbSBzdXNwCgphZnRlciB3aGljaCB3ZSBhbHNv IHNhdmVkL3Jlc3RvcmVkIHRoZSBWTFYgR3VuaXQgSFcgc3RhdGUgaW4Kc3VzcGVuZF9sYXRlL3Jl c3VtZV9lYXJseS4gU28gbm93IHNpbmNlIHdlIGRvbid0IHNhdmUgdGhlIHN0YXRlIGR1cmluZwpz dXNwZW5kIGEgZm9sbG93aW5nIHJlc3VtZSB3aWxsIHJlc3RvcmUgYSBjb3JydXB0ZWQgc3RhdGUu CgpGaXggdGhpcyBieSBjYWxsaW5nIHRoZSBzdXNwZW5kX2xhdGUgaGFuZGxlciBkdXJpbmcgYm90 aCBzd2l0Y2hlcm9vIGFuZApsZWdhY3kgc3VzcGVuZC4KCkNDOiBTYWdhciBLYW1ibGUgPHNhZ2Fy LmEua2FtYmxlQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtA aW50ZWwuY29tPgpSZXZpZXdlZC1ieTogU2FnYXIgS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRl bC5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAxNyArKysr KysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA1MjRjM2RmLi4yMDNiZDgyIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTY3MCwxMSArNjcwLDcgQEAgaW50IGk5MTVfc3VzcGVu ZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBwbV9tZXNzYWdlX3Qgc3RhdGUpCiAJaWYgKGVycm9y KQogCQlyZXR1cm4gZXJyb3I7CiAKLQkvKiBTaHV0IGRvd24gdGhlIGRldmljZSAqLwotCXBjaV9k aXNhYmxlX2RldmljZShkZXYtPnBkZXYpOwotCXBjaV9zZXRfcG93ZXJfc3RhdGUoZGV2LT5wZGV2 LCBQQ0lfRDNob3QpOwotCi0JcmV0dXJuIDA7CisJcmV0dXJuIGk5MTVfZHJtX3N1c3BlbmRfbGF0 ZShkZXYpOwogfQogCiBzdGF0aWMgaW50IGk5MTVfZHJtX3RoYXdfZWFybHkoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKQEAgLTc5MCw3ICs3ODYsNyBAQCBzdGF0aWMgaW50IGk5MTVfcmVzdW1lX2Vh cmx5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIGk5MTVfZHJtX3RoYXdfZWFybHko ZGV2KTsKIH0KIAotaW50IGk5MTVfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0 aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJl dDsKQEAgLTgxNiw3ICs4MTIsMTIgQEAgc3RhdGljIGludCBpOTE1X3Jlc3VtZV9sZWdhY3koc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0dXJu IGk5MTVfcmVzdW1lKGRldik7CisJcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZShkZXYpOworfQorCitp bnQgaTkxNV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlyZXR1cm4gaTkxNV9y ZXN1bWVfbGVnYWN5KGRldik7CiB9CiAKIC8qKgpAQCAtMTAwNCw3ICsxMDA1LDcgQEAgc3RhdGlj IGludCBpOTE1X3BtX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJc3RydWN0IHBjaV9kZXYg KnBkZXYgPSB0b19wY2lfZGV2KGRldik7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSBw Y2lfZ2V0X2RydmRhdGEocGRldik7CiAKLQlyZXR1cm4gaTkxNV9yZXN1bWUoZHJtX2Rldik7CisJ cmV0dXJuIGk5MTVfZHJtX3Jlc3VtZShkcm1fZGV2KTsKIH0KIAogc3RhdGljIGludCBpOTE1X3Bt X2ZyZWV6ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCi0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK