From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH 02/13] drm: store property instead of id in obj attachment Date: Tue, 16 Dec 2014 18:05:30 -0500 Message-ID: <1418771141-16954-3-git-send-email-robdclark@gmail.com> References: <1418771141-16954-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qa0-f45.google.com (mail-qa0-f45.google.com [209.85.216.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 4CD756E3F5 for ; Tue, 16 Dec 2014 15:05:54 -0800 (PST) Received: by mail-qa0-f45.google.com with SMTP id i13so2665927qae.18 for ; Tue, 16 Dec 2014 15:05:53 -0800 (PST) In-Reply-To: <1418771141-16954-1-git-send-email-robdclark@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 List-Id: dri-devel@lists.freedesktop.org S2VlcCBwcm9wZXJ0eSBwb2ludGVyLCBpbnN0ZWFkIG9mIGlkLCBpbiBwZXIgbW9kZS1vYmplY3Qg YXR0YWNobWVudHMuClRoaXMgd2lsbCBzaW1wbGlmeSB0aGluZ3MgaW4gbGF0ZXIgcGF0Y2hlcy4K ClNpZ25lZC1vZmYtYnk6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyB8IDE3ICsrKysrKysrLS0tLS0tLS0tCiBpbmNsdWRlL2Ry bS9kcm1fY3J0Yy5oICAgICB8ICA3ICsrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0 aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwppbmRleCA1ZWU0Yjg4Li4yNzgw YTA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX2NydGMuYwpAQCAtMjEwNSwxMiArMjEwNSwxMSBAQCBpbnQgZHJtX21vZGVf Z2V0Y29ubmVjdG9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCXByb3Bf cHRyID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShvdXRfcmVzcC0+cHJvcHNf cHRyKTsKIAkJcHJvcF92YWx1ZXMgPSAodWludDY0X3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcp KG91dF9yZXNwLT5wcm9wX3ZhbHVlc19wdHIpOwogCQlmb3IgKGkgPSAwOyBpIDwgY29ubmVjdG9y LT5wcm9wZXJ0aWVzLmNvdW50OyBpKyspIHsKLQkJCWlmIChwdXRfdXNlcihjb25uZWN0b3ItPnBy b3BlcnRpZXMuaWRzW2ldLAotCQkJCSAgICAgcHJvcF9wdHIgKyBjb3BpZWQpKSB7CisJCQlzdHJ1 Y3QgZHJtX3Byb3BlcnR5ICpwcm9wID0gY29ubmVjdG9yLT5wcm9wZXJ0aWVzLnByb3BlcnRpZXNb aV07CisJCQlpZiAocHV0X3VzZXIocHJvcC0+YmFzZS5pZCwgcHJvcF9wdHIgKyBjb3BpZWQpKSB7 CiAJCQkJcmV0ID0gLUVGQVVMVDsKIAkJCQlnb3RvIG91dDsKIAkJCX0KLQogCQkJaWYgKHB1dF91 c2VyKGNvbm5lY3Rvci0+cHJvcGVydGllcy52YWx1ZXNbaV0sCiAJCQkJICAgICBwcm9wX3ZhbHVl cyArIGNvcGllZCkpIHsKIAkJCQlyZXQgPSAtRUZBVUxUOwpAQCAtMzgyMiw3ICszODIxLDcgQEAg dm9pZCBkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpv YmosCiAJCXJldHVybjsKIAl9CiAKLQlvYmotPnByb3BlcnRpZXMtPmlkc1tjb3VudF0gPSBwcm9w ZXJ0eS0+YmFzZS5pZDsKKwlvYmotPnByb3BlcnRpZXMtPnByb3BlcnRpZXNbY291bnRdID0gcHJv cGVydHk7CiAJb2JqLT5wcm9wZXJ0aWVzLT52YWx1ZXNbY291bnRdID0gaW5pdF92YWw7CiAJb2Jq LT5wcm9wZXJ0aWVzLT5jb3VudCsrOwogfQpAQCAtMzg0Nyw3ICszODQ2LDcgQEAgaW50IGRybV9v YmplY3RfcHJvcGVydHlfc2V0X3ZhbHVlKHN0cnVjdCBkcm1fbW9kZV9vYmplY3QgKm9iaiwKIAlp bnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBvYmotPnByb3BlcnRpZXMtPmNvdW50OyBpKyspIHsK LQkJaWYgKG9iai0+cHJvcGVydGllcy0+aWRzW2ldID09IHByb3BlcnR5LT5iYXNlLmlkKSB7CisJ CWlmIChvYmotPnByb3BlcnRpZXMtPnByb3BlcnRpZXNbaV0gPT0gcHJvcGVydHkpIHsKIAkJCW9i ai0+cHJvcGVydGllcy0+dmFsdWVzW2ldID0gdmFsOwogCQkJcmV0dXJuIDA7CiAJCX0KQEAgLTM4 NzcsNyArMzg3Niw3IEBAIGludCBkcm1fb2JqZWN0X3Byb3BlcnR5X2dldF92YWx1ZShzdHJ1Y3Qg ZHJtX21vZGVfb2JqZWN0ICpvYmosCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgb2JqLT5w cm9wZXJ0aWVzLT5jb3VudDsgaSsrKSB7Ci0JCWlmIChvYmotPnByb3BlcnRpZXMtPmlkc1tpXSA9 PSBwcm9wZXJ0eS0+YmFzZS5pZCkgeworCQlpZiAob2JqLT5wcm9wZXJ0aWVzLT5wcm9wZXJ0aWVz W2ldID09IHByb3BlcnR5KSB7CiAJCQkqdmFsID0gb2JqLT5wcm9wZXJ0aWVzLT52YWx1ZXNbaV07 CiAJCQlyZXR1cm4gMDsKIAkJfQpAQCAtNDQxMyw4ICs0NDEyLDggQEAgaW50IGRybV9tb2RlX29i al9nZXRfcHJvcGVydGllc19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCQlwcm9wX3ZhbHVlc19wdHIgPSAodWludDY0X3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcp CiAJCQkJICAoYXJnLT5wcm9wX3ZhbHVlc19wdHIpOwogCQlmb3IgKGkgPSAwOyBpIDwgcHJvcHNf Y291bnQ7IGkrKykgewotCQkJaWYgKHB1dF91c2VyKG9iai0+cHJvcGVydGllcy0+aWRzW2ldLAot CQkJCSAgICAgcHJvcHNfcHRyICsgY29waWVkKSkgeworCQkJc3RydWN0IGRybV9wcm9wZXJ0eSAq cHJvcCA9IG9iai0+cHJvcGVydGllcy0+cHJvcGVydGllc1tpXTsKKwkJCWlmIChwdXRfdXNlcihw cm9wLT5iYXNlLmlkLCBwcm9wc19wdHIgKyBjb3BpZWQpKSB7CiAJCQkJcmV0ID0gLUVGQVVMVDsK IAkJCQlnb3RvIG91dDsKIAkJCX0KQEAgLTQ0NzIsNyArNDQ3MSw3IEBAIGludCBkcm1fbW9kZV9v Ympfc2V0X3Byb3BlcnR5X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEs CiAJCWdvdG8gb3V0OwogCiAJZm9yIChpID0gMDsgaSA8IGFyZ19vYmotPnByb3BlcnRpZXMtPmNv dW50OyBpKyspCi0JCWlmIChhcmdfb2JqLT5wcm9wZXJ0aWVzLT5pZHNbaV0gPT0gYXJnLT5wcm9w X2lkKQorCQlpZiAoYXJnX29iai0+cHJvcGVydGllcy0+cHJvcGVydGllc1tpXS0+YmFzZS5pZCA9 PSBhcmctPnByb3BfaWQpCiAJCQlicmVhazsKIAogCWlmIChpID09IGFyZ19vYmotPnByb3BlcnRp ZXMtPmNvdW50KQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaCBiL2luY2x1ZGUv ZHJtL2RybV9jcnRjLmgKaW5kZXggYjg2MzI5OC4uMDI3NThlOCAxMDA2NDQKLS0tIGEvaW5jbHVk ZS9kcm0vZHJtX2NydGMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC02NCw3ICs2 NCwxMiBAQCBzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0IHsKICNkZWZpbmUgRFJNX09CSkVDVF9NQVhf UFJPUEVSVFkgMjQKIHN0cnVjdCBkcm1fb2JqZWN0X3Byb3BlcnRpZXMgewogCWludCBjb3VudDsK LQl1aW50MzJfdCBpZHNbRFJNX09CSkVDVF9NQVhfUFJPUEVSVFldOworCS8qIE5PVEU6IGlmIHdl IGV2ZXIgc3RhcnQgZHluYW1pY2FsbHkgZGVzdHJveWluZyBwcm9wZXJ0aWVzIChpZS4KKwkgKiBu b3QgYXQgZHJtX21vZGVfY29uZmlnX2NsZWFudXAoKSB0aW1lKSwgdGhlbiB3ZSdkIGhhdmUgdG8g ZG8KKwkgKiBhIGJldHRlciBqb2Igb2YgZGV0YWNoaW5nIHByb3BlcnR5IGZyb20gbW9kZSBvYmpl Y3RzIHRvIGF2b2lkCisJICogZGFuZ2xpbmcgcHJvcGVydHkgcG9pbnRlcnM6CisJICovCisJc3Ry dWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydGllc1tEUk1fT0JKRUNUX01BWF9QUk9QRVJUWV07CiAJ dWludDY0X3QgdmFsdWVzW0RSTV9PQkpFQ1RfTUFYX1BST1BFUlRZXTsKIH07CiAKLS0gCjIuMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=