From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Hide GEM shutdown in i915_gem_fini Date: Thu, 11 Feb 2016 15:39:25 +0000 Message-ID: <1455205165-19264-1-git-send-email-tvrtko.ursulin@linux.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 5CD346EA45 for ; Thu, 11 Feb 2016 07:39:30 -0800 (PST) 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFzIHdlIGhh dmUgaTkxNV9nZW1faW5pdCwgZG8gdGhlIHJldmVyc2UgaW4gbmV3IGk5MTVfZ2VtX2Zpbmkgc28K dGhlIGZyYWdpbGUgb3JkZXIgb2YgZG9pbmcgdGhpbmdzIGlzIGhpZGRlbiBmcm9tIHRoZSBvdXRz aWRlIGFuZApvbmx5IGF0IG9uZSBwbGFjZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0 aEBpbnRlbC5jb20+CkNjOiBEYXZpZCBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4K Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9w cGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kbWEuYyB8ICA2ICsrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgNDAgKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyNyBp bnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRl eCAyZGYyZmFjMDQ3MDguLmJlZGE3ZGVhNjgxNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBA IC00NDQsOCArNDQ0LDcgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAKIGNsZWFudXBfZ2VtOgogCW11dGV4X2xvY2soJmRldi0+c3Ry dWN0X211dGV4KTsKLQlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKLQlpOTE1X2dlbV9jbGVh bnVwX2VuZ2luZXMoZGV2KTsKKwlpOTE1X2dlbV9maW5pKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7CiBjbGVhbnVwX2lycToKIAlpbnRlbF9ndWNfdWNvZGVfZmluaShk ZXYpOwpAQCAtMTI1Niw4ICsxMjU1LDcgQEAgaW50IGk5MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfZ3VjX3Vjb2RlX2ZpbmkoZGV2KTsKIAltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7Ci0J aTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CisJaTkxNV9nZW1fZmluaShkZXYpOwogCW11 dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWludGVsX2ZiY19jbGVhbnVwX2NmYihk ZXZfcHJpdik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDA5MDE3MmRlODFhMC4uZDAw NGRjODA2NjcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwNjAsMTEgKzMwNjAsMTEg QEAgc3RhdGljIGlubGluZSBib29sIGk5MTVfc3RvcF9yaW5nX2FsbG93X3dhcm4oc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIGJvb2wgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVf Z2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIF9fbXVzdF9jaGVjayBpOTE1 X2dlbV9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGk5MTVfZ2VtX2luaXRfcmlu Z3Moc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2lu aXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fbDNfcmVtYXAoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIGludCBzbGljZSk7CiB2b2lkIGk5MTVfZ2Vt X2luaXRfc3dpenpsaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotdm9pZCBpOTE1X2dlbV9j bGVhbnVwX2VuZ2luZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNr IGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNr IGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIF9faTkxNV9h ZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCmluZGV4IGM2M2MzMDcyYThhOS4uZjdlN2FiNDMyMzQxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTQ4MzQsNiArNDgzNCwyNiBAQCBjbGVhbnVwX3JlbmRlcl9yaW5nOgog CXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyB2b2lkCitpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMo c3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7 CisJaW50IGk7CisKKwlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKQorCQlkZXZfcHJp di0+Z3QuY2xlYW51cF9yaW5nKHJpbmcpOworCisJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykg eworCQkvKgorCQkgKiBOZWl0aGVyIHRoZSBCSU9TLCBvdXJzZWx2ZXMgb3IgYW55IG90aGVyIGtl cm5lbAorCQkgKiBleHBlY3RzIHRoZSBzeXN0ZW0gdG8gYmUgaW4gZXhlY2xpc3RzIG1vZGUgb24g c3RhcnR1cCwKKwkJICogc28gd2UgbmVlZCB0byByZXNldCB0aGUgR1BVIGJhY2sgdG8gbGVnYWN5 IG1vZGUuCisJCSAqLworCQlpbnRlbF9ncHVfcmVzZXQoZGV2KTsKKwl9Cit9CisKIGludAogaTkx NV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewpAQCAtNTAxMSwyNCArNTAz MSwxMiBAQCBvdXRfdW5sb2NrOgogCXJldHVybiByZXQ7CiB9CiAKLXZvaWQKLWk5MTVfZ2VtX2Ns ZWFudXBfZW5naW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQordm9pZCBpOTE1X2dlbV9maW5p KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n OwotCWludCBpOwotCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKLQkJZGV2X3By aXYtPmd0LmNsZWFudXBfcmluZyhyaW5nKTsKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXYtPnN0 cnVjdF9tdXRleCk7CiAKLQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCS8qCi0JCSAq IE5laXRoZXIgdGhlIEJJT1MsIG91cnNlbHZlcyBvciBhbnkgb3RoZXIga2VybmVsCi0JCSAqIGV4 cGVjdHMgdGhlIHN5c3RlbSB0byBiZSBpbiBleGVjbGlzdHMgbW9kZSBvbiBzdGFydHVwLAotCQkg KiBzbyB3ZSBuZWVkIHRvIHJlc2V0IHRoZSBHUFUgYmFjayB0byBsZWdhY3kgbW9kZS4KLQkJICov Ci0JCWludGVsX2dwdV9yZXNldChkZXYpOwotCX0KKwlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2 KTsKKwlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIH0KIAogc3RhdGljIHZvaWQKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK