From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH libdrm v2 1/4] xf86drm: Factor out drmDeviceAlloc() Date: Thu, 12 Jan 2017 23:04:26 +0100 Message-ID: <20170112220429.28139-2-thierry.reding@gmail.com> References: <20170112220429.28139-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F8A66ECBC for ; Thu, 12 Jan 2017 22:04:35 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r144so6996116wme.0 for ; Thu, 12 Jan 2017 14:04:35 -0800 (PST) In-Reply-To: <20170112220429.28139-1-thierry.reding@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: xorg-devel@lists.x.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClN1YnNlcXVlbnQgcGF0 Y2hlcyB3aWxsIGFkZCBzdXBwb3J0IGZvciBvdGhlciBidXMgdHlwZXMgdG8gZHJtRGV2aWNlIGFu ZAp0aGV5IHdpbGwgZHVwbGljYXRlIGEgbG90IG9mIHRoZSBjb2RlIHRvIGFsbG9jYXRlIGEgZHJt RGV2aWNlLiBGYWN0b3IKb3V0IHRoZSBjb21tb24gY29kZSBzbyBpdCBjYW4gYmUgcmV1c2VkLgoK U2lnbmVkLW9mZi1ieTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KLS0tCiB4 Zjg2ZHJtLmMgfCA3OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAy NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94Zjg2ZHJtLmMgYi94Zjg2ZHJtLmMKaW5kZXgg YjhiMmNmZTU0MTJiLi5jMTIzNjUwYTFlMjMgMTAwNjQ0Ci0tLSBhL3hmODZkcm0uYworKysgYi94 Zjg2ZHJtLmMKQEAgLTMxNTcsNTcgKzMxNTcsODEgQEAgdm9pZCBkcm1GcmVlRGV2aWNlcyhkcm1E ZXZpY2VQdHIgZGV2aWNlc1tdLCBpbnQgY291bnQpCiAgICAgICAgICAgICBkcm1GcmVlRGV2aWNl KCZkZXZpY2VzW2ldKTsKIH0KIAorc3RhdGljIGRybURldmljZVB0ciBkcm1EZXZpY2VBbGxvYyh1 bnNpZ25lZCBpbnQgdHlwZSwgY29uc3QgY2hhciAqbm9kZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2l6ZV90IGJ1c19zaXplLCBzaXplX3QgZGV2aWNlX3NpemUsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYXIgKipwdHJwKQoreworICAgIHNpemVf dCBtYXhfbm9kZV9sZW5ndGgsIGV4dHJhLCBzaXplOworICAgIGRybURldmljZVB0ciBkZXZpY2U7 CisgICAgdW5zaWduZWQgaW50IGk7CisgICAgY2hhciAqcHRyOworCisgICAgbWF4X25vZGVfbGVu Z3RoID0gQUxJR04oZHJtR2V0TWF4Tm9kZU5hbWUoKSwgc2l6ZW9mKHZvaWQgKikpOworICAgIGV4 dHJhID0gRFJNX05PREVfTUFYICogKHNpemVvZih2b2lkICopICsgbWF4X25vZGVfbGVuZ3RoKTsK KworICAgIHNpemUgPSBzaXplb2YoKmRldmljZSkgKyBleHRyYSArIGJ1c19zaXplICsgZGV2aWNl X3NpemU7CisKKyAgICBkZXZpY2UgPSBjYWxsb2MoMSwgc2l6ZSk7CisgICAgaWYgKCFkZXZpY2Up CisgICAgICAgIHJldHVybiBOVUxMOworCisgICAgZGV2aWNlLT5hdmFpbGFibGVfbm9kZXMgPSAx IDw8IHR5cGU7CisKKyAgICBwdHIgPSAoY2hhciAqKWRldmljZSArIHNpemVvZigqZGV2aWNlKTsK KyAgICBkZXZpY2UtPm5vZGVzID0gKGNoYXIgKiopcHRyOworCisgICAgcHRyICs9IERSTV9OT0RF X01BWCAqIHNpemVvZih2b2lkICopOworCisgICAgZm9yIChpID0gMDsgaSA8IERSTV9OT0RFX01B WDsgaSsrKSB7CisgICAgICAgIGRldmljZS0+bm9kZXNbaV0gPSBwdHI7CisgICAgICAgIHB0ciAr PSBtYXhfbm9kZV9sZW5ndGg7CisgICAgfQorCisgICAgbWVtY3B5KGRldmljZS0+bm9kZXNbdHlw ZV0sIG5vZGUsIG1heF9ub2RlX2xlbmd0aCk7CisKKyAgICAqcHRycCA9IHB0cjsKKworICAgIHJl dHVybiBkZXZpY2U7Cit9CisKIHN0YXRpYyBpbnQgZHJtUHJvY2Vzc1BjaURldmljZShkcm1EZXZp Y2VQdHIgKmRldmljZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFy ICpub2RlLCBpbnQgbm9kZV90eXBlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu dCBtYWosIGludCBtaW4sIGJvb2wgZmV0Y2hfZGV2aWNlaW5mbywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1aW50MzJfdCBmbGFncykKIHsKLSAgICBjb25zdCBpbnQgbWF4X25vZGVf c3RyID0gQUxJR04oZHJtR2V0TWF4Tm9kZU5hbWUoKSwgc2l6ZW9mKHZvaWQgKikpOwotICAgIGlu dCByZXQsIGk7CisgICAgZHJtRGV2aWNlUHRyIGRldjsKICAgICBjaGFyICphZGRyOworICAgIGlu dCByZXQ7CiAKLSAgICAqZGV2aWNlID0gY2FsbG9jKDEsIHNpemVvZihkcm1EZXZpY2UpICsKLSAg ICAgICAgICAgICAgICAgICAgIChEUk1fTk9ERV9NQVggKiAoc2l6ZW9mKHZvaWQgKikgKyBtYXhf bm9kZV9zdHIpKSArCi0gICAgICAgICAgICAgICAgICAgICBzaXplb2YoZHJtUGNpQnVzSW5mbykg KwotICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKGRybVBjaURldmljZUluZm8pKTsKLSAgICBp ZiAoISpkZXZpY2UpCisgICAgZGV2ID0gZHJtRGV2aWNlQWxsb2Mobm9kZV90eXBlLCBub2RlLCBz aXplb2YoZHJtUGNpQnVzSW5mbyksCisgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKGRy bVBjaURldmljZUluZm8pLCAmYWRkcik7CisgICAgaWYgKCFkZXYpCiAgICAgICAgIHJldHVybiAt RU5PTUVNOwogCi0gICAgYWRkciA9IChjaGFyKikqZGV2aWNlOworICAgIGRldi0+YnVzdHlwZSA9 IERSTV9CVVNfUENJOwogCi0gICAgKCpkZXZpY2UpLT5idXN0eXBlID0gRFJNX0JVU19QQ0k7Ci0g ICAgKCpkZXZpY2UpLT5hdmFpbGFibGVfbm9kZXMgPSAxIDw8IG5vZGVfdHlwZTsKKyAgICBkZXYt PmJ1c2luZm8ucGNpID0gKGRybVBjaUJ1c0luZm9QdHIpYWRkcjsKIAotICAgIGFkZHIgKz0gc2l6 ZW9mKGRybURldmljZSk7Ci0gICAgKCpkZXZpY2UpLT5ub2RlcyA9IChjaGFyKiopYWRkcjsKLQot ICAgIGFkZHIgKz0gRFJNX05PREVfTUFYICogc2l6ZW9mKHZvaWQgKik7Ci0gICAgZm9yIChpID0g MDsgaSA8IERSTV9OT0RFX01BWDsgaSsrKSB7Ci0gICAgICAgICgqZGV2aWNlKS0+bm9kZXNbaV0g PSBhZGRyOwotICAgICAgICBhZGRyICs9IG1heF9ub2RlX3N0cjsKLSAgICB9Ci0gICAgbWVtY3B5 KCgqZGV2aWNlKS0+bm9kZXNbbm9kZV90eXBlXSwgbm9kZSwgbWF4X25vZGVfc3RyKTsKLQotICAg ICgqZGV2aWNlKS0+YnVzaW5mby5wY2kgPSAoZHJtUGNpQnVzSW5mb1B0cilhZGRyOwotCi0gICAg cmV0ID0gZHJtUGFyc2VQY2lCdXNJbmZvKG1haiwgbWluLCAoKmRldmljZSktPmJ1c2luZm8ucGNp KTsKKyAgICByZXQgPSBkcm1QYXJzZVBjaUJ1c0luZm8obWFqLCBtaW4sIGRldi0+YnVzaW5mby5w Y2kpOwogICAgIGlmIChyZXQpCiAgICAgICAgIGdvdG8gZnJlZV9kZXZpY2U7CiAKICAgICAvLyBG ZXRjaCB0aGUgZGV2aWNlIGluZm8gaWYgdGhlIHVzZXIgaGFzIHJlcXVlc3RlZCBpdAogICAgIGlm IChmZXRjaF9kZXZpY2VpbmZvKSB7CiAgICAgICAgIGFkZHIgKz0gc2l6ZW9mKGRybVBjaUJ1c0lu Zm8pOwotICAgICAgICAoKmRldmljZSktPmRldmljZWluZm8ucGNpID0gKGRybVBjaURldmljZUlu Zm9QdHIpYWRkcjsKKyAgICAgICAgZGV2LT5kZXZpY2VpbmZvLnBjaSA9IChkcm1QY2lEZXZpY2VJ bmZvUHRyKWFkZHI7CiAKLSAgICAgICAgcmV0ID0gZHJtUGFyc2VQY2lEZXZpY2VJbmZvKG1haiwg bWluLCAoKmRldmljZSktPmRldmljZWluZm8ucGNpLCBmbGFncyk7CisgICAgICAgIHJldCA9IGRy bVBhcnNlUGNpRGV2aWNlSW5mbyhtYWosIG1pbiwgZGV2LT5kZXZpY2VpbmZvLnBjaSwgZmxhZ3Mp OwogICAgICAgICBpZiAocmV0KQogICAgICAgICAgICAgZ290byBmcmVlX2RldmljZTsKICAgICB9 CisKKyAgICAqZGV2aWNlID0gZGV2OworCiAgICAgcmV0dXJuIDA7CiAKIGZyZWVfZGV2aWNlOgot ICAgIGZyZWUoKmRldmljZSk7Ci0gICAgKmRldmljZSA9IE5VTEw7CisgICAgZnJlZShkZXYpOwog ICAgIHJldHVybiByZXQ7CiB9CiAKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==