From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 2/3] drm/i915: Fix fbdev unload sequence Date: Sat, 15 Jul 2017 00:46:55 +0200 Message-ID: <20170714224656.6431-2-daniel.vetter@ffwll.ch> References: <20170714224656.6431-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170714224656.6431-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: DRI Development Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development , martin.peres@free.fr List-Id: dri-devel@lists.freedesktop.org Rmlyc3QgdGhpbmcgd2UgbmVlZCB0byBkbyBpcyB1bnJlZ2lzdGVyIHRoZSBmYmRldiBpbnN0YW5j ZSwgYnV0IHdlCmNhbid0IGp1c3QgZ28gYWhlYWQgYW5kIGtmcmVlIGl0LiBUaGF0IG11c3Qgd2Fp dCB1bnRpbCB0aGUgaG90cGx1ZyBhbmQKcG9sbGluZyB3b3JrIGFyZSBzdG9wcGVkLCBzaW5jZSB0 aGV5IGNhbiByYWNlIHdpdGggdGhlIHdpdGggdGhlCnRlYXJkb3duLiBUaGF0IG1lYW5zIHdlIG5l ZWQgdG8gc3BsaXQgdXAgdGhlIGZiZGV2IHRlYXJkb3duIGludG8gdGhlCnVucmVnaXN0ZXIgcGFy dCBhbmQgdGhlIGNsZWFudXAgcGFydC4KCkkgb3JpZ2luYWxseSBzdXNwZWN0ZWQgdGhhdCB0aGlz IHdhcyBicm9rZW4gaW4gb25lIG9mIHRoZSB1bmxvYWQKc2h1ZmZsZXMsIGJ1dCBvbiBjbG9zZXIg aW5zcGVjdGlvbiB0aGUgb2xkZXN0IHNlcXVlbmNlIEkndmUgZHVnIG91dAphbHNvIGdldHMgdGhp cyB3cm9uZy4gSnVzdCBub3QgcXVpdGUgc28gYmFkbHkuCgpJJ3ZlIHJ1biBkcnZfbW9kdWxlX3Jl bG9hZCBhIGZldyBodW5kcmVkIHRpbWVzIGFuZCBpdCdzIHJvY2sgc29saWQKY29tcGFyZWQgdG8g aW5zdGEtZGVhdGggYmVmb3JlaGFuZC4gVGhpcyBidWcgc2VlbXMgdG8gaGF2ZSBiZWVuCnVuY292 ZXJlZCBieQoKY29tbWl0IDg4YmU1OGJlODg2ZjEyMTVjYzczZGM4YzI3M2M5ODVlZWNkNzM4NWMK QXV0aG9yOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpEYXRlOiAgIFRo dSBKdWwgNiAxNTowMDoxOSAyMDE3ICswMjAwCgogICAgZHJtL2k5MTUvZmJkZXY6IEFsd2F5cyBm b3J3YXJkIGhvdHBsdWcgZXZlbnRzCgpCdXQgdGhlIGVmZmVjdCBvZiB0aGF0IHNlZW1zIHRvIG9u bHkgYmUgdG8gaW5jcmVhc2UgdGhlIHJhY2Ugd2luZG93CmVub3VnaCB0byBtYWtlIGl0IGJsb3cg dXAgZWFzaWVyLiBJJ20gbm90IGV4YWN0bHkgY2xlYXIgb24gd2hhdCdzCmdvaW5nIG9uIHRoZXJl IC4uLgoKdjI6IEZpeCB3aGl0ZXNwYWNlIGFuZCB1c2UgZmV0Y2hfYW5kX3plcm8gKENocmlzKS4K ClRlc3RjYXNlOiBpZ3QvZHJ2X21vZHVsZV9yZWxvYWQKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5m cmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTc5MQpDYzogbWFydGluLnBlcmVzQGZy ZWUuZnIKQ2M6IGNocmlzQGNocmlzLXdpbHNvbi5jby51awpSZXZpZXdlZC1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0 ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMgICAgICB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgOSAr KysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICB8IDIyICsrKysr KysrKysrKysrKy0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMTEg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggZDMxMGQ4MjQ1ZGNhLi4y YzJhZmIxOTk3NWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTI0MCw2ICsxMjQwLDcg QEAgc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogICovCiBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl91bnJlZ2lzdGVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKKwlpbnRlbF9mYmRldl91bnJlZ2lz dGVyKGRldl9wcml2KTsKIAlpbnRlbF9hdWRpb19kZWluaXQoZGV2X3ByaXYpOwogCiAJaW50ZWxf Z3B1X2lwc190ZWFyZG93bigpOwpAQCAtMTM3MSw4ICsxMzcyLDYgQEAgdm9pZCBpOTE1X2RyaXZl cl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZf cHJpdi0+ZHJtLnBkZXY7CiAKLQlpbnRlbF9mYmRldl9maW5pKGRldik7Ci0KIAlpZiAoaTkxNV9n ZW1fc3VzcGVuZChkZXZfcHJpdikpCiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIGlkbGUgaGFyZHdh cmU7IGNvbnRpbnVpbmcgdG8gdW5sb2FkIVxuIik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCBlY2I0ZTMwNjczZmMuLmUxMGZhZTJmYWE4OCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUxMTEsNiArMTUxMTEsOSBAQCB2b2lkIGludGVsX21v ZGVzZXRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqLwogCWRybV9rbXNfaGVs cGVyX3BvbGxfZmluaShkZXYpOwogCisJLyogcG9sbCB3b3JrIGNhbiBjYWxsIGludG8gZmJkZXYs IGhlbmNlIGNsZWFuIHRoYXQgdXAgYWZ0ZXJ3YXJkcyAqLworCWludGVsX2ZiZGV2X2ZpbmkoZGV2 X3ByaXYpOworCiAJaW50ZWxfdW5yZWdpc3Rlcl9kc21faGFuZGxlcigpOwogCiAJaW50ZWxfZmJj X2dsb2JhbF9kaXNhYmxlKGRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg MzEzMjI2MGYxOGNlLi43MzYxZTk4M2Q5NTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBA IC0xNTk3LDcgKzE1OTcsOCBAQCB2b2lkIGludGVsX2hwZF9wb2xsX2luaXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKICNpZmRlZiBDT05GSUdfRFJNX0ZCREVWX0VNVUxBVElP TgogZXh0ZXJuIGludCBpbnRlbF9mYmRldl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog ZXh0ZXJuIHZvaWQgaW50ZWxfZmJkZXZfaW5pdGlhbF9jb25maWdfYXN5bmMoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7Ci1leHRlcm4gdm9pZCBpbnRlbF9mYmRldl9maW5pKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOworZXh0ZXJuIHZvaWQgaW50ZWxfZmJkZXZfdW5yZWdpc3RlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworZXh0ZXJuIHZvaWQgaW50ZWxfZmJkZXZfZmluaShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0ZXJuIHZvaWQgaW50ZWxfZmJk ZXZfc2V0X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHN0YXRlLCBib29sIHN5 bmNocm9ub3VzKTsKIGV4dGVybiB2b2lkIGludGVsX2ZiZGV2X291dHB1dF9wb2xsX2NoYW5nZWQo c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4gdm9pZCBpbnRlbF9mYmRldl9yZXN0b3Jl X21vZGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CkBAIC0xNjExLDcgKzE2MTIsMTEgQEAgc3Rh dGljIGlubGluZSB2b2lkIGludGVsX2ZiZGV2X2luaXRpYWxfY29uZmlnX2FzeW5jKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB7CiB9CiAKLXN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9mYmRldl9m aW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfZmJk ZXZfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7Cit9CisK K3N0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9mYmRldl9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKaW5kZXgg Yjk1MzM2NWEzZWVjLi4zOTE5OTIzNzNkMjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYu YwpAQCAtNTM4LDggKzUzOCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZiZGV2X2Rlc3Ryb3koc3Ry dWN0IGludGVsX2ZiZGV2ICppZmJkZXYpCiAJICogdHJ5aW5nIHRvIHJlY3RpZnkgYWxsIHRoZSBw b3NzaWJsZSBlcnJvciBwYXRocyBsZWFkaW5nIGhlcmUuCiAJICovCiAKLQlkcm1fZmJfaGVscGVy X3VucmVnaXN0ZXJfZmJpKCZpZmJkZXYtPmhlbHBlcik7Ci0KIAlkcm1fZmJfaGVscGVyX2Zpbmko JmlmYmRldi0+aGVscGVyKTsKIAogCWlmIChpZmJkZXYtPnZtYSkgewpAQCAtNzI3LDggKzcyNSwx MCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmRldl9pbml0aWFsX2NvbmZpZyh2b2lkICpkYXRhLCBh c3luY19jb29raWVfdCBjb29raWUpCiAKIAkvKiBEdWUgdG8gcGVjdWxpYXIgaW5pdCBvcmRlciB3 cnQgdG8gaHBkIGhhbmRsaW5nIHRoaXMgaXMgc2VwYXJhdGUuICovCiAJaWYgKGRybV9mYl9oZWxw ZXJfaW5pdGlhbF9jb25maWcoJmlmYmRldi0+aGVscGVyLAotCQkJCQkgaWZiZGV2LT5wcmVmZXJy ZWRfYnBwKSkKLQkJaW50ZWxfZmJkZXZfZmluaShpZmJkZXYtPmhlbHBlci5kZXYpOworCQkJCQkg aWZiZGV2LT5wcmVmZXJyZWRfYnBwKSkgeworCQlpbnRlbF9mYmRldl91bnJlZ2lzdGVyKHRvX2k5 MTUoaWZiZGV2LT5oZWxwZXIuZGV2KSk7CisJCWludGVsX2ZiZGV2X2ZpbmkodG9faTkxNShpZmJk ZXYtPmhlbHBlci5kZXYpKTsKKwl9CiB9CiAKIHZvaWQgaW50ZWxfZmJkZXZfaW5pdGlhbF9jb25m aWdfYXN5bmMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTc1MSw5ICs3NTEsOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9mYmRldl9zeW5jKHN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2KQogCWlm YmRldi0+Y29va2llID0gMDsKIH0KIAotdm9pZCBpbnRlbF9mYmRldl9maW5pKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCit2b2lkIGludGVsX2ZiZGV2X3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZmJkZXYgKmlmYmRldiA9IGRldl9wcml2 LT5mYmRldjsKIAogCWlmICghaWZiZGV2KQpAQCAtNzYzLDggKzc2MiwxNyBAQCB2b2lkIGludGVs X2ZiZGV2X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoIWN1cnJlbnRfaXNfYXN5 bmMoKSkKIAkJaW50ZWxfZmJkZXZfc3luYyhpZmJkZXYpOwogCisJZHJtX2ZiX2hlbHBlcl91bnJl Z2lzdGVyX2ZiaSgmaWZiZGV2LT5oZWxwZXIpOworfQorCit2b2lkIGludGVsX2ZiZGV2X2Zpbmko c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9mYmRl diAqaWZiZGV2ID0gZmV0Y2hfYW5kX3plcm8oJmRldl9wcml2LT5mYmRldik7CisKKwlpZiAoIWlm YmRldikKKwkJcmV0dXJuOworCiAJaW50ZWxfZmJkZXZfZGVzdHJveShpZmJkZXYpOwotCWRldl9w cml2LT5mYmRldiA9IE5VTEw7CiB9CiAKIHZvaWQgaW50ZWxfZmJkZXZfc2V0X3N1c3BlbmQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHN0YXRlLCBib29sIHN5bmNocm9ub3VzKQotLSAKMi4x My4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK