From: Manasi Navare Subject: [PATCH] drm/i915: Cancel the modeset retry work during modeset cleanup Date: Wed, 25 Oct 2017 18:20:04 -0700 Message-ID: <1508980804-17197-1-git-send-email-manasi.d.navare@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 ESMTPS id 0E4A46E734 for ; Thu, 26 Oct 2017 01:15:33 +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: Tony Cheng , Daniel Vetter , Harry Wentland List-Id: intel-gfx@lists.freedesktop.org RHVyaW5nIG1vZGVzZXQgY2xlYW51cCBvbiBkcml2ZXIgdW5sb2FkIHdlIG1heSBoYXZlIGEgcGVu ZGluZwpob3RwbHVnIHdvcmsuIFRoaXMgbmVlZHMgdG8gYmUgY2FuY2VsIGVhcmx5IGR1cmluZyB0 aGUgdGVhcmRvd24Kc28gdGhhdCBpdCBkb2VzIG5vdCBmaXJlIGFmdGVyIHdlIGhhdmUgZnJlZWQg dGhlIGNvbm5lY3Rvci4KV2UgZG8gdGhpcyBhZnRlciBkcm1fa21zX2hlbHBlcl9wb2xsX2Zpbmko ZGV2KSBzaW5jZSB0aGlzIG1pZ2h0CmNhdXNlIGxpbmsgcmV0cmFpbiBhbmQgYmVmb3JlIGludGVs X2ZiZGV2X2ZpbmkoKSBzaW5jZSB0aGlzIHRyaWVzIHRvCmZyZWUgdGhlIGNvbm5lY3Rvci4KCklm IHRoaXMgaXMgbm90IGRvbmUgd2UgbWF5IHNlZSBzb21ldGhpbmcgbGlrZToKREVCVUdfTE9DS1Nf V0FSTl9PTihtdXRleF9pc19sb2NrZWQobG9jaykpCiAtLS0tLS0tLS0tLS1bIGN1dCBoZXJlIF0t LS0tLS0tLS0tLS0KIFdBUk5JTkc6IENQVTogNCBQSUQ6IDUwMTAgYXQga2VybmVsL2xvY2tpbmcv bXV0ZXgtZGVidWcuYzoxMDMgbXV0ZXhfZGVzdHJveSsweDRlLzB4NjAKIE1vZHVsZXMgbGlua2Vk IGluOiBpOTE1KC0pIHNuZF9oZGFfY29kZWNfaGRtaSBzbmRfaGRhX2NvZGVjX3JlYWx0ZWsgc25k X2hkYV9jb2RlY19nZW5lcmljIHNuZF9oZGFfY29kZWMgc25kX2h3ZGVwIHNuZF9oZGFfY29yZSBz bmRfcGNtIHZnZW0gYXg4ODE3OV8xNzgKK2EgdXNibmV0IG1paSB4ODZfcGtnX3RlbXBfdGhlcm1h bCBpbnRlbF9wb3dlcmNsYW1wIGNvcmV0ZW1wIGNyY3QxMGRpZl9wY2xtdWwgY3JjMzJfcGNsbXVs IGdoYXNoX2NsbXVsbmlfaW50ZWwgZTEwMDBlIHB0cCBwcHNfY29yZSBwcmltZV9udW1iZXJzIGky Y19oaWQKK1tsYXN0IHVubG9hZGVkOiBzbmRfaGRhX2ludGVsXQogQ1BVOiA0IFBJRDogNTAxMCBD b21tOiBkcnZfbW9kdWxlX3JlbG8gVGFpbnRlZDogRyAgICAgVSAgICAgICAgICA0LjE0LjAtcmMz LUNJLUNJX0RSTV8zMTg2KyAjMQogSGFyZHdhcmUgbmFtZTogSW50ZWwgQ29ycG9yYXRpb24gQ29m ZmVlTGFrZSBDbGllbnQgUGxhdGZvcm0vQ29mZmVlTGFrZSBTIFVESU1NIFJWUCwgQklPUyBDTkxT RldYMS5SMDAuWDEwNC5BMDMuMTcwOTE0MDUyNCAwOS8xNC8yMDE3CiB0YXNrOiBmZmZmODgwM2M4 MjdhYTQwIHRhc2suc3RhY2s6IGZmZmZjOTAwMDA1MjAwMDAKIFJJUDogMDAxMDptdXRleF9kZXN0 cm95KzB4NGUvMHg2MAogUlNQOiAwMDE4OmZmZmZjOTAwMDA1MjNkNTggRUZMQUdTOiAwMDAxMDI5 MgogUkFYOiAwMDAwMDAwMDAwMDAwMDJhIFJCWDogZmZmZjg4MDQ0ZmJlZjY0OCBSQ1g6IDAwMDAw MDAwMDAwMDAwMDAKIFJEWDogMDAwMDAwMDA4MDAwMDAwMSBSU0k6IDAwMDAwMDAwMDAwMDAwMDEg UkRJOiBmZmZmZmZmZjgxMGYwY2YwCiBSQlA6IGZmZmZjOTAwMDA1MjNkNjAgUjA4OiAwMDAwMDAw MDAwMDAwMDAxIFIwOTogMDAwMDAwMDAwMDAwMDAwMQogUjEwOiAwMDAwMDAwMDBmMjFjYjgxIFIx MTogMDAwMDAwMDAwMDAwMDAwMCBSMTI6IGZmZmY4ODA0NGY3MWVmYzgKIFIxMzogZmZmZmZmZmZh MDJiM2QyMCBSMTQ6IGZmZmZmZmZmYTAyYjNkOTAgUjE1OiBmZmZmODgwNDU5YjI5MzA4CiBGUzog IDAwMDA3ZjVkZjRkNmU4YzAoMDAwMCkgR1M6ZmZmZjg4MDQ1ZDMwMDAwMCgwMDAwKSBrbmxHUzow MDAwMDAwMDAwMDAwMDAwCiBDUzogIDAwMTAgRFM6IDAwMDAgRVM6IDAwMDAgQ1IwOiAwMDAwMDAw MDgwMDUwMDMzCiBDUjI6IDAwMDA1NWVjNTFmMDBhMTggQ1IzOiAwMDAwMDAwNDUxNzgyMDA2IENS NDogMDAwMDAwMDAwMDM2MDZlMAogRFIwOiAwMDAwMDAwMDAwMDAwMDAwIERSMTogMDAwMDAwMDAw MDAwMDAwMCBEUjI6IDAwMDAwMDAwMDAwMDAwMDAKIERSMzogMDAwMDAwMDAwMDAwMDAwMCBEUjY6 IDAwMDAwMDAwZmZmZTBmZjAgRFI3OiAwMDAwMDAwMDAwMDAwNDAwCiBDYWxsIFRyYWNlOgogIGRy bV9mYl9oZWxwZXJfZmluaSsweGQ5LzB4MTMwCiAgaW50ZWxfZmJkZXZfZGVzdHJveSsweDEyLzB4 NjAgW2k5MTVdCiAgaW50ZWxfZmJkZXZfZmluaSsweDI4LzB4MzAgW2k5MTVdCiAgaW50ZWxfbW9k ZXNldF9jbGVhbnVwKzB4NDUvMHhhMCBbaTkxNV0KICBpOTE1X2RyaXZlcl91bmxvYWQrMHg5Mi8w eDE4MCBbaTkxNV0KICBpOTE1X3BjaV9yZW1vdmUrMHgxOS8weDMwIFtpOTE1XQogIGk5MTVfZHJp dmVyX3VubG9hZCsweDkyLzB4MTgwIFtpOTE1XQogIGk5MTVfcGNpX3JlbW92ZSsweDE5LzB4MzAg W2k5MTVdCiAgcGNpX2RldmljZV9yZW1vdmUrMHgzOS8weGIwCiAgZGV2aWNlX3JlbGVhc2VfZHJp dmVyX2ludGVybmFsKzB4MTVkLzB4MjIwCiAgZHJpdmVyX2RldGFjaCsweDQwLzB4ODAKICBidXNf cmVtb3ZlX2RyaXZlcisweDU4LzB4ZDAKICBkcml2ZXJfdW5yZWdpc3RlcisweDJjLzB4NDAKICBw Y2lfdW5yZWdpc3Rlcl9kcml2ZXIrMHgzNi8weGIwCiAgaTkxNV9leGl0KzB4MWEvMHg4YiBbaTkx NV0KICBTeVNfZGVsZXRlX21vZHVsZSsweDE4Yy8weDFlMAogIGVudHJ5X1NZU0NBTExfNjRfZmFz dHBhdGgrMHgxYy8weGIxCiBSSVA6IDAwMzM6MHg3ZjVkZjMyODYyODcKIFJTUDogMDAyYjowMDAw N2ZmZjhlMTA3Y2M4IEVGTEFHUzogMDAwMDAyNDYgT1JJR19SQVg6IDAwMDAwMDAwMDAwMDAwYjAK IFJBWDogZmZmZmZmZmZmZmZmZmZkYSBSQlg6IGZmZmZmZmZmODE0OTNhMDMgUkNYOiAwMDAwN2Y1 ZGYzMjg2Mjg3CiBSRFg6IDAwMDAwMDAwMDAwMDAwMDEgUlNJOiAwMDAwMDAwMDAwMDAwODAwIFJE STogMDAwMDU2NGM3YmUwMmU0OAogUkJQOiBmZmZmYzkwMDAwNTIzZjg4IFIwODogMDAwMDAwMDAw MDAwMDAwMCBSMDk6IDAwMDAwMDAwMDAwMDAwODAKIFIxMDogMDAwMDdmNWRmNGQ2ZThjMCBSMTE6 IDAwMDAwMDAwMDAwMDAyNDYgUjEyOiAwMDAwMDAwMDAwMDAwMDAwCiBSMTM6IDAwMDA3ZmZmOGUx MDdlYjAgUjE0OiAwMDAwMDAwMDAwMDAwMDAwIFIxNTogMDAwMDAwMDAwMDAwMDAwMAoKU3VnZ2Vz dGVkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpGaXhlczogOTMwMTM5N2E2M2IzICgiZHJtL2k5MTU6IEltcGxlbWVudCBMaW5rIFJhdGUgZmFs bGJhY2sgb24gTGluayB0cmFpbmluZyBmYWlsdXJlIikKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogVG9ueSBDaGVuZyA8dG9ueS5jaGVuZ0BhbWQuY29tPgpD YzogSGFycnkgV2VudGxhbmQgPEhhcnJ5LndlbnRsYW5kQGFtZC5jb20+CkNjOiBKYW5pIE5pa3Vs YSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqYWxhIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KQ2M6IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5kLm5hdmFyZUBpbnRlbC5jb20+ CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBNYW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAxICsKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDE2ICsrKysrKysrKysrKysrKysKIDIg ZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDM2NmJhNzQuLmY4MWIwNzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNDExNCw2 ICs0MTE0LDcgQEAgZXh0ZXJuIHZvaWQgaW50ZWxfbW9kZXNldF9nZW1faW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIGV4dGVybiB2b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiBpbnQgaW50ZWxfY29ubmVjdG9yX3JlZ2lzdGVyKHN0 cnVjdCBkcm1fY29ubmVjdG9yICopOwogZXh0ZXJuIHZvaWQgaW50ZWxfY29ubmVjdG9yX3VucmVn aXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKik7CitleHRlcm4gdm9pZCBpbnRlbF9jb25uZWN0 b3Jfd29ya19mbl9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIGludCBp bnRlbF9tb2Rlc2V0X3ZnYV9zZXRfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCQkJCSAgICAgICBib29sIHN0YXRlKTsKIGV4dGVybiB2b2lkIGludGVsX2Rpc3BsYXlf cmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDBlNDkzYTEuLjQ0MTU4ZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTE1MjAwLDYgKzE1MjAwLDE5IEBAIHZvaWQgaW50ZWxfY29ubmVjdG9yX3Vu cmVnaXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAlpbnRlbF9wYW5lbF9k ZXN0cm95X2JhY2tsaWdodChjb25uZWN0b3IpOwogfQogCit2b2lkIGludGVsX2Nvbm5lY3Rvcl93 b3JrX2ZuX2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9jb25uZWN0b3JfbGlzdF9pdGVyIGNv bm5faXRlcjsKKworCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2JlZ2luKGRldiwgJmNvbm5faXRl cik7CisJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yX2l0ZXIoY29ubmVjdG9yLCAmY29ubl9pdGVy KSB7CisJCWlmIChjb25uZWN0b3ItPm1vZGVzZXRfcmV0cnlfd29yay5mdW5jKQorCQkJY2FuY2Vs X3dvcmtfc3luYygmY29ubmVjdG9yLT5tb2Rlc2V0X3JldHJ5X3dvcmspOworCX0KKwlkcm1fY29u bmVjdG9yX2xpc3RfaXRlcl9lbmQoJmNvbm5faXRlcik7Cit9CisKIHZvaWQgaW50ZWxfbW9kZXNl dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwpAQCAtMTUyMjIsNiArMTUyMzUsOSBAQCB2 b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqLwog CWRybV9rbXNfaGVscGVyX3BvbGxfZmluaShkZXYpOwogCisJLyogQ2FuY2VsIHBlbmRpbmcgbW9k ZXNldCByZXRyeSB3b3JrIGluIGludGVsX2Nvbm5lY3RvciAqLworCWludGVsX2Nvbm5lY3Rvcl93 b3JrX2ZuX2NsZWFudXAoZGV2KTsKKwogCS8qIHBvbGwgd29yayBjYW4gY2FsbCBpbnRvIGZiZGV2 LCBoZW5jZSBjbGVhbiB0aGF0IHVwIGFmdGVyd2FyZHMgKi8KIAlpbnRlbF9mYmRldl9maW5pKGRl dl9wcml2KTsKIAotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=