From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/syncobj: Stop reusing the same struct file for all syncobj -> fd Date: Tue, 19 Dec 2017 13:28:49 +0100 Message-ID: <20171219122849.GF26573@phenom.ffwll.local> References: <20171219113012.32391-1-airlied@gmail.com> <20171219120700.27797-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20171219120700.27797-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: Dave Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBEZWMgMTksIDIwMTcgYXQgMTI6MDc6MDBQTSArMDAwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IFRoZSB2ayBjdHMgdGVzdDoKPiBkRVFQLVZLLmFwaS5leHRlcm5hbC5zZW1hcGhvcmUu b3BhcXVlX2ZkLmV4cG9ydF9tdWx0aXBsZV90aW1lc190ZW1wb3JhcnkKPiAKPiB0cmlnZ2VycyBh IGxvdCBvZgo+IFZGUzogQ2xvc2U6IGZpbGUgY291bnQgaXMgMAo+IAo+IERhdmUgcG9pbnRlZCBv dXQgdGhhdCBjbGVhcmluZyB0aGUgc3luY29iai0+ZmlsZSBmcm9tCj4gZHJtX3N5bmNvYmpfZmls ZV9yZWxlYXNlKCkgd2FzIHN1ZmZpY2llbnQgdG8gc2lsZW5jZSB0aGUgdGVzdCwgYnV0IHRoYXQK PiBvcGVucyBhIGNhbiBvZiB3b3JtIHNpbmNlIHdlIGFzc3VtZWQgdGhhdCB0aGUgc3luY29iai0+ ZmlsZSB3YXMgbmV2ZXIKPiB1bnNldC4gU3RvcCB0cnlpbmcgdG8gcmV1c2UgdGhlIHNhbWUgc3Ry dWN0IGZpbGUgZm9yIGV2ZXJ5IGZkIHBvaW50aW5nCj4gdG8gdGhlIGRybV9zeW5jb2JqLCBhbmQg YWxsb2NhdGUgb25lIGZpbGUgZm9yIGVhY2ggZmQgaW5zdGVhZC4KCkl0J3Mgd29yc2U6IHN5bmNv YmotPmZpbGUgcG9pbnRzIHRvIGEgcmVmY291bnRlZCB0aGluZywgYW5kIHdlIG5ldmVyIGRpZApn cmFiIGEgcmVmZXJlbmNlIGZvciBpdC4gVGhpcyBpcyBhIGNsYXNzaWMgdXNlLWFmdGVyLWZyZWUg dGhpbmcgOi0pCgo+IFJlcG9ydGVkLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29t Pgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr Pgo+IENjOiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgoKQXNzdW1pbmcgaXQgZG9l c24ndCBicmVhayB0aGUgdmsgdGVzdHN1aXRlOgoKUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIg PGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CgpBbHNvIGFuIGlndCBmb3IgdGhpcyB3b3VsZCBiZSBu aWNlOgoxLiBjcmVhdGUgc3luY29iagoyLiBleHBvcnQgdG8gZmQKMy4gY2xvc2UgZmQsIG5vdGUg dGhhdCBub3cgc3luY29iai0+ZmlsZSBwb2ludHMgdG8gYSBmcmVlZCBzdHJ1Y3QgZmlsZQo0LiBy ZWV4cG9ydCAtPiBCT09NCgpDaGVlcnMsIERhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJt L2RybV9zeW5jb2JqLmMgfCA3NCArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCj4gIGluY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmggICAgIHwgIDQgLS0tCj4gIDIgZmls ZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgNTIgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9zeW5jb2JqLmMKPiBpbmRleCAxMzE2OTU5MTVhY2QuLjBjY2EyZTc5MjcxOSAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fc3luY29iai5jCj4gQEAgLTM5OSwyMyArMzk5LDYgQEAgc3RhdGljIGNvbnN0IHN0cnVj dCBmaWxlX29wZXJhdGlvbnMgZHJtX3N5bmNvYmpfZmlsZV9mb3BzID0gewo+ICAJLnJlbGVhc2Ug PSBkcm1fc3luY29ial9maWxlX3JlbGVhc2UsCj4gIH07Cj4gIAo+IC1zdGF0aWMgaW50IGRybV9z eW5jb2JqX2FsbG9jX2ZpbGUoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqKQo+IC17Cj4gLQlz dHJ1Y3QgZmlsZSAqZmlsZSA9IGFub25faW5vZGVfZ2V0ZmlsZSgic3luY29ial9maWxlIiwKPiAt CQkJCQkgICAgICAgJmRybV9zeW5jb2JqX2ZpbGVfZm9wcywKPiAtCQkJCQkgICAgICAgc3luY29i aiwgMCk7Cj4gLQlpZiAoSVNfRVJSKGZpbGUpKQo+IC0JCXJldHVybiBQVFJfRVJSKGZpbGUpOwo+ IC0KPiAtCWRybV9zeW5jb2JqX2dldChzeW5jb2JqKTsKPiAtCWlmIChjbXB4Y2hnKCZzeW5jb2Jq LT5maWxlLCBOVUxMLCBmaWxlKSkgewo+IC0JCS8qIGxvc3QgdGhlIHJhY2UgKi8KPiAtCQlmcHV0 KGZpbGUpOwo+IC0JfQo+IC0KPiAtCXJldHVybiAwOwo+IC19Cj4gLQo+ICAvKioKPiAgICogZHJt X3N5bmNvYmpfZ2V0X2ZkIC0gZ2V0IGEgZmlsZSBkZXNjcmlwdG9yIGZyb20gYSBzeW5jb2JqCj4g ICAqIEBzeW5jb2JqOiBTeW5jIG9iamVjdCB0byBleHBvcnQKPiBAQCAtNDI3LDIxICs0MTAsMjQg QEAgc3RhdGljIGludCBkcm1fc3luY29ial9hbGxvY19maWxlKHN0cnVjdCBkcm1fc3luY29iaiAq c3luY29iaikKPiAgICovCj4gIGludCBkcm1fc3luY29ial9nZXRfZmQoc3RydWN0IGRybV9zeW5j b2JqICpzeW5jb2JqLCBpbnQgKnBfZmQpCj4gIHsKPiAtCWludCByZXQ7Cj4gKwlzdHJ1Y3QgZmls ZSAqZmlsZTsKPiAgCWludCBmZDsKPiAgCj4gIAlmZCA9IGdldF91bnVzZWRfZmRfZmxhZ3MoT19D TE9FWEVDKTsKPiAgCWlmIChmZCA8IDApCj4gIAkJcmV0dXJuIGZkOwo+ICAKPiAtCWlmICghc3lu Y29iai0+ZmlsZSkgewo+IC0JCXJldCA9IGRybV9zeW5jb2JqX2FsbG9jX2ZpbGUoc3luY29iaik7 Cj4gLQkJaWYgKHJldCkgewo+IC0JCQlwdXRfdW51c2VkX2ZkKGZkKTsKPiAtCQkJcmV0dXJuIHJl dDsKPiAtCQl9Cj4gKwlmaWxlID0gYW5vbl9pbm9kZV9nZXRmaWxlKCJzeW5jb2JqX2ZpbGUiLAo+ ICsJCQkJICAmZHJtX3N5bmNvYmpfZmlsZV9mb3BzLAo+ICsJCQkJICBzeW5jb2JqLCAwKTsKPiAr CWlmIChJU19FUlIoZmlsZSkpIHsKPiArCQlwdXRfdW51c2VkX2ZkKGZkKTsKPiArCQlyZXR1cm4g UFRSX0VSUihmaWxlKTsKPiAgCX0KPiAtCWZkX2luc3RhbGwoZmQsIHN5bmNvYmotPmZpbGUpOwo+ ICsKPiArCWRybV9zeW5jb2JqX2dldChzeW5jb2JqKTsKPiArCWZkX2luc3RhbGwoZmQsIGZpbGUp Owo+ICsKPiAgCSpwX2ZkID0gZmQ7Cj4gIAlyZXR1cm4gMDsKPiAgfQo+IEBAIC00NjEsMzEgKzQ0 NywyNCBAQCBzdGF0aWMgaW50IGRybV9zeW5jb2JqX2hhbmRsZV90b19mZChzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGVfcHJpdmF0ZSwKPiAgCXJldHVybiByZXQ7Cj4gIH0KPiAgCj4gLXN0YXRpYyBzdHJ1 Y3QgZHJtX3N5bmNvYmogKmRybV9zeW5jb2JqX2ZkZ2V0KGludCBmZCkKPiAtewo+IC0Jc3RydWN0 IGZpbGUgKmZpbGUgPSBmZ2V0KGZkKTsKPiAtCj4gLQlpZiAoIWZpbGUpCj4gLQkJcmV0dXJuIE5V TEw7Cj4gLQlpZiAoZmlsZS0+Zl9vcCAhPSAmZHJtX3N5bmNvYmpfZmlsZV9mb3BzKQo+IC0JCWdv dG8gZXJyOwo+IC0KPiAtCXJldHVybiBmaWxlLT5wcml2YXRlX2RhdGE7Cj4gLWVycjoKPiAtCWZw dXQoZmlsZSk7Cj4gLQlyZXR1cm4gTlVMTDsKPiAtfTsKPiAtCj4gIHN0YXRpYyBpbnQgZHJtX3N5 bmNvYmpfZmRfdG9faGFuZGxlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2YXRlLAo+ICAJCQkJ ICAgIGludCBmZCwgdTMyICpoYW5kbGUpCj4gIHsKPiAtCXN0cnVjdCBkcm1fc3luY29iaiAqc3lu Y29iaiA9IGRybV9zeW5jb2JqX2ZkZ2V0KGZkKTsKPiArCXN0cnVjdCBkcm1fc3luY29iaiAqc3lu Y29iajsKPiArCXN0cnVjdCBmaWxlICpmaWxlOwo+ICAJaW50IHJldDsKPiAgCj4gLQlpZiAoIXN5 bmNvYmopCj4gKwlmaWxlID0gZmdldChmZCk7Cj4gKwlpZiAoIWZpbGUpCj4gIAkJcmV0dXJuIC1F SU5WQUw7Cj4gIAo+ICsJaWYgKGZpbGUtPmZfb3AgIT0gJmRybV9zeW5jb2JqX2ZpbGVfZm9wcykg ewo+ICsJCWZwdXQoZmlsZSk7Cj4gKwkJcmV0dXJuIC1FSU5WQUw7Cj4gKwl9Cj4gKwo+ICAJLyog dGFrZSBhIHJlZmVyZW5jZSB0byBwdXQgaW4gdGhlIGlkciAqLwo+ICsJc3luY29iaiA9IGZpbGUt PnByaXZhdGVfZGF0YTsKPiAgCWRybV9zeW5jb2JqX2dldChzeW5jb2JqKTsKPiAgCj4gIAlpZHJf cHJlbG9hZChHRlBfS0VSTkVMKTsKPiBAQCAtNDk0LDEyICs0NzMsMTEgQEAgc3RhdGljIGludCBk cm1fc3luY29ial9mZF90b19oYW5kbGUoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXZhdGUsCj4g IAlzcGluX3VubG9jaygmZmlsZV9wcml2YXRlLT5zeW5jb2JqX3RhYmxlX2xvY2spOwo+ICAJaWRy X3ByZWxvYWRfZW5kKCk7Cj4gIAo+IC0JaWYgKHJldCA8IDApIHsKPiAtCQlmcHV0KHN5bmNvYmot PmZpbGUpOwo+IC0JCXJldHVybiByZXQ7Cj4gLQl9Cj4gLQkqaGFuZGxlID0gcmV0Owo+IC0JcmV0 dXJuIDA7Cj4gKwlpZiAocmV0ID4gMCkKPiArCQkqaGFuZGxlID0gcmV0Owo+ICsKPiArCWZwdXQo ZmlsZSk7Cj4gKwlyZXR1cm4gcmV0Owo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGRybV9zeW5jb2Jq X2ltcG9ydF9zeW5jX2ZpbGVfZmVuY2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXZhdGUsCj4g ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmggYi9pbmNsdWRlL2RybS9kcm1f c3luY29iai5oCj4gaW5kZXggMzk4MDYwMjQ3MmMwLi5jYTViZjdkMTJkMGIgMTAwNjQ0Cj4gLS0t IGEvaW5jbHVkZS9kcm0vZHJtX3N5bmNvYmouaAo+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9zeW5j b2JqLmgKPiBAQCAtNTYsMTAgKzU2LDYgQEAgc3RydWN0IGRybV9zeW5jb2JqIHsKPiAgCSAqIEBs b2NrOiBQcm90ZWN0cyAmY2JfbGlzdCBhbmQgd3JpdGUtbG9ja3MgJmZlbmNlLgo+ICAJICovCj4g IAlzcGlubG9ja190IGxvY2s7Cj4gLQkvKioKPiAtCSAqIEBmaWxlOiBBIGZpbGUgYmFja2luZyBm b3IgdGhpcyBzeW5jb2JqLgo+IC0JICovCj4gLQlzdHJ1Y3QgZmlsZSAqZmlsZTsKPiAgfTsKPiAg Cj4gIHR5cGVkZWYgdm9pZCAoKmRybV9zeW5jb2JqX2Z1bmNfdCkoc3RydWN0IGRybV9zeW5jb2Jq ICpzeW5jb2JqLAo+IC0tIAo+IDIuMTUuMQo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5n aW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=