From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Herrmann Subject: [PATCH 6/6] drm: cleanup drm_core_{init,exit}() Date: Thu, 1 Sep 2016 14:48:37 +0200 Message-ID: <20160901124837.680-7-dh.herrmann@gmail.com> References: <20160901124837.680-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 48AD36E93B for ; Thu, 1 Sep 2016 12:49:00 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id w207so8277106wmw.0 for ; Thu, 01 Sep 2016 05:49:00 -0700 (PDT) In-Reply-To: <20160901124837.680-1-dh.herrmann@gmail.com> 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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYyB8IDQ4ICsrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjIgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMKaW5kZXggZDc3MTQ1 My4uMDc3MzU0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCkBAIC05NDEsNTIgKzk0MSw0OCBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGZpbGVfb3BlcmF0aW9ucyBkcm1fc3R1Yl9mb3BzID0gewogCS5sbHNlZWsgPSBu b29wX2xsc2VlaywKIH07CiAKK3N0YXRpYyB2b2lkIGRybV9jb3JlX2V4aXQodm9pZCkKK3sKKwl1 bnJlZ2lzdGVyX2NocmRldihEUk1fTUFKT1IsICJkcm0iKTsKKwlkZWJ1Z2ZzX3JlbW92ZShkcm1f ZGVidWdmc19yb290KTsKKwlkcm1fc3lzZnNfZGVzdHJveSgpOworCWlkcl9kZXN0cm95KCZkcm1f bWlub3JzX2lkcik7CisJZHJtX2Nvbm5lY3Rvcl9pZGFfZGVzdHJveSgpOworCWRybV9nbG9iYWxf cmVsZWFzZSgpOworfQorCiBzdGF0aWMgaW50IF9faW5pdCBkcm1fY29yZV9pbml0KHZvaWQpCiB7 Ci0JaW50IHJldCA9IC1FTk9NRU07CisJaW50IHJldDsKIAogCWRybV9nbG9iYWxfaW5pdCgpOwog CWRybV9jb25uZWN0b3JfaWRhX2luaXQoKTsKIAlpZHJfaW5pdCgmZHJtX21pbm9yc19pZHIpOwog Ci0JaWYgKHJlZ2lzdGVyX2NocmRldihEUk1fTUFKT1IsICJkcm0iLCAmZHJtX3N0dWJfZm9wcykp Ci0JCWdvdG8gZXJyX3AxOwotCiAJcmV0ID0gZHJtX3N5c2ZzX2luaXQoKTsKIAlpZiAocmV0IDwg MCkgewotCQlwcmludGsoS0VSTl9FUlIgIkRSTTogRXJyb3IgY3JlYXRpbmcgZHJtIGNsYXNzLlxu Iik7Ci0JCWdvdG8gZXJyX3AyOworCQlEUk1fRVJST1IoIkNhbm5vdCBjcmVhdGUgRFJNIGNsYXNz OiAlZFxuIiwgcmV0KTsKKwkJZ290byBlcnJvcjsKIAl9CiAKIAlkcm1fZGVidWdmc19yb290ID0g ZGVidWdmc19jcmVhdGVfZGlyKCJkcmkiLCBOVUxMKTsKIAlpZiAoIWRybV9kZWJ1Z2ZzX3Jvb3Qp IHsKLQkJRFJNX0VSUk9SKCJDYW5ub3QgY3JlYXRlIC9zeXMva2VybmVsL2RlYnVnL2RyaVxuIik7 Ci0JCXJldCA9IC0xOwotCQlnb3RvIGVycl9wMzsKKwkJcmV0ID0gLUVOT01FTTsKKwkJRFJNX0VS Uk9SKCJDYW5ub3QgY3JlYXRlIGRlYnVnZnMtcm9vdDogJWRcbiIsIHJldCk7CisJCWdvdG8gZXJy b3I7CiAJfQogCisJcmV0ID0gcmVnaXN0ZXJfY2hyZGV2KERSTV9NQUpPUiwgImRybSIsICZkcm1f c3R1Yl9mb3BzKTsKKwlpZiAocmV0IDwgMCkKKwkJZ290byBlcnJvcjsKKwogCURSTV9JTkZPKCJJ bml0aWFsaXplZFxuIik7CiAJcmV0dXJuIDA7Ci1lcnJfcDM6Ci0JZHJtX3N5c2ZzX2Rlc3Ryb3ko KTsKLWVycl9wMjoKLQl1bnJlZ2lzdGVyX2NocmRldihEUk1fTUFKT1IsICJkcm0iKTsKIAotCWlk cl9kZXN0cm95KCZkcm1fbWlub3JzX2lkcik7Ci1lcnJfcDE6CitlcnJvcjoKKwlkcm1fY29yZV9l eGl0KCk7CiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgX19leGl0IGRybV9jb3JlX2V4 aXQodm9pZCkKLXsKLQlkZWJ1Z2ZzX3JlbW92ZShkcm1fZGVidWdmc19yb290KTsKLQlkcm1fc3lz ZnNfZGVzdHJveSgpOwotCi0JdW5yZWdpc3Rlcl9jaHJkZXYoRFJNX01BSk9SLCAiZHJtIik7Ci0K LQlkcm1fY29ubmVjdG9yX2lkYV9kZXN0cm95KCk7Ci0JaWRyX2Rlc3Ryb3koJmRybV9taW5vcnNf aWRyKTsKLX0KLQogbW9kdWxlX2luaXQoZHJtX2NvcmVfaW5pdCk7CiBtb2R1bGVfZXhpdChkcm1f Y29yZV9leGl0KTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK