From: Daniel Vetter Subject: Re: [PATCH] drm: Fix an unwanted master inheritance Date: Mon, 30 Nov 2015 16:00:19 +0100 Message-ID: <20151130150019.GW17050@phenom.ffwll.local> References: <1448887461-3175-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 972736E5E8 for ; Mon, 30 Nov 2015 07:00:23 -0800 (PST) Received: by wmww144 with SMTP id w144so133166371wmw.1 for ; Mon, 30 Nov 2015 07:00:22 -0800 (PST) Content-Disposition: inline In-Reply-To: <1448887461-3175-1-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Thomas Hellstrom Cc: pv-drivers@vmware.com, linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBOb3YgMzAsIDIwMTUgYXQgMDQ6NDQ6MjFBTSAtMDgwMCwgVGhvbWFzIEhlbGxzdHJv bSB3cm90ZToKPiBBIGNsaWVudCBjYWxsaW5nIGRybVNldE1hc3RlcigpIHVzaW5nIGEgZmlsZSBk ZXNjcmlwdG9yIHRoYXQgd2FzIG9wZW5lZAo+IHdoZW4gYW5vdGhlciBjbGllbnQgd2FzIG1hc3Rl ciB3b3VsZCBpbmhlcml0IHRoZSBsYXR0ZXIgY2xpZW50J3MgbWFzdGVyCj4gb2JqZWN0IGFuZCBh bGwgaXQncyBhdXRoZW50aWNhdGVkIGNsaWVudHMuCj4gCj4gVGhpcyBpcyB1bndhbnRlZCBiZWhh dmlvdXIsIGFuZCB3aGVuIHRoaXMgaGFwcGVucywgaW5zdGVhZCBhbGxvY2F0ZSBhCj4gYnJhbmQg bmV3IG1hc3RlciBvYmplY3QgZm9yIHRoZSBjbGllbnQgY2FsbGluZyBkcm1TZXRNYXN0ZXIoKS4K PiAKPiBTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgSGVsbHN0cm9tIDx0aGVsbHN0cm9tQHZtd2FyZS5j b20+CgpJbW8gbWFrZXMgc2Vuc2UuIEl0IHdvdWxkIGJlIGdyZWF0IHRvIGhhdmUgYSB0ZXN0Y2Fz ZSBmb3IgdGhpcywgYW5kIGZvcgpub24ta21zIHN0dWZmIGlndCBub3cgaGFzIHN1cHBvcnQgZm9y IGdlbmVyaWMgdGVzdGNhc2VzIHRoYXQgY2FuIGJlIHJ1biBvbgphbnkgZHJpdmVyLiBTZWUgZm9y IGV4YW1wbGUgaW50ZWwtZ3B1LXRvb2xzL3Rlc3RzL2NvcmVfZ2V0X2F1dGhfY2xpZW50LmMuCgpJ IG9yIERhbmllbCBTdG9uZSBjYW4gaGVscCBvdXQgKG9uIGlyYyBvciBtYWlsKSB3aXRoIHRoYXQu Ci1EYW5pZWwKCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMgIHwgMTIgKysrKysr Kwo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZvcHMuYyB8IDgwICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KPiAgaW5jbHVkZS9kcm0vZHJtUC5oICAgICAgICAg fCAgNiArKysrCj4gIDMgZmlsZXMgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRp b25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCj4gaW5kZXggOTM2MjYwOS4uMWYwNzJiYSAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9kcnYuYwo+IEBAIC0xNjAsNiArMTYwLDE4IEBAIGludCBkcm1fc2V0bWFzdGVyX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gIAkJZ290byBvdXRfdW5sb2NrOwo+ ICAJfQo+ICAKPiArCWlmICghZmlsZV9wcml2LT5hbGxvd2VkX21hc3Rlcikgewo+ICsJCXN0cnVj dCBkcm1fbWFzdGVyICpzYXZlZF9tYXN0ZXIgPSBmaWxlX3ByaXYtPm1hc3RlcjsKPiArCj4gKwkJ cmV0ID0gZHJtX25ld19zZXRfbWFzdGVyKGRldiwgZmlsZV9wcml2KTsKPiArCQlpZiAocmV0KQo+ ICsJCQlmaWxlX3ByaXYtPm1hc3RlciA9IHNhdmVkX21hc3RlcjsKPiArCQllbHNlCj4gKwkJCWRy bV9tYXN0ZXJfcHV0KCZzYXZlZF9tYXN0ZXIpOwo+ICsKPiArCQlnb3RvIG91dF91bmxvY2s7Cj4g Kwl9Cj4gKwo+ICAJZmlsZV9wcml2LT5taW5vci0+bWFzdGVyID0gZHJtX21hc3Rlcl9nZXQoZmls ZV9wcml2LT5tYXN0ZXIpOwo+ICAJZmlsZV9wcml2LT5pc19tYXN0ZXIgPSAxOwo+ICAJaWYgKGRl di0+ZHJpdmVyLT5tYXN0ZXJfc2V0KSB7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fZm9wcy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mb3BzLmMKPiBpbmRleCBjNTljZTRkLi40 YjVjMTFjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9mb3BzLmMKPiBAQCAtMTI2LDYgKzEyNiw1NiBAQCBzdGF0aWMg aW50IGRybV9jcHVfdmFsaWQodm9pZCkKPiAgfQo+ICAKPiAgLyoqCj4gKyAqIGRybV9uZXdfc2V0 X21hc3RlciAtIEFsbG9jYXRlIGEgbmV3IG1hc3RlciBvYmplY3QgYW5kIGJlY29tZSBtYXN0ZXIg Zm9yIHRoZQo+ICsgKiBhc3NvY2lhdGVkIG1hc3RlciByZWFsbS4KPiArICoKPiArICogQGRldjog VGhlIGFzc29jaWF0ZWQgZGV2aWNlLgo+ICsgKiBAZnByaXY6IEZpbGUgcHJpdmF0ZSBpZGVudGlm eWluZyB0aGUgY2xpZW50Lgo+ICsgKgo+ICsgKiBUaGlzIGZ1bmN0aW9uIG11c3QgYmUgY2FsbGVk IHdpdGggZGV2OjpzdHJ1Y3RfbXV0ZXggaGVsZC4gUmV0dXJucyBuZWdhdGl2ZQo+ICsgKiBlcnJv ciBjb2RlIG9uIGZhaWx1cmUsIHplcm8gb24gc3VjY2Vzcy4KPiArICovCj4gK2ludCBkcm1fbmV3 X3NldF9tYXN0ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmcHJp dikKPiArewo+ICsJaW50IHJldDsKPiArCj4gKwlsb2NrZGVwX2Fzc2VydF9oZWxkX29uY2UoJmRl di0+bWFzdGVyX211dGV4KTsKPiArCS8qIGNyZWF0ZSBhIG5ldyBtYXN0ZXIgKi8KPiArCWZwcml2 LT5taW5vci0+bWFzdGVyID0gZHJtX21hc3Rlcl9jcmVhdGUoZnByaXYtPm1pbm9yKTsKPiArCWlm ICghZnByaXYtPm1pbm9yLT5tYXN0ZXIpCj4gKwkJcmV0dXJuIC1FTk9NRU07Cj4gKwo+ICsJZnBy aXYtPmlzX21hc3RlciA9IDE7Cj4gKwlmcHJpdi0+YWxsb3dlZF9tYXN0ZXIgPSAxOwo+ICsKPiAr CS8qIHRha2UgYW5vdGhlciByZWZlcmVuY2UgZm9yIHRoZSBjb3B5IGluIHRoZSBsb2NhbCBmaWxl IHByaXYgKi8KPiArCWZwcml2LT5tYXN0ZXIgPSBkcm1fbWFzdGVyX2dldChmcHJpdi0+bWlub3It Pm1hc3Rlcik7Cj4gKwo+ICsJZnByaXYtPmF1dGhlbnRpY2F0ZWQgPSAxOwo+ICsKPiArCWlmIChk ZXYtPmRyaXZlci0+bWFzdGVyX2NyZWF0ZSkgewo+ICsJCXJldCA9IGRldi0+ZHJpdmVyLT5tYXN0 ZXJfY3JlYXRlKGRldiwgZnByaXYtPm1hc3Rlcik7Cj4gKwkJaWYgKHJldCkgewo+ICsJCQkvKiBk cm9wIGJvdGggcmVmZXJlbmNlcyBpZiB0aGlzIGZhaWxzICovCj4gKwkJCWRybV9tYXN0ZXJfcHV0 KCZmcHJpdi0+bWlub3ItPm1hc3Rlcik7Cj4gKwkJCWRybV9tYXN0ZXJfcHV0KCZmcHJpdi0+bWFz dGVyKTsKPiArCQkJcmV0dXJuIHJldDsKPiArCQl9Cj4gKwl9Cj4gKwlpZiAoZGV2LT5kcml2ZXIt Pm1hc3Rlcl9zZXQpIHsKPiArCQlyZXQgPSBkZXYtPmRyaXZlci0+bWFzdGVyX3NldChkZXYsIGZw cml2LCB0cnVlKTsKPiArCQlpZiAocmV0KSB7Cj4gKwkJCS8qIGRyb3AgYm90aCByZWZlcmVuY2Vz IGlmIHRoaXMgZmFpbHMgKi8KPiArCQkJZHJtX21hc3Rlcl9wdXQoJmZwcml2LT5taW5vci0+bWFz dGVyKTsKPiArCQkJZHJtX21hc3Rlcl9wdXQoJmZwcml2LT5tYXN0ZXIpOwo+ICsJCQlyZXR1cm4g cmV0Owo+ICsJCX0KPiArCX0KPiArCj4gKwlyZXR1cm4gMDsKPiArfQo+ICsKPiArLyoqCj4gICAq IENhbGxlZCB3aGVuZXZlciBhIHByb2Nlc3Mgb3BlbnMgL2Rldi9kcm0uCj4gICAqCj4gICAqIFxw YXJhbSBmaWxwIGZpbGUgcG9pbnRlci4KPiBAQCAtMTg5LDM1ICsyMzksOSBAQCBzdGF0aWMgaW50 IGRybV9vcGVuX2hlbHBlcihzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0IGRybV9taW5vciAqbWlu b3IpCj4gIAltdXRleF9sb2NrKCZkZXYtPm1hc3Rlcl9tdXRleCk7Cj4gIAlpZiAoZHJtX2lzX3By aW1hcnlfY2xpZW50KHByaXYpICYmICFwcml2LT5taW5vci0+bWFzdGVyKSB7Cj4gIAkJLyogY3Jl YXRlIGEgbmV3IG1hc3RlciAqLwo+IC0JCXByaXYtPm1pbm9yLT5tYXN0ZXIgPSBkcm1fbWFzdGVy X2NyZWF0ZShwcml2LT5taW5vcik7Cj4gLQkJaWYgKCFwcml2LT5taW5vci0+bWFzdGVyKSB7Cj4g LQkJCXJldCA9IC1FTk9NRU07Cj4gKwkJcmV0ID0gZHJtX25ld19zZXRfbWFzdGVyKGRldiwgcHJp dik7Cj4gKwkJaWYgKHJldCkKPiAgCQkJZ290byBvdXRfY2xvc2U7Cj4gLQkJfQo+IC0KPiAtCQlw cml2LT5pc19tYXN0ZXIgPSAxOwo+IC0JCS8qIHRha2UgYW5vdGhlciByZWZlcmVuY2UgZm9yIHRo ZSBjb3B5IGluIHRoZSBsb2NhbCBmaWxlIHByaXYgKi8KPiAtCQlwcml2LT5tYXN0ZXIgPSBkcm1f bWFzdGVyX2dldChwcml2LT5taW5vci0+bWFzdGVyKTsKPiAtCQlwcml2LT5hdXRoZW50aWNhdGVk ID0gMTsKPiAtCj4gLQkJaWYgKGRldi0+ZHJpdmVyLT5tYXN0ZXJfY3JlYXRlKSB7Cj4gLQkJCXJl dCA9IGRldi0+ZHJpdmVyLT5tYXN0ZXJfY3JlYXRlKGRldiwgcHJpdi0+bWFzdGVyKTsKPiAtCQkJ aWYgKHJldCkgewo+IC0JCQkJLyogZHJvcCBib3RoIHJlZmVyZW5jZXMgaWYgdGhpcyBmYWlscyAq Lwo+IC0JCQkJZHJtX21hc3Rlcl9wdXQoJnByaXYtPm1pbm9yLT5tYXN0ZXIpOwo+IC0JCQkJZHJt X21hc3Rlcl9wdXQoJnByaXYtPm1hc3Rlcik7Cj4gLQkJCQlnb3RvIG91dF9jbG9zZTsKPiAtCQkJ fQo+IC0JCX0KPiAtCQlpZiAoZGV2LT5kcml2ZXItPm1hc3Rlcl9zZXQpIHsKPiAtCQkJcmV0ID0g ZGV2LT5kcml2ZXItPm1hc3Rlcl9zZXQoZGV2LCBwcml2LCB0cnVlKTsKPiAtCQkJaWYgKHJldCkg ewo+IC0JCQkJLyogZHJvcCBib3RoIHJlZmVyZW5jZXMgaWYgdGhpcyBmYWlscyAqLwo+IC0JCQkJ ZHJtX21hc3Rlcl9wdXQoJnByaXYtPm1pbm9yLT5tYXN0ZXIpOwo+IC0JCQkJZHJtX21hc3Rlcl9w dXQoJnByaXYtPm1hc3Rlcik7Cj4gLQkJCQlnb3RvIG91dF9jbG9zZTsKPiAtCQkJfQo+IC0JCX0K PiAgCX0gZWxzZSBpZiAoZHJtX2lzX3ByaW1hcnlfY2xpZW50KHByaXYpKSB7Cj4gIAkJLyogZ2V0 IGEgcmVmZXJlbmNlIHRvIHRoZSBtYXN0ZXIgKi8KPiAgCQlwcml2LT5tYXN0ZXIgPSBkcm1fbWFz dGVyX2dldChwcml2LT5taW5vci0+bWFzdGVyKTsKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0v ZHJtUC5oIGIvaW5jbHVkZS9kcm0vZHJtUC5oCj4gaW5kZXggMGI5MjFhZS4uNTY2YjU5ZSAxMDA2 NDQKPiAtLS0gYS9pbmNsdWRlL2RybS9kcm1QLmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1QLmgK PiBAQCAtMzA5LDYgKzMwOSwxMSBAQCBzdHJ1Y3QgZHJtX2ZpbGUgewo+ICAJdW5zaWduZWQgdW5p dmVyc2FsX3BsYW5lczoxOwo+ICAJLyogdHJ1ZSBpZiBjbGllbnQgdW5kZXJzdGFuZHMgYXRvbWlj IHByb3BlcnRpZXMgKi8KPiAgCXVuc2lnbmVkIGF0b21pYzoxOwo+ICsJLyoKPiArCSAqIFRoaXMg Y2xpZW50IGlzIGFsbG93ZWQgdG8gZ2FpbiBtYXN0ZXIgcHJpdmlsZWdlcyBmb3IgQG1hc3Rlci4K PiArCSAqIFByb3RlY3RlZCBieSBzdHJ1Y3QgZHJtX2RldmljZTo6bWFzdGVyX211dGV4Lgo+ICsJ ICovCj4gKwl1bnNpZ25lZCBhbGxvd2VkX21hc3RlcjoxOwo+ICAKPiAgCXN0cnVjdCBwaWQgKnBp ZDsKPiAgCWt1aWRfdCB1aWQ7Cj4gQEAgLTkxMCw2ICs5MTUsNyBAQCBleHRlcm4gaW50IGRybV9v cGVuKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxwKTsKPiAgZXh0ZXJuIHNz aXplX3QgZHJtX3JlYWQoc3RydWN0IGZpbGUgKmZpbHAsIGNoYXIgX191c2VyICpidWZmZXIsCj4g IAkJCXNpemVfdCBjb3VudCwgbG9mZl90ICpvZmZzZXQpOwo+ICBleHRlcm4gaW50IGRybV9yZWxl YXNlKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxwKTsKPiArZXh0ZXJuIGlu dCBkcm1fbmV3X3NldF9tYXN0ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9m aWxlICpmcHJpdik7Cj4gIAo+ICAJCQkJLyogTWFwcGluZyBzdXBwb3J0IChkcm1fdm0uaCkgKi8K PiAgZXh0ZXJuIHVuc2lnbmVkIGludCBkcm1fcG9sbChzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0 IHBvbGxfdGFibGVfc3RydWN0ICp3YWl0KTsKPiAtLSAKPiAyLjUuMAo+IAo+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcg bGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKRGFuaWVsIFZldHRl cgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwu Y2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK