From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] Revert "drm: Unify handling of blob and object properties" Date: Wed, 7 Sep 2016 11:52:40 +0200 Message-ID: <8c0d3482-1bb5-6a15-b105-6bda2b31b5dc@linux.intel.com> References: <20160829082757.17913-1-daniel.vetter@ffwll.ch> <20160829082757.17913-8-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 17C856E98F for ; Wed, 7 Sep 2016 09:52:43 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ying Liu , Daniel Vetter Cc: Daniel Stone , DRI Development List-Id: dri-devel@lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCA3Nzk1M2JkMTM2ZDJhNzBiY2EyZGM5M2IzY2NkYTA3YTJiMzcw NzZmLgoKVGhpcyBjYXVzZXMgYSBrZXJuZWwgcGFuaWMgd2hlbiB0cnlpbmcgdG8gYXNzaWduIGEg YmxvYiB0byBhIHByb3BlcnR5LAphbmQgaGFzIG9idmlvdXNseSBuZXZlciBiZWVuIHRlc3RlZC4K ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9wcm9wZXJ0eS5jIHwgMjMgKysr KysrKysrKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvcGVydHku YyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvcGVydHkuYwppbmRleCA0MTM5YWZiY2MyNjcuLmE0 ZDgxY2Y0ZmZhMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcm9wZXJ0eS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvcGVydHkuYwpAQCAtODcwLDggKzg3MCwyMCBAQCBi b29sIGRybV9wcm9wZXJ0eV9jaGFuZ2VfdmFsaWRfZ2V0KHN0cnVjdCBkcm1fcHJvcGVydHkgKnBy b3BlcnR5LAogCQlmb3IgKGkgPSAwOyBpIDwgcHJvcGVydHktPm51bV92YWx1ZXM7IGkrKykKIAkJ CXZhbGlkX21hc2sgfD0gKDFVTEwgPDwgcHJvcGVydHktPnZhbHVlc1tpXSk7CiAJCXJldHVybiAh KHZhbHVlICYgfnZhbGlkX21hc2spOwotCX0gZWxzZSBpZiAoZHJtX3Byb3BlcnR5X3R5cGVfaXMo cHJvcGVydHksIERSTV9NT0RFX1BST1BfQkxPQikgfHwKLQkJICAgZHJtX3Byb3BlcnR5X3R5cGVf aXMocHJvcGVydHksIERSTV9NT0RFX1BST1BfT0JKRUNUKSkgeworCX0gZWxzZSBpZiAoZHJtX3By b3BlcnR5X3R5cGVfaXMocHJvcGVydHksIERSTV9NT0RFX1BST1BfQkxPQikpIHsKKwkJc3RydWN0 IGRybV9wcm9wZXJ0eV9ibG9iICpibG9iOworCisJCWlmICh2YWx1ZSA9PSAwKQorCQkJcmV0dXJu IHRydWU7CisKKwkJYmxvYiA9IGRybV9wcm9wZXJ0eV9sb29rdXBfYmxvYihwcm9wZXJ0eS0+ZGV2 LCB2YWx1ZSk7CisJCWlmIChibG9iKSB7CisJCQkqcmVmID0gJmJsb2ItPmJhc2U7CisJCQlyZXR1 cm4gdHJ1ZTsKKwkJfSBlbHNlIHsKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCX0gZWxzZSBpZiAo ZHJtX3Byb3BlcnR5X3R5cGVfaXMocHJvcGVydHksIERSTV9NT0RFX1BST1BfT0JKRUNUKSkgewog CQkvKiBhIHplcm8gdmFsdWUgZm9yIGFuIG9iamVjdCBwcm9wZXJ0eSB0cmFuc2xhdGVzIHRvIG51 bGw6ICovCiAJCWlmICh2YWx1ZSA9PSAwKQogCQkJcmV0dXJuIHRydWU7CkBAIC04ODgsMTIgKzkw MCwxMyBAQCBib29sIGRybV9wcm9wZXJ0eV9jaGFuZ2VfdmFsaWRfZ2V0KHN0cnVjdCBkcm1fcHJv cGVydHkgKnByb3BlcnR5LAogfQogCiB2b2lkIGRybV9wcm9wZXJ0eV9jaGFuZ2VfdmFsaWRfcHV0 KHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAotCQkJCSAgIHN0cnVjdCBkcm1fbW9kZV9v YmplY3QgKnJlZikKKwkJc3RydWN0IGRybV9tb2RlX29iamVjdCAqcmVmKQogewogCWlmICghcmVm KQogCQlyZXR1cm47CiAKLQlpZiAoZHJtX3Byb3BlcnR5X3R5cGVfaXMocHJvcGVydHksIERSTV9N T0RFX1BST1BfT0JKRUNUKSB8fAotCSAgICBkcm1fcHJvcGVydHlfdHlwZV9pcyhwcm9wZXJ0eSwg RFJNX01PREVfUFJPUF9CTE9CKSkKKwlpZiAoZHJtX3Byb3BlcnR5X3R5cGVfaXMocHJvcGVydHks IERSTV9NT0RFX1BST1BfT0JKRUNUKSkgewogCQlkcm1fbW9kZV9vYmplY3RfdW5yZWZlcmVuY2Uo cmVmKTsKKwl9IGVsc2UgaWYgKGRybV9wcm9wZXJ0eV90eXBlX2lzKHByb3BlcnR5LCBEUk1fTU9E RV9QUk9QX0JMT0IpKQorCQlkcm1fcHJvcGVydHlfdW5yZWZlcmVuY2VfYmxvYihvYmpfdG9fYmxv YihyZWYpKTsKIH0KLS0gCjIuNy40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg==