From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH] drm: add 'count' to struct drm_object_properties Date: Tue, 15 May 2012 18:09:04 -0300 Message-ID: <1337116145-15041-6-git-send-email-przanoni@gmail.com> References: <1337116145-15041-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yw0-f49.google.com (mail-yw0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 99D1C9E848 for ; Tue, 15 May 2012 14:09:27 -0700 (PDT) Received: by mail-yw0-f49.google.com with SMTP id j52so53027yhj.36 for ; Tue, 15 May 2012 14:09:27 -0700 (PDT) In-Reply-To: <1337116145-15041-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: Paulo Zanoni List-Id: dri-devel@lists.freedesktop.org RnJvbTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CgpUaGlzIHdheSwg d2UgZG9uJ3QgbmVlZCB0byBjb3VudCBldmVyeSB0aW1lLCBzbyB3ZSdyZSBhIGxpdHRsZSBiaXQK ZmFzdGVyIGFuZCBjb2RlIGlzIGEgbGl0dGxlIGJpdCBzbWFsbGVyLgoKQ2hhbmdlIHN1Z2dlc3Rl ZCBieSBWaWxsZSBTeXJqw6Rsw6QuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxv LnIuemFub25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyB8ICAg NjQgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUv ZHJtL2RybV9jcnRjLmggICAgIHwgICAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlv bnMoKyksIDM3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f Y3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmMKaW5kZXggNzkzZjUxYi4uMzY4ZTNl NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2RybV9jcnRjLmMKQEAgLTE0MjUsMTEgKzE0MjUsNyBAQCBpbnQgZHJtX21vZGVfZ2V0 Y29ubmVjdG9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJfQogCWNvbm5l Y3RvciA9IG9ial90b19jb25uZWN0b3Iob2JqKTsKIAotCWZvciAoaSA9IDA7IGkgPCBEUk1fT0JK RUNUX01BWF9QUk9QRVJUWTsgaSsrKSB7Ci0JCWlmIChjb25uZWN0b3ItPnByb3BlcnRpZXMuaWRz W2ldICE9IDApIHsKLQkJCXByb3BzX2NvdW50Kys7Ci0JCX0KLQl9CisJcHJvcHNfY291bnQgPSBj b25uZWN0b3ItPnByb3BlcnRpZXMuY291bnQ7CiAKIAlmb3IgKGkgPSAwOyBpIDwgRFJNX0NPTk5F Q1RPUl9NQVhfRU5DT0RFUjsgaSsrKSB7CiAJCWlmIChjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ld ICE9IDApIHsKQEAgLTE0ODIsMjEgKzE0NzgsMTkgQEAgaW50IGRybV9tb2RlX2dldGNvbm5lY3Rv cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQljb3BpZWQgPSAwOwogCQlw cm9wX3B0ciA9ICh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9uZykob3V0X3Jlc3AtPnBy b3BzX3B0cik7CiAJCXByb3BfdmFsdWVzID0gKHVpbnQ2NF90IF9fdXNlciAqKSh1bnNpZ25lZCBs b25nKShvdXRfcmVzcC0+cHJvcF92YWx1ZXNfcHRyKTsKLQkJZm9yIChpID0gMDsgaSA8IERSTV9P QkpFQ1RfTUFYX1BST1BFUlRZOyBpKyspIHsKLQkJCWlmIChjb25uZWN0b3ItPnByb3BlcnRpZXMu aWRzW2ldICE9IDApIHsKLQkJCQlpZiAocHV0X3VzZXIoY29ubmVjdG9yLT5wcm9wZXJ0aWVzLmlk c1tpXSwKLQkJCQkJICAgICBwcm9wX3B0ciArIGNvcGllZCkpIHsKLQkJCQkJcmV0ID0gLUVGQVVM VDsKLQkJCQkJZ290byBvdXQ7Ci0JCQkJfQorCQlmb3IgKGkgPSAwOyBpIDwgY29ubmVjdG9yLT5w cm9wZXJ0aWVzLmNvdW50OyBpKyspIHsKKwkJCWlmIChwdXRfdXNlcihjb25uZWN0b3ItPnByb3Bl cnRpZXMuaWRzW2ldLAorCQkJCSAgICAgcHJvcF9wdHIgKyBjb3BpZWQpKSB7CisJCQkJcmV0ID0g LUVGQVVMVDsKKwkJCQlnb3RvIG91dDsKKwkJCX0KIAotCQkJCWlmIChwdXRfdXNlcihjb25uZWN0 b3ItPnByb3BlcnRpZXMudmFsdWVzW2ldLAotCQkJCQkgICAgIHByb3BfdmFsdWVzICsgY29waWVk KSkgewotCQkJCQlyZXQgPSAtRUZBVUxUOwotCQkJCQlnb3RvIG91dDsKLQkJCQl9Ci0JCQkJY29w aWVkKys7CisJCQlpZiAocHV0X3VzZXIoY29ubmVjdG9yLT5wcm9wZXJ0aWVzLnZhbHVlc1tpXSwK KwkJCQkgICAgIHByb3BfdmFsdWVzICsgY29waWVkKSkgeworCQkJCXJldCA9IC1FRkFVTFQ7CisJ CQkJZ290byBvdXQ7CiAJCQl9CisJCQljb3BpZWQrKzsKIAkJfQogCX0KIAlvdXRfcmVzcC0+Y291 bnRfcHJvcHMgPSBwcm9wc19jb3VudDsKQEAgLTI4NDUsMTkgKzI4MzksMTkgQEAgdm9pZCBkcm1f b2JqZWN0X2F0dGFjaF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmosCiAJCQkJ c3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksCiAJCQkJdWludDY0X3QgaW5pdF92YWwpCiB7 Ci0JaW50IGk7CisJaW50IGNvdW50ID0gb2JqLT5wcm9wZXJ0aWVzLT5jb3VudDsKIAotCWZvciAo aSA9IDA7IGkgPCBEUk1fT0JKRUNUX01BWF9QUk9QRVJUWTsgaSsrKSB7Ci0JCWlmIChvYmotPnBy b3BlcnRpZXMtPmlkc1tpXSA9PSAwKSB7Ci0JCQlvYmotPnByb3BlcnRpZXMtPmlkc1tpXSA9IHBy b3BlcnR5LT5iYXNlLmlkOwotCQkJb2JqLT5wcm9wZXJ0aWVzLT52YWx1ZXNbaV0gPSBpbml0X3Zh bDsKLQkJCXJldHVybjsKLQkJfQorCWlmIChjb3VudCA9PSBEUk1fT0JKRUNUX01BWF9QUk9QRVJU WSkgeworCQlXQVJOKDEsICJGYWlsZWQgdG8gYXR0YWNoIG9iamVjdCBwcm9wZXJ0eSAodHlwZTog MHgleCkuIFBsZWFzZSAiCisJCQkiaW5jcmVhc2UgRFJNX09CSkVDVF9NQVhfUFJPUEVSVFkgYnkg MSBmb3IgZWFjaCB0aW1lICIKKwkJCSJ5b3Ugc2VlIHRoaXMgbWVzc2FnZSBvbiB0aGUgc2FtZSBv YmplY3QgdHlwZS5cbiIsCisJCQlvYmotPnR5cGUpOworCQlyZXR1cm47CiAJfQogCi0JV0FSTigx LCAiRmFpbGVkIHRvIGF0dGFjaCBvYmplY3QgcHJvcGVydHkgKHR5cGU6IDB4JXgpLiBQbGVhc2Ug IgotCQkiaW5jcmVhc2UgRFJNX09CSkVDVF9NQVhfUFJPUEVSVFkgYnkgMSBmb3IgZWFjaCB0aW1l IHlvdSBzZWUgIgotCQkidGhpcyBtZXNzYWdlIG9uIHRoZSBzYW1lIG9iamVjdCB0eXBlLlxuIiwg b2JqLT50eXBlKTsKKwlvYmotPnByb3BlcnRpZXMtPmlkc1tjb3VudF0gPSBwcm9wZXJ0eS0+YmFz ZS5pZDsKKwlvYmotPnByb3BlcnRpZXMtPnZhbHVlc1tjb3VudF0gPSBpbml0X3ZhbDsKKwlvYmot PnByb3BlcnRpZXMtPmNvdW50Kys7CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9vYmplY3RfYXR0YWNo X3Byb3BlcnR5KTsKIApAQCAtMjg2Niw3ICsyODYwLDcgQEAgaW50IGRybV9vYmplY3RfcHJvcGVy dHlfc2V0X3ZhbHVlKHN0cnVjdCBkcm1fbW9kZV9vYmplY3QgKm9iaiwKIHsKIAlpbnQgaTsKIAot CWZvciAoaSA9IDA7IGkgPCBEUk1fT0JKRUNUX01BWF9QUk9QRVJUWTsgaSsrKSB7CisJZm9yIChp ID0gMDsgaSA8IG9iai0+cHJvcGVydGllcy0+Y291bnQ7IGkrKykgewogCQlpZiAob2JqLT5wcm9w ZXJ0aWVzLT5pZHNbaV0gPT0gcHJvcGVydHktPmJhc2UuaWQpIHsKIAkJCW9iai0+cHJvcGVydGll cy0+dmFsdWVzW2ldID0gdmFsOwogCQkJcmV0dXJuIDA7CkBAIC0yODgyLDcgKzI4NzYsNyBAQCBp bnQgZHJtX29iamVjdF9wcm9wZXJ0eV9nZXRfdmFsdWUoc3RydWN0IGRybV9tb2RlX29iamVjdCAq b2JqLAogewogCWludCBpOwogCi0JZm9yIChpID0gMDsgaSA8IERSTV9PQkpFQ1RfTUFYX1BST1BF UlRZOyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgb2JqLT5wcm9wZXJ0aWVzLT5jb3VudDsgaSsr KSB7CiAJCWlmIChvYmotPnByb3BlcnRpZXMtPmlkc1tpXSA9PSBwcm9wZXJ0eS0+YmFzZS5pZCkg ewogCQkJKnZhbCA9IG9iai0+cHJvcGVydGllcy0+dmFsdWVzW2ldOwogCQkJcmV0dXJuIDA7CkBA IC0zMTc0LDExICszMTY4LDcgQEAgaW50IGRybV9tb2RlX29ial9nZXRfcHJvcGVydGllc19pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlnb3RvIG91dDsKIAl9CiAK LQkvKiBBc3N1bWUgWyBwcm9wLCAwLCBwcm9wIF0gd29uJ3QgaGFwcGVuIChpZiB3ZSBldmVyIGRl bGV0ZSBwcm9wZXJ0aWVzLAotCSAqIHdlIG5lZWQgdG8gcmVtb3ZlIHRoZSBnYXAgaW5zaWRlIHRo ZSBhcnJheSkuICovCi0JZm9yIChwcm9wc19jb3VudCA9IDA7IHByb3BzX2NvdW50IDwgRFJNX09C SkVDVF9NQVhfUFJPUEVSVFkgJiYKLQkJb2JqLT5wcm9wZXJ0aWVzLT5pZHNbcHJvcHNfY291bnRd ICE9IDA7IHByb3BzX2NvdW50KyspCi0JCTsKKwlwcm9wc19jb3VudCA9IG9iai0+cHJvcGVydGll cy0+Y291bnQ7CiAKIAkvKiBUaGlzIGlvY3RsIGlzIGNhbGxlZCB0d2ljZSwgb25jZSB0byBkZXRl cm1pbmUgaG93IG11Y2ggc3BhY2UgaXMKIAkgKiBuZWVkZWQsIGFuZCB0aGUgMm5kIHRpbWUgdG8g ZmlsbCBpdC4gKi8KQEAgLTMyMjgsMTEgKzMyMTgsMTEgQEAgaW50IGRybV9tb2RlX29ial9zZXRf cHJvcGVydHlfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlpZiAo IWFyZ19vYmotPnByb3BlcnRpZXMpCiAJCWdvdG8gb3V0OwogCi0JZm9yIChpID0gMDsgaSA8IERS TV9PQkpFQ1RfTUFYX1BST1BFUlRZOyBpKyspCisJZm9yIChpID0gMDsgaSA8IGFyZ19vYmotPnBy b3BlcnRpZXMtPmNvdW50OyBpKyspCiAJCWlmIChhcmdfb2JqLT5wcm9wZXJ0aWVzLT5pZHNbaV0g PT0gYXJnLT5wcm9wX2lkKQogCQkJYnJlYWs7CiAKLQlpZiAoaSA9PSBEUk1fT0JKRUNUX01BWF9Q Uk9QRVJUWSkKKwlpZiAoaSA9PSBhcmdfb2JqLT5wcm9wZXJ0aWVzLT5jb3VudCkKIAkJZ290byBv dXQ7CiAKIAlwcm9wX29iaiA9IGRybV9tb2RlX29iamVjdF9maW5kKGRldiwgYXJnLT5wcm9wX2lk LApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaCBiL2luY2x1ZGUvZHJtL2RybV9j cnRjLmgKaW5kZXggYjBjMzI0OS4uNmQzNjU1MiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJt X2NydGMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC01Niw2ICs1Niw3IEBAIHN0 cnVjdCBkcm1fbW9kZV9vYmplY3QgewogCiAjZGVmaW5lIERSTV9PQkpFQ1RfTUFYX1BST1BFUlRZ IDE2CiBzdHJ1Y3QgZHJtX29iamVjdF9wcm9wZXJ0aWVzIHsKKwlpbnQgY291bnQ7CiAJdWludDMy X3QgaWRzW0RSTV9PQkpFQ1RfTUFYX1BST1BFUlRZXTsKIAl1aW50NjRfdCB2YWx1ZXNbRFJNX09C SkVDVF9NQVhfUFJPUEVSVFldOwogfTsKLS0gCjEuNy4xMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK