From: Imre Deak Subject: [PATCH] drm/i915/hsw: Fix GPU hang during resume from S3-devices state Date: Wed, 12 Oct 2016 17:46:37 +0300 Message-ID: <1476283597-580-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 ESMTPS id 441026E3E0 for ; Wed, 12 Oct 2016 14:46:41 +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 Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org Q3VycmVudGx5IHJlc3VtaW5nIG9uIEhTVyBmcm9tIFMzIHBtX3Rlc3QvZGV2aWNlcyBzdGF0ZSBs ZWFkcyB0byBhbgp1bnJlY292ZXJhYmxlIEdQVSBoYW5nLiBSZXNldHRpbmcgdGhlIEdQVSBkdXJp bmcgc3VzcGVuZCBmaXhlcyB0aGlzLiBGb3IKYSBmdWxsIFMzIGN5Y2xlIHRoaXMgY2hhbmdlIG9u bHkgbWVhbnMgdGhlIHJlc2V0IGhhcHBlbnMgZWFybGllciAoYmVmb3JlCnJlYWNoaW5nIFMzKS4g Rm9yIFM0IHRoZSByZXNldCB3aWxsIGhhcHBlbiBub3cgYm90aCBkdXJpbmcgdGhlIGZyZWV6ZQph bmQgcXVpZXNjZSBwaGFzZXMsIHdoaWNoIGlzIGEgYmVuZWZpdCBzaW5jZSBpdCB3aWxsIGd1YXJh bnRlZSB0aGF0IHRoZQpHUFUgaXMgaWRsZSBiZWZvcmUgY3JlYXRpbmcgYW5kIGxvYWRpbmcgdGhl IGhpYmVybmF0aW9uIGltYWdlLgoKQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClN1Z2dl c3RlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1v ZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIHwgMjggKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDI0ICsrKysrKysrKysrKysrKysrKysrKysr KwogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA4OWQzMjIyLi5lOWIzYmZjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKQEAgLTUzMiwzMiArNTMyLDYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCB2Z2Ff c3dpdGNoZXJvb19jbGllbnRfb3BzIGk5MTVfc3dpdGNoZXJvb19vcHMgPSB7CiAKIHN0YXRpYyB2 b2lkIGk5MTVfZ2VtX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KLQkvKgotCSAqIE5laXRo ZXIgdGhlIEJJT1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCi0JICogZXhwZWN0cyB0 aGUgc3lzdGVtIHRvIGJlIGluIGV4ZWNsaXN0cyBtb2RlIG9uIHN0YXJ0dXAsCi0JICogc28gd2Ug bmVlZCB0byByZXNldCB0aGUgR1BVIGJhY2sgdG8gbGVnYWN5IG1vZGUuIEFuZCB0aGUgb25seQot CSAqIGtub3duIHdheSB0byBkaXNhYmxlIGxvZ2ljYWwgY29udGV4dHMgaXMgdGhyb3VnaCBhIEdQ VSByZXNldC4KLQkgKgotCSAqIFNvIGluIG9yZGVyIHRvIGxlYXZlIHRoZSBzeXN0ZW0gaW4gYSBr bm93biBkZWZhdWx0IGNvbmZpZ3VyYXRpb24sCi0JICogYWx3YXlzIHJlc2V0IHRoZSBHUFUgdXBv biB1bmxvYWQuIEFmdGVyd2FyZHMgd2UgdGhlbiBjbGVhbiB1cCB0aGUKLQkgKiBHRU0gc3RhdGUg dHJhY2tpbmcsIGZsdXNoaW5nIG9mZiB0aGUgcmVxdWVzdHMgYW5kIGxlYXZpbmcgdGhlCi0JICog c3lzdGVtIGluIGEga25vd24gaWRsZSBzdGF0ZS4KLQkgKgotCSAqIE5vdGUgdGhhdCBpcyBvZiB0 aGUgdXBtb3N0IGltcG9ydGFuY2UgdGhhdCB0aGUgR1BVIGlzIGlkbGUgYW5kCi0JICogYWxsIHN0 cmF5IHdyaXRlcyBhcmUgZmx1c2hlZCAqYmVmb3JlKiB3ZSBkaXNtYW50bGUgdGhlIGJhY2tpbmcK LQkgKiBzdG9yYWdlIGZvciB0aGUgcGlubmVkIG9iamVjdHMuCi0JICoKLQkgKiBIb3dldmVyLCBz aW5jZSB3ZSBhcmUgdW5jZXJ0YWluIHRoYXQgcmVzZXRpbmcgdGhlIEdQVSBvbiBvbGRlcgotCSAq IG1hY2hpbmVzIGlzIGEgZ29vZCBpZGVhLCB3ZSBkb24ndCAtIGp1c3QgaW4gY2FzZSBpdCBsZWF2 ZXMgdGhlCi0JICogbWFjaGluZSBpbiBhbiB1bnVzYWJsZSBjb25kaXRpb24uCi0JICovCi0JaWYg KEhBU19IV19DT05URVhUUyhkZXYpKSB7Ci0JCWludCByZXNldCA9IGludGVsX2dwdV9yZXNldChk ZXZfcHJpdiwgQUxMX0VOR0lORVMpOwotCQlXQVJOX09OKHJlc2V0ICYmIHJlc2V0ICE9IC1FTk9E RVYpOwotCX0KLQogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlpOTE1X2dlbV9j bGVhbnVwX2VuZ2luZXMoZGV2KTsKIAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKQEAgLTYz Niw2ICs2MTAsOCBAQCBzdGF0aWMgaW50IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIAogY2xlYW51cF9nZW06CisJaWYgKGk5MTVfZ2Vt X3N1c3BlbmQoZGV2KSkKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gaWRsZSBoYXJkd2FyZTsgY29u dGludWluZyB0byB1bmxvYWQhXG4iKTsKIAlpOTE1X2dlbV9maW5pKGRldik7CiBjbGVhbnVwX2ly cToKIAlpbnRlbF9ndWNfZmluaShkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZmRk NDk2ZS4uYTg2YmM4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00MjczLDYgKzQyNzMs MzAgQEAgaW50IGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKi8K IAlXQVJOX09OKGRldl9wcml2LT5ndC5hd2FrZSk7CiAKKwkvKgorCSAqIE5laXRoZXIgdGhlIEJJ T1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCisJICogZXhwZWN0cyB0aGUgc3lzdGVt IHRvIGJlIGluIGV4ZWNsaXN0cyBtb2RlIG9uIHN0YXJ0dXAsCisJICogc28gd2UgbmVlZCB0byBy ZXNldCB0aGUgR1BVIGJhY2sgdG8gbGVnYWN5IG1vZGUuIEFuZCB0aGUgb25seQorCSAqIGtub3du IHdheSB0byBkaXNhYmxlIGxvZ2ljYWwgY29udGV4dHMgaXMgdGhyb3VnaCBhIEdQVSByZXNldC4K KwkgKgorCSAqIFNvIGluIG9yZGVyIHRvIGxlYXZlIHRoZSBzeXN0ZW0gaW4gYSBrbm93biBkZWZh dWx0IGNvbmZpZ3VyYXRpb24sCisJICogYWx3YXlzIHJlc2V0IHRoZSBHUFUgdXBvbiB1bmxvYWQg YW5kIHN1c3BlbmQuIEFmdGVyd2FyZHMgd2UgdGhlbgorCSAqIGNsZWFuIHVwIHRoZSBHRU0gc3Rh dGUgdHJhY2tpbmcsIGZsdXNoaW5nIG9mZiB0aGUgcmVxdWVzdHMgYW5kCisJICogbGVhdmluZyB0 aGUgc3lzdGVtIGluIGEga25vd24gaWRsZSBzdGF0ZS4KKwkgKgorCSAqIE5vdGUgdGhhdCBpcyBv ZiB0aGUgdXBtb3N0IGltcG9ydGFuY2UgdGhhdCB0aGUgR1BVIGlzIGlkbGUgYW5kCisJICogYWxs IHN0cmF5IHdyaXRlcyBhcmUgZmx1c2hlZCAqYmVmb3JlKiB3ZSBkaXNtYW50bGUgdGhlIGJhY2tp bmcKKwkgKiBzdG9yYWdlIGZvciB0aGUgcGlubmVkIG9iamVjdHMuCisJICoKKwkgKiBIb3dldmVy LCBzaW5jZSB3ZSBhcmUgdW5jZXJ0YWluIHRoYXQgcmVzZXRpbmcgdGhlIEdQVSBvbiBvbGRlcgor CSAqIG1hY2hpbmVzIGlzIGEgZ29vZCBpZGVhLCB3ZSBkb24ndCAtIGp1c3QgaW4gY2FzZSBpdCBs ZWF2ZXMgdGhlCisJICogbWFjaGluZSBpbiBhbiB1bnVzYWJsZSBjb25kaXRpb24uCisJICovCisJ aWYgKEhBU19IV19DT05URVhUUyhkZXYpKSB7CisJCWludCByZXNldCA9IGludGVsX2dwdV9yZXNl dChkZXZfcHJpdiwgQUxMX0VOR0lORVMpOworCQlXQVJOX09OKHJlc2V0ICYmIHJlc2V0ICE9IC1F Tk9ERVYpOworCX0KKwogCXJldHVybiAwOwogCiBlcnI6Ci0tIAoyLjUuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==