From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Engestrom Subject: [PATCH libdrm 3/3] xf86drm: dedupe drmGetDeviceName() logic Date: Wed, 19 Dec 2018 17:08:03 +0000 Message-ID: <20181219170803.23452-3-eric.engestrom@intel.com> References: <20181219170803.23452-1-eric.engestrom@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 ESMTPS id D72076F0E5 for ; Wed, 19 Dec 2018 17:09:22 +0000 (UTC) In-Reply-To: <20181219170803.23452-1-eric.engestrom@intel.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 List-Id: dri-devel@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogRXJpYyBFbmdlc3Ryb20gPGVyaWMuZW5nZXN0cm9tQGludGVsLmNvbT4K LS0tCiB4Zjg2ZHJtLmMgfCA4NiArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgNjMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGY4NmRybS5jIGIveGY4NmRybS5jCmluZGV4IDk1 ODU0ZTE1M2VjN2U5ZDI2NGJjLi5mOGU0ZDExYjhjNjg4NmQ2YTZiOCAxMDA2NDQKLS0tIGEveGY4 NmRybS5jCisrKyBiL3hmODZkcm0uYwpAQCAtMzAwLDYgKzMwMCwxOSBAQCBzdGF0aWMgaW50IGNo b3duX2NoZWNrX3JldHVybihjb25zdCBjaGFyICpwYXRoLCB1aWRfdCBvd25lciwgZ2lkX3QgZ3Jv dXApCiB9CiAjZW5kaWYKIAorc3RhdGljIGNvbnN0IGNoYXIgKmRybUdldERldmljZU5hbWUoaW50 IHR5cGUpCit7CisgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2FzZSBEUk1fTk9ERV9QUklNQVJZ OgorICAgICAgICByZXR1cm4gRFJNX0RFVl9OQU1FOworICAgIGNhc2UgRFJNX05PREVfQ09OVFJP TDoKKyAgICAgICAgcmV0dXJuIERSTV9DT05UUk9MX0RFVl9OQU1FOworICAgIGNhc2UgRFJNX05P REVfUkVOREVSOgorICAgICAgICByZXR1cm4gRFJNX1JFTkRFUl9ERVZfTkFNRTsKKyAgICB9Cisg ICAgcmV0dXJuIE5VTEw7Cit9CisKIC8qKgogICogT3BlbiB0aGUgRFJNIGRldmljZSwgY3JlYXRp bmcgaXQgaWYgbmVjZXNzYXJ5LgogICoKQEAgLTMxNiw3ICszMjksNyBAQCBzdGF0aWMgaW50IGNo b3duX2NoZWNrX3JldHVybihjb25zdCBjaGFyICpwYXRoLCB1aWRfdCBvd25lciwgZ2lkX3QgZ3Jv dXApCiBzdGF0aWMgaW50IGRybU9wZW5EZXZpY2UoZGV2X3QgZGV2LCBpbnQgbWlub3IsIGludCB0 eXBlKQogewogICAgIHN0YXRfdCAgICAgICAgICBzdDsKLSAgICBjb25zdCBjaGFyICAgICAgKmRl dl9uYW1lOworICAgIGNvbnN0IGNoYXIgICAgICAqZGV2X25hbWUgPSBkcm1HZXREZXZpY2VOYW1l KHR5cGUpOwogICAgIGNoYXIgICAgICAgICAgICBidWZbRFJNX05PREVfTkFNRV9NQVhdOwogICAg IGludCAgICAgICAgICAgICBmZDsKICAgICBtb2RlX3QgICAgICAgICAgZGV2bW9kZSA9IERSTV9E RVZfTU9ERSwgc2Vydl9tb2RlOwpAQCAtMzI3LDE5ICszNDAsOCBAQCBzdGF0aWMgaW50IGRybU9w ZW5EZXZpY2UoZGV2X3QgZGV2LCBpbnQgbWlub3IsIGludCB0eXBlKQogICAgIGdpZF90ICAgICAg ICAgICBncm91cCAgID0gRFJNX0RFVl9HSUQ7CiAjZW5kaWYKIAotICAgIHN3aXRjaCAodHlwZSkg ewotICAgIGNhc2UgRFJNX05PREVfUFJJTUFSWToKLSAgICAgICAgZGV2X25hbWUgPSBEUk1fREVW X05BTUU7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRFJNX05PREVfQ09OVFJPTDoKLSAgICAg ICAgZGV2X25hbWUgPSBEUk1fQ09OVFJPTF9ERVZfTkFNRTsKLSAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBEUk1fTk9ERV9SRU5ERVI6Ci0gICAgICAgIGRldl9uYW1lID0gRFJNX1JFTkRFUl9ERVZf TkFNRTsKLSAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKKyAgICBpZiAoIWRldl9uYW1lKQog ICAgICAgICByZXR1cm4gLUVJTlZBTDsKLSAgICB9OwogCiAgICAgc3ByaW50ZihidWYsIGRldl9u YW1lLCBEUk1fRElSX05BTUUsIG1pbm9yKTsKICAgICBkcm1Nc2coImRybU9wZW5EZXZpY2U6IG5v ZGUgbmFtZSBpcyAlc1xuIiwgYnVmKTsKQEAgLTQ0NiwyNCArNDQ4LDEzIEBAIHN0YXRpYyBpbnQg ZHJtT3Blbk1pbm9yKGludCBtaW5vciwgaW50IGNyZWF0ZSwgaW50IHR5cGUpCiB7CiAgICAgaW50 ICBmZDsKICAgICBjaGFyIGJ1ZltEUk1fTk9ERV9OQU1FX01BWF07Ci0gICAgY29uc3QgY2hhciAq ZGV2X25hbWU7CisgICAgY29uc3QgY2hhciAqZGV2X25hbWUgPSBkcm1HZXREZXZpY2VOYW1lKHR5 cGUpOwogCiAgICAgaWYgKGNyZWF0ZSkKICAgICAgICAgcmV0dXJuIGRybU9wZW5EZXZpY2UobWFr ZWRldihEUk1fTUFKT1IsIG1pbm9yKSwgbWlub3IsIHR5cGUpOwogCi0gICAgc3dpdGNoICh0eXBl KSB7Ci0gICAgY2FzZSBEUk1fTk9ERV9QUklNQVJZOgotICAgICAgICBkZXZfbmFtZSA9IERSTV9E RVZfTkFNRTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBEUk1fTk9ERV9DT05UUk9MOgotICAg ICAgICBkZXZfbmFtZSA9IERSTV9DT05UUk9MX0RFVl9OQU1FOwotICAgICAgICBicmVhazsKLSAg ICBjYXNlIERSTV9OT0RFX1JFTkRFUjoKLSAgICAgICAgZGV2X25hbWUgPSBEUk1fUkVOREVSX0RF Vl9OQU1FOwotICAgICAgICBicmVhazsKLSAgICBkZWZhdWx0OgorICAgIGlmICghZGV2X25hbWUp CiAgICAgICAgIHJldHVybiAtRUlOVkFMOwotICAgIH07CiAKICAgICBzcHJpbnRmKGJ1ZiwgZGV2 X25hbWUsIERSTV9ESVJfTkFNRSwgbWlub3IpOwogICAgIGlmICgoZmQgPSBvcGVuKGJ1ZiwgT19S RFdSIHwgT19DTE9FWEVDLCAwKSkgPj0gMCkKQEAgLTI4NzQsNyArMjg2NSw3IEBAIHN0YXRpYyBj aGFyICpkcm1HZXRNaW5vck5hbWVGb3JGRChpbnQgZmQsIGludCB0eXBlKQogI2Vsc2UKICAgICBz dHJ1Y3Qgc3RhdCBzYnVmOwogICAgIGNoYXIgYnVmW1BBVEhfTUFYICsgMV07Ci0gICAgY29uc3Qg Y2hhciAqZGV2X25hbWU7CisgICAgY29uc3QgY2hhciAqZGV2X25hbWUgPSBkcm1HZXREZXZpY2VO YW1lKHR5cGUpOwogICAgIHVuc2lnbmVkIGludCBtYWosIG1pbjsKICAgICBpbnQgbiwgYmFzZTsK IApAQCAtMjg4NywxOSArMjg3OCw4IEBAIHN0YXRpYyBjaGFyICpkcm1HZXRNaW5vck5hbWVGb3JG RChpbnQgZmQsIGludCB0eXBlKQogICAgIGlmICghZHJtTm9kZUlzRFJNKG1haiwgbWluKSB8fCAh U19JU0NIUihzYnVmLnN0X21vZGUpKQogICAgICAgICByZXR1cm4gTlVMTDsKIAotICAgIHN3aXRj aCAodHlwZSkgewotICAgIGNhc2UgRFJNX05PREVfUFJJTUFSWToKLSAgICAgICAgZGV2X25hbWUg PSBEUk1fREVWX05BTUU7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRFJNX05PREVfQ09OVFJP TDoKLSAgICAgICAgZGV2X25hbWUgPSBEUk1fQ09OVFJPTF9ERVZfTkFNRTsKLSAgICAgICAgYnJl YWs7Ci0gICAgY2FzZSBEUk1fTk9ERV9SRU5ERVI6Ci0gICAgICAgIGRldl9uYW1lID0gRFJNX1JF TkRFUl9ERVZfTkFNRTsKLSAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKKyAgICBpZiAoIWRl dl9uYW1lKQogICAgICAgICByZXR1cm4gTlVMTDsKLSAgICB9OwogCiAgICAgYmFzZSA9IGRybUdl dE1pbm9yQmFzZSh0eXBlKTsKICAgICBpZiAoYmFzZSA8IDApCkBAIC0zODU2LDE5ICszODM2LDkg QEAgZHJtX3B1YmxpYyBpbnQgZHJtR2V0RGV2aWNlMihpbnQgZmQsIHVpbnQzMl90IGZsYWdzLCBk cm1EZXZpY2VQdHIgKmRldmljZSkKICAgICBpZiAobm9kZV90eXBlID09IC0xKQogICAgICAgICBy ZXR1cm4gLUVOT0RFVjsKIAotICAgIHN3aXRjaCAobm9kZV90eXBlKSB7Ci0gICAgY2FzZSBEUk1f Tk9ERV9QUklNQVJZOgotICAgICAgICBkZXZfbmFtZSA9IERSTV9ERVZfTkFNRTsKLSAgICAgICAg YnJlYWs7Ci0gICAgY2FzZSBEUk1fTk9ERV9DT05UUk9MOgotICAgICAgICBkZXZfbmFtZSA9IERS TV9DT05UUk9MX0RFVl9OQU1FOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIERSTV9OT0RFX1JF TkRFUjoKLSAgICAgICAgZGV2X25hbWUgPSBEUk1fUkVOREVSX0RFVl9OQU1FOwotICAgICAgICBi cmVhazsKLSAgICBkZWZhdWx0OgorICAgIGRldl9uYW1lID0gZHJtR2V0RGV2aWNlTmFtZShub2Rl X3R5cGUpOworICAgIGlmICghZGV2X25hbWUpCiAgICAgICAgIHJldHVybiAtRUlOVkFMOwotICAg IH07CiAKICAgICBiYXNlID0gZHJtR2V0TWlub3JCYXNlKG5vZGVfdHlwZSk7CiAgICAgaWYgKGJh c2UgPCAwKQpAQCAtNDEwOSwxOSArNDA3OSw5IEBAIGRybV9wdWJsaWMgY2hhciAqZHJtR2V0RGV2 aWNlTmFtZUZyb21GZDIoaW50IGZkKQogICAgIGlmIChub2RlX3R5cGUgPT0gLTEpCiAgICAgICAg IHJldHVybiBOVUxMOwogCi0gICAgc3dpdGNoIChub2RlX3R5cGUpIHsKLSAgICBjYXNlIERSTV9O T0RFX1BSSU1BUlk6Ci0gICAgICAgIGRldl9uYW1lID0gRFJNX0RFVl9OQU1FOwotICAgICAgICBi cmVhazsKLSAgICBjYXNlIERSTV9OT0RFX0NPTlRST0w6Ci0gICAgICAgIGRldl9uYW1lID0gRFJN X0NPTlRST0xfREVWX05BTUU7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRFJNX05PREVfUkVO REVSOgotICAgICAgICBkZXZfbmFtZSA9IERSTV9SRU5ERVJfREVWX05BTUU7Ci0gICAgICAgIGJy ZWFrOwotICAgIGRlZmF1bHQ6CisgICAgZGV2X25hbWUgPSBkcm1HZXREZXZpY2VOYW1lKG5vZGVf dHlwZSk7CisgICAgaWYgKCFkZXZfbmFtZSkKICAgICAgICAgcmV0dXJuIE5VTEw7Ci0gICAgfTsK IAogICAgIGJhc2UgPSBkcm1HZXRNaW5vckJhc2Uobm9kZV90eXBlKTsKICAgICBpZiAoYmFzZSA8 IDApCi0tIApDaGVlcnMsCiAgRXJpYwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg==