From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/2] drm/radeon: remove duplicates check Date: Wed, 3 Dec 2014 15:46:49 +0100 Message-ID: <1417618009-2070-2-git-send-email-deathsimple@vodafone.de> References: <1417618009-2070-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D2C1733F1 for ; Wed, 3 Dec 2014 06:47:25 -0800 (PST) In-Reply-To: <1417618009-2070-1-git-send-email-deathsimple@vodafone.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: alexdeucher@gmail.com Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKQ29tcGxl dGVseSB1bm5lY2Vzc2FyeSBzaW5jZSB0aGUgd3dfbXV0ZXggdXNlZCB0byByZXNlcnZlIGEgYnVm ZmVyCmNhbiBkZXRlY3QgZG91YmxlIHJlc2VydmF0aW9ucyBmcm9tIHRoZSBzYW1lIHRocmVhZCBh bnl3YXkuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmln QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yNjAwX2NzLmMgICAgICAgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCAgICAgICAgfCAgMSAtCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jICAgICB8IDMwICsrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fb2JqZWN0LmMgfCAx MyArKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl91dmQuYyAgICB8 ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl92Y2UuYyAgICB8ICAyICstCiA2 IGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjYwMF9jcy5jIGIvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yNjAwX2NzLmMKaW5kZXggYjgxYmExOS4uZTU1MjE5NDYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcjYwMF9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcjYwMF9jcy5jCkBAIC0yNDUyLDcgKzI0NTIsNyBAQCBpbnQgcjYwMF9kbWFfY3NfbmV4dF9y ZWxvYyhzdHJ1Y3QgcmFkZW9uX2NzX3BhcnNlciAqcCwKIAkJCSAgaWR4LCBwLT5ucmVsb2NzKTsK IAkJcmV0dXJuIC1FSU5WQUw7CiAJfQotCSpjc19yZWxvYyA9IHAtPnJlbG9jc19wdHJbaWR4XTsK KwkqY3NfcmVsb2MgPSAmcC0+cmVsb2NzW2lkeF07CiAJcC0+ZG1hX3JlbG9jX2lkeCsrOwogCXJl dHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCBi L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggYjU5YTRkZS4uMTMxOWM5YyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0xMDc2LDcgKzEwNzYsNiBAQCBzdHJ1Y3QgcmFk ZW9uX2NzX3BhcnNlciB7CiAJLyogcmVsb2NhdGlvbnMgKi8KIAl1bnNpZ25lZAkJbnJlbG9jczsK IAlzdHJ1Y3QgcmFkZW9uX2JvX2xpc3QJKnJlbG9jczsKLQlzdHJ1Y3QgcmFkZW9uX2JvX2xpc3QJ KipyZWxvY3NfcHRyOwogCXN0cnVjdCByYWRlb25fYm9fbGlzdAkqdm1fYm9zOwogCXN0cnVjdCBs aXN0X2hlYWQJdmFsaWRhdGVkOwogCXVuc2lnbmVkCQlkbWFfcmVsb2NfaWR4OwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2NzLmMKaW5kZXggZmI3NzZjYi4uMjZmNzg1NSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL3JhZGVvbl9jcy5jCkBAIC03Nyw4ICs3Nyw4IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2NzX3Bh cnNlcl9yZWxvY3Moc3RydWN0IHJhZGVvbl9jc19wYXJzZXIgKnApCiAJc3RydWN0IGRybV9kZXZp Y2UgKmRkZXYgPSBwLT5yZGV2LT5kZGV2OwogCXN0cnVjdCByYWRlb25fY3NfY2h1bmsgKmNodW5r OwogCXN0cnVjdCByYWRlb25fY3NfYnVja2V0cyBidWNrZXRzOwotCXVuc2lnbmVkIGksIGo7Ci0J Ym9vbCBkdXBsaWNhdGUsIG5lZWRfbW1hcF9sb2NrID0gZmFsc2U7CisJdW5zaWduZWQgaTsKKwli b29sIG5lZWRfbW1hcF9sb2NrID0gZmFsc2U7CiAJaW50IHI7CiAKIAlpZiAocC0+Y2h1bmtfcmVs b2NzX2lkeCA9PSAtMSkgewpAQCAtODgsMTAgKzg4LDYgQEAgc3RhdGljIGludCByYWRlb25fY3Nf cGFyc2VyX3JlbG9jcyhzdHJ1Y3QgcmFkZW9uX2NzX3BhcnNlciAqcCkKIAlwLT5kbWFfcmVsb2Nf aWR4ID0gMDsKIAkvKiBGSVhNRTogd2UgYXNzdW1lIHRoYXQgZWFjaCByZWxvY3MgdXNlIDQgZHdv cmRzICovCiAJcC0+bnJlbG9jcyA9IGNodW5rLT5sZW5ndGhfZHcgLyA0OwotCXAtPnJlbG9jc19w dHIgPSBrY2FsbG9jKHAtPm5yZWxvY3MsIHNpemVvZih2b2lkICopLCBHRlBfS0VSTkVMKTsKLQlp ZiAocC0+cmVsb2NzX3B0ciA9PSBOVUxMKSB7Ci0JCXJldHVybiAtRU5PTUVNOwotCX0KIAlwLT5y ZWxvY3MgPSBrY2FsbG9jKHAtPm5yZWxvY3MsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX2JvX2xpc3Qp LCBHRlBfS0VSTkVMKTsKIAlpZiAocC0+cmVsb2NzID09IE5VTEwpIHsKIAkJcmV0dXJuIC1FTk9N RU07CkBAIC0xMDQsMjggKzEwMCwxMyBAQCBzdGF0aWMgaW50IHJhZGVvbl9jc19wYXJzZXJfcmVs b2NzKHN0cnVjdCByYWRlb25fY3NfcGFyc2VyICpwKQogCQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KmdvYmo7CiAJCXVuc2lnbmVkIHByaW9yaXR5OwogCi0JCWR1cGxpY2F0ZSA9IGZhbHNlOwogCQly ID0gKHN0cnVjdCBkcm1fcmFkZW9uX2NzX3JlbG9jICopJmNodW5rLT5rZGF0YVtpKjRdOwotCQlm b3IgKGogPSAwOyBqIDwgaTsgaisrKSB7Ci0JCQlzdHJ1Y3QgZHJtX3JhZGVvbl9jc19yZWxvYyAq b3RoZXI7Ci0JCQlvdGhlciA9ICh2b2lkICopJmNodW5rLT5rZGF0YVtqKjRdOwotCQkJaWYgKHIt PmhhbmRsZSA9PSBvdGhlci0+aGFuZGxlKSB7Ci0JCQkJcC0+cmVsb2NzX3B0cltpXSA9ICZwLT5y ZWxvY3Nbal07Ci0JCQkJZHVwbGljYXRlID0gdHJ1ZTsKLQkJCQlicmVhazsKLQkJCX0KLQkJfQot CQlpZiAoZHVwbGljYXRlKSB7Ci0JCQljb250aW51ZTsKLQkJfQotCiAJCWdvYmogPSBkcm1fZ2Vt X29iamVjdF9sb29rdXAoZGRldiwgcC0+ZmlscCwgci0+aGFuZGxlKTsKIAkJaWYgKGdvYmogPT0g TlVMTCkgewogCQkJRFJNX0VSUk9SKCJnZW0gb2JqZWN0IGxvb2t1cCBmYWlsZWQgMHgleFxuIiwK IAkJCQkgIHItPmhhbmRsZSk7CiAJCQlyZXR1cm4gLUVOT0VOVDsKIAkJfQotCQlwLT5yZWxvY3Nf cHRyW2ldID0gJnAtPnJlbG9jc1tpXTsKIAkJcC0+cmVsb2NzW2ldLnJvYmogPSBnZW1fdG9fcmFk ZW9uX2JvKGdvYmopOwogCiAJCS8qIFRoZSB1c2Vyc3BhY2UgYnVmZmVyIHByaW9yaXRpZXMgYXJl IGZyb20gMCB0byAxNS4gQSBoaWdoZXIKQEAgLTQ0OCw3ICs0MjksNiBAQCBzdGF0aWMgdm9pZCBy YWRlb25fY3NfcGFyc2VyX2Zpbmkoc3RydWN0IHJhZGVvbl9jc19wYXJzZXIgKnBhcnNlciwgaW50 IGVycm9yLCBibwogCX0KIAlrZnJlZShwYXJzZXItPnRyYWNrKTsKIAlrZnJlZShwYXJzZXItPnJl bG9jcyk7Ci0Ja2ZyZWUocGFyc2VyLT5yZWxvY3NfcHRyKTsKIAlkcm1fZnJlZV9sYXJnZShwYXJz ZXItPnZtX2Jvcyk7CiAJZm9yIChpID0gMDsgaSA8IHBhcnNlci0+bmNodW5rczsgaSsrKQogCQlk cm1fZnJlZV9sYXJnZShwYXJzZXItPmNodW5rc1tpXS5rZGF0YSk7CkBAIC01MjMsMTAgKzUwMyw2 IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2JvX3ZtX3VwZGF0ZV9wdGUoc3RydWN0IHJhZGVvbl9jc19w YXJzZXIgKnAsCiAJZm9yIChpID0gMDsgaSA8IHAtPm5yZWxvY3M7IGkrKykgewogCQlzdHJ1Y3Qg cmFkZW9uX2JvICpibzsKIAotCQkvKiBpZ25vcmUgZHVwbGljYXRlcyAqLwotCQlpZiAocC0+cmVs b2NzX3B0cltpXSAhPSAmcC0+cmVsb2NzW2ldKQotCQkJY29udGludWU7Ci0KIAkJYm8gPSBwLT5y ZWxvY3NbaV0ucm9iajsKIAkJYm9fdmEgPSByYWRlb25fdm1fYm9fZmluZCh2bSwgYm8pOwogCQlp ZiAoYm9fdmEgPT0gTlVMTCkgewpAQCAtODcxLDYgKzg0Nyw2IEBAIGludCByYWRlb25fY3NfcGFj a2V0X25leHRfcmVsb2Moc3RydWN0IHJhZGVvbl9jc19wYXJzZXIgKnAsCiAJCQkodTY0KXJlbG9j c19jaHVuay0+a2RhdGFbaWR4ICsgM10gPDwgMzI7CiAJCSgqY3NfcmVsb2MpLT5ncHVfb2Zmc2V0 IHw9IHJlbG9jc19jaHVuay0+a2RhdGFbaWR4ICsgMF07CiAJfSBlbHNlCi0JCSpjc19yZWxvYyA9 IHAtPnJlbG9jc19wdHJbKGlkeCAvIDQpXTsKKwkJKmNzX3JlbG9jID0gJnAtPnJlbG9jc1soaWR4 IC8gNCldOwogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9vYmplY3Qu YwppbmRleCBhNGEzYWM4Li4wYThlZjllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL3JhZGVvbl9vYmplY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9v YmplY3QuYwpAQCAtNTAzLDE4ICs1MDMsMTkgQEAgaW50IHJhZGVvbl9ib19saXN0X3ZhbGlkYXRl KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCQkJICAgIHN0cnVjdCBsaXN0X2hlYWQgKmhl YWQsIGludCByaW5nKQogewogCXN0cnVjdCByYWRlb25fYm9fbGlzdCAqbG9iajsKLQlzdHJ1Y3Qg cmFkZW9uX2JvICpibzsKKwlzdHJ1Y3QgbGlzdF9oZWFkIGR1cGxpY2F0ZXM7CiAJaW50IHI7CiAJ dTY0IGJ5dGVzX21vdmVkID0gMCwgaW5pdGlhbF9ieXRlc19tb3ZlZDsKIAl1NjQgYnl0ZXNfbW92 ZWRfdGhyZXNob2xkID0gcmFkZW9uX2JvX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHJkZXYpOwog Ci0JciA9IHR0bV9ldV9yZXNlcnZlX2J1ZmZlcnModGlja2V0LCBoZWFkLCB0cnVlLCBOVUxMKTsK KwlJTklUX0xJU1RfSEVBRCgmZHVwbGljYXRlcyk7CisJciA9IHR0bV9ldV9yZXNlcnZlX2J1ZmZl cnModGlja2V0LCBoZWFkLCB0cnVlLCAmZHVwbGljYXRlcyk7CiAJaWYgKHVubGlrZWx5KHIgIT0g MCkpIHsKIAkJcmV0dXJuIHI7CiAJfQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShsb2JqLCBoZWFk LCB0di5oZWFkKSB7Ci0JCWJvID0gbG9iai0+cm9iajsKKwkJc3RydWN0IHJhZGVvbl9ibyAqYm8g PSBsb2JqLT5yb2JqOwogCQlpZiAoIWJvLT5waW5fY291bnQpIHsKIAkJCXUzMiBkb21haW4gPSBs b2JqLT5wcmVmZXJlZF9kb21haW5zOwogCQkJdTMyIGFsbG93ZWQgPSBsb2JqLT5hbGxvd2VkX2Rv bWFpbnM7CkBAIC01NjIsNiArNTYzLDEyIEBAIGludCByYWRlb25fYm9fbGlzdF92YWxpZGF0ZShz dHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAkJbG9iai0+Z3B1X29mZnNldCA9IHJhZGVvbl9i b19ncHVfb2Zmc2V0KGJvKTsKIAkJbG9iai0+dGlsaW5nX2ZsYWdzID0gYm8tPnRpbGluZ19mbGFn czsKIAl9CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGxvYmosICZkdXBsaWNhdGVzLCB0di5oZWFk KSB7CisJCWxvYmotPmdwdV9vZmZzZXQgPSByYWRlb25fYm9fZ3B1X29mZnNldChsb2JqLT5yb2Jq KTsKKwkJbG9iai0+dGlsaW5nX2ZsYWdzID0gbG9iai0+cm9iai0+dGlsaW5nX2ZsYWdzOworCX0K KwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl91dmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3V2ZC5jCmluZGV4IDdj MjJiOTMuLjcyY2Q0N2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u X3V2ZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3V2ZC5jCkBAIC01MDIs NyArNTAyLDcgQEAgc3RhdGljIGludCByYWRlb25fdXZkX2NzX3JlbG9jKHN0cnVjdCByYWRlb25f Y3NfcGFyc2VyICpwLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlyZWxvYyA9IHAtPnJlbG9j c19wdHJbKGlkeCAvIDQpXTsKKwlyZWxvYyA9ICZwLT5yZWxvY3NbKGlkeCAvIDQpXTsKIAlzdGFy dCA9IHJlbG9jLT5ncHVfb2Zmc2V0OwogCWVuZCA9IHN0YXJ0ICsgcmFkZW9uX2JvX3NpemUocmVs b2MtPnJvYmopOwogCXN0YXJ0ICs9IG9mZnNldDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX3ZjZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdmNl LmMKaW5kZXggOGI0ZWVhNC4uYjNhMTY5OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fdmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdmNl LmMKQEAgLTQ2Nyw3ICs0NjcsNyBAQCBpbnQgcmFkZW9uX3ZjZV9jc19yZWxvYyhzdHJ1Y3QgcmFk ZW9uX2NzX3BhcnNlciAqcCwgaW50IGxvLCBpbnQgaGksCiAJCXJldHVybiAtRUlOVkFMOwogCX0K IAotCXJlbG9jID0gcC0+cmVsb2NzX3B0clsoaWR4IC8gNCldOworCXJlbG9jID0gJnAtPnJlbG9j c1soaWR4IC8gNCldOwogCXN0YXJ0ID0gcmVsb2MtPmdwdV9vZmZzZXQ7CiAJZW5kID0gc3RhcnQg KyByYWRlb25fYm9fc2l6ZShyZWxvYy0+cm9iaik7CiAJc3RhcnQgKz0gb2Zmc2V0OwotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==