From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Herrmann Subject: [PATCH v2] drm: cleanup drm_core_{init,exit}() Date: Thu, 25 Aug 2016 21:15:50 +0200 Message-ID: <20160825191550.19832-1-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB8C16E10D for ; Thu, 25 Aug 2016 19:16:02 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id i138so8571394wmf.3 for ; Thu, 25 Aug 2016 12:16:02 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VmFyaW91cyBjbGVhbnVwcyB0byB0aGUgRFJNIGNvcmUgaW5pdGlhbGl6YXRpb24gYW5kIGV4aXQg aGFuZGxlcnM6CgogLSBSZWdpc3RlciBjaHJkZXYgbGFzdDogT25jZSByZWdpc3Rlcl9jaHJkZXYo KSByZXR1cm5zLCBvcGVuKCkgd2lsbAogICBzdWNjZWVkIG9uIHRoZSBnaXZlbiBjaHJkZXZzLiBU aGlzIGlzIHVzdWFsbHkgbm90IGFuIGlzc3VlLCBhcyBubwogICBjaGFyZGV2cyBhcmUgcmVnaXN0 ZXJlZCwgeWV0LiBIb3dldmVyLCBub2RlcyBjYW4gYmUgY3JlYXRlZCBieQogICB1c2VyLXNwYWNl IHZpYSBta25vZCgyKSwgZXZlbiB0aG91Z2ggc3VjaCBtYWpvci9taW5vciBjb21iaW5hdGlvbnMg YXJlCiAgIHVua25vd24gdG8gdGhlIGtlcm5lbC4gQXZvaWQgY2FsbGluZyBpbnRvIGRybV9zdHVi X29wZW4oKSBpbiB0aG9zZQogICBjYXNlcy4KICAgQWdhaW4sIGRybV9zdHViX29wZW4oKSB3b3Vs ZCBqdXN0IGJhaWwgb3V0IGFzIHRoZSBpbm9kZSBpcyB1bmtub3duLAogICBidXQgaXQncyByZWFs bHkgbm9uLW9idmlvdXMgaWYgeW91IGhhY2sgb24gZHJtX3N0dWJfb3BlbigpLgoKIC0gVW5pZnkg ZXJyb3ItcGF0aHMgaW50byBqdXN0IG9uZSBsYWJlbC4gQWxsIHRoZSBlcnJvci1wYXRoIGhlbHBl cnMgY2FuCiAgIGJlIGNhbGxlZCBldmVuIHRob3VnaCB0aGUgY29uc3RydWN0b3JzIHdlcmUgbm90 IGNhbGxlZCB5ZXQsIG9yIGZhaWxlZC4KICAgSGVuY2UsIGp1c3QgY2FsbCBhbGwgY2xlYW51cHMg dW5jb25kaXRpb25hbGx5LgoKIC0gQ2FsbCBpbnRvIGRybV9nbG9iYWxfcmVsZWFzZSgpLiBUaGlz IGlzIGEgbm8tb3AsIGJ1dCBwcm92aWRlcwogICBkZWJ1Z2dpbmcgaGVscGVycyBpbiBjYXNlIHRo ZXJlJ3JlIEdMT0JBTFMgbGVmdCBvbiBtb2R1bGUgdW5sb2FkLiBUaGlzCiAgIGZ1bmN0aW9uIHdh cyB1bnVzZWQgdW50aWwgbm93LgoKIC0gVXNlIERSTV9FUlJPUigpIGluc3RlYWQgb2YgcHJpbnRr KCksIGFuZCBhbHNvIHByaW50IHRoZSBlcnJvci1jb2RlIG9uCiAgIGZhaWx1cmUgKGV2ZW4gaWYg aXQgaXMgc3RhdGljISkuCgogLSBEb24ndCB0aHJvdyBhd2F5IGVycm9yLWNvZGVzIG9mIHJlZ2lz dGVyX2NocmRldigpIQoKIC0gRG9uJ3QgaGFyZGNvZGUgLTEgYXMgZXJybm8uIFRoaXMgaXMganVz dCBwbGFpbiB3cm9uZy4KCiAtIE9yZGVyIGV4aXQtaGFuZGxlcnMgaW4gdGhlIGV4YWN0IHJldmVy c2Ugb3JkZXIgb2YgaW5pdGlhbGl6YXRpb24KICAgKGV4Y2VwdCBpZiB0aGUgb3JkZXIgYWN0dWFs bHkgbWF0dGVycyBmb3Igc3luY2luZy1yZWFzb25zLCB3aGljaCBpcwogICBub3QgdGhlIGNhc2Ug aGVyZSwgdGhvdWdoKS4KCnYyOgogLSBDYWxsIGRybV9jb3JlX2V4aXQoKSBkaXJlY3RseSBmcm9t IHRoZSBpbml0LWVycm9yLWhhbmRsZXIuIFJlcXVpcmVzIHRvCiAgIGRyb3AgX19leGl0IGFubm90 YXRpb24sIHRob3VnaC4KClNpZ25lZC1vZmYtYnk6IERhdmlkIEhlcnJtYW5uIDxkaC5oZXJybWFu bkBnbWFpbC5jb20+Ci0tLQpIZXkKClRoaXMgaXMgYmFzZWQgb24gdG9wIG9mCiAgICAiW1BBVENI XSBkcm06IGRyb3Agb2Jzb2xldGUgZHJtX2NvcmUuaCIKU2hvdWxkIGJlIHRyaXZpYWwgdG8gcmVi YXNlLCB0aG91Z2guIEp1c3QgYSBEUk1fRVJST1IoKS1tZXNzYWdlIGNvbmZsaWN0LgoKVGhhbmtz CkRhdmlkCgogZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYyB8IDQ4ICsrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0 aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMKaW5kZXggZDc3MTQ1My4uMDc3MzU0 NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2Rydi5jCkBAIC05NDEsNTIgKzk0MSw0OCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IGZpbGVfb3BlcmF0aW9ucyBkcm1fc3R1Yl9mb3BzID0gewogCS5sbHNlZWsgPSBub29wX2xsc2Vl aywKIH07CiAKK3N0YXRpYyB2b2lkIGRybV9jb3JlX2V4aXQodm9pZCkKK3sKKwl1bnJlZ2lzdGVy X2NocmRldihEUk1fTUFKT1IsICJkcm0iKTsKKwlkZWJ1Z2ZzX3JlbW92ZShkcm1fZGVidWdmc19y b290KTsKKwlkcm1fc3lzZnNfZGVzdHJveSgpOworCWlkcl9kZXN0cm95KCZkcm1fbWlub3JzX2lk cik7CisJZHJtX2Nvbm5lY3Rvcl9pZGFfZGVzdHJveSgpOworCWRybV9nbG9iYWxfcmVsZWFzZSgp OworfQorCiBzdGF0aWMgaW50IF9faW5pdCBkcm1fY29yZV9pbml0KHZvaWQpCiB7Ci0JaW50IHJl dCA9IC1FTk9NRU07CisJaW50IHJldDsKIAogCWRybV9nbG9iYWxfaW5pdCgpOwogCWRybV9jb25u ZWN0b3JfaWRhX2luaXQoKTsKIAlpZHJfaW5pdCgmZHJtX21pbm9yc19pZHIpOwogCi0JaWYgKHJl Z2lzdGVyX2NocmRldihEUk1fTUFKT1IsICJkcm0iLCAmZHJtX3N0dWJfZm9wcykpCi0JCWdvdG8g ZXJyX3AxOwotCiAJcmV0ID0gZHJtX3N5c2ZzX2luaXQoKTsKIAlpZiAocmV0IDwgMCkgewotCQlw cmludGsoS0VSTl9FUlIgIkRSTTogRXJyb3IgY3JlYXRpbmcgZHJtIGNsYXNzLlxuIik7Ci0JCWdv dG8gZXJyX3AyOworCQlEUk1fRVJST1IoIkNhbm5vdCBjcmVhdGUgRFJNIGNsYXNzOiAlZFxuIiwg cmV0KTsKKwkJZ290byBlcnJvcjsKIAl9CiAKIAlkcm1fZGVidWdmc19yb290ID0gZGVidWdmc19j cmVhdGVfZGlyKCJkcmkiLCBOVUxMKTsKIAlpZiAoIWRybV9kZWJ1Z2ZzX3Jvb3QpIHsKLQkJRFJN X0VSUk9SKCJDYW5ub3QgY3JlYXRlIC9zeXMva2VybmVsL2RlYnVnL2RyaVxuIik7Ci0JCXJldCA9 IC0xOwotCQlnb3RvIGVycl9wMzsKKwkJcmV0ID0gLUVOT01FTTsKKwkJRFJNX0VSUk9SKCJDYW5u b3QgY3JlYXRlIGRlYnVnZnMtcm9vdDogJWRcbiIsIHJldCk7CisJCWdvdG8gZXJyb3I7CiAJfQog CisJcmV0ID0gcmVnaXN0ZXJfY2hyZGV2KERSTV9NQUpPUiwgImRybSIsICZkcm1fc3R1Yl9mb3Bz KTsKKwlpZiAocmV0IDwgMCkKKwkJZ290byBlcnJvcjsKKwogCURSTV9JTkZPKCJJbml0aWFsaXpl ZFxuIik7CiAJcmV0dXJuIDA7Ci1lcnJfcDM6Ci0JZHJtX3N5c2ZzX2Rlc3Ryb3koKTsKLWVycl9w MjoKLQl1bnJlZ2lzdGVyX2NocmRldihEUk1fTUFKT1IsICJkcm0iKTsKIAotCWlkcl9kZXN0cm95 KCZkcm1fbWlub3JzX2lkcik7Ci1lcnJfcDE6CitlcnJvcjoKKwlkcm1fY29yZV9leGl0KCk7CiAJ cmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgX19leGl0IGRybV9jb3JlX2V4aXQodm9pZCkK LXsKLQlkZWJ1Z2ZzX3JlbW92ZShkcm1fZGVidWdmc19yb290KTsKLQlkcm1fc3lzZnNfZGVzdHJv eSgpOwotCi0JdW5yZWdpc3Rlcl9jaHJkZXYoRFJNX01BSk9SLCAiZHJtIik7Ci0KLQlkcm1fY29u bmVjdG9yX2lkYV9kZXN0cm95KCk7Ci0JaWRyX2Rlc3Ryb3koJmRybV9taW5vcnNfaWRyKTsKLX0K LQogbW9kdWxlX2luaXQoZHJtX2NvcmVfaW5pdCk7CiBtb2R1bGVfZXhpdChkcm1fY29yZV9leGl0 KTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK