From: Thomas Hellstrom Subject: [PATCH] drm: Fix an unwanted master inheritance Date: Mon, 30 Nov 2015 04:44:21 -0800 Message-ID: <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 smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 92E226E29D for ; Mon, 30 Nov 2015 04:44:51 -0800 (PST) Received: from sc9-mailhost1.vmware.com (sc9-mailhost1.vmware.com [10.113.161.71]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 9770828A0A for ; Mon, 30 Nov 2015 04:44:47 -0800 (PST) Received: from EX13-CAS-005.vmware.com (ex13-cas-005.vmware.com [10.113.191.55]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 0841018587 for ; Mon, 30 Nov 2015 04:44:48 -0800 (PST) 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 Cc: pv-drivers@vmware.com, Thomas Hellstrom , linux-graphics-maintainer@vmware.com List-Id: dri-devel@lists.freedesktop.org QSBjbGllbnQgY2FsbGluZyBkcm1TZXRNYXN0ZXIoKSB1c2luZyBhIGZpbGUgZGVzY3JpcHRvciB0 aGF0IHdhcyBvcGVuZWQKd2hlbiBhbm90aGVyIGNsaWVudCB3YXMgbWFzdGVyIHdvdWxkIGluaGVy aXQgdGhlIGxhdHRlciBjbGllbnQncyBtYXN0ZXIKb2JqZWN0IGFuZCBhbGwgaXQncyBhdXRoZW50 aWNhdGVkIGNsaWVudHMuCgpUaGlzIGlzIHVud2FudGVkIGJlaGF2aW91ciwgYW5kIHdoZW4gdGhp cyBoYXBwZW5zLCBpbnN0ZWFkIGFsbG9jYXRlIGEKYnJhbmQgbmV3IG1hc3RlciBvYmplY3QgZm9y IHRoZSBjbGllbnQgY2FsbGluZyBkcm1TZXRNYXN0ZXIoKS4KClNpZ25lZC1vZmYtYnk6IFRob21h cyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v ZHJtX2Rydi5jICB8IDEyICsrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jIHwgODAg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9k cm0vZHJtUC5oICAgICAgICAgfCAgNiArKysrCiAzIGZpbGVzIGNoYW5nZWQsIDcwIGluc2VydGlv bnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f ZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCmluZGV4IDkzNjI2MDkuLjFmMDcyYmEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9kcnYuYwpAQCAtMTYwLDYgKzE2MCwxOCBAQCBpbnQgZHJtX3NldG1hc3Rlcl9pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlnb3RvIG91dF91bmxvY2s7 CiAJfQogCisJaWYgKCFmaWxlX3ByaXYtPmFsbG93ZWRfbWFzdGVyKSB7CisJCXN0cnVjdCBkcm1f bWFzdGVyICpzYXZlZF9tYXN0ZXIgPSBmaWxlX3ByaXYtPm1hc3RlcjsKKworCQlyZXQgPSBkcm1f bmV3X3NldF9tYXN0ZXIoZGV2LCBmaWxlX3ByaXYpOworCQlpZiAocmV0KQorCQkJZmlsZV9wcml2 LT5tYXN0ZXIgPSBzYXZlZF9tYXN0ZXI7CisJCWVsc2UKKwkJCWRybV9tYXN0ZXJfcHV0KCZzYXZl ZF9tYXN0ZXIpOworCisJCWdvdG8gb3V0X3VubG9jazsKKwl9CisKIAlmaWxlX3ByaXYtPm1pbm9y LT5tYXN0ZXIgPSBkcm1fbWFzdGVyX2dldChmaWxlX3ByaXYtPm1hc3Rlcik7CiAJZmlsZV9wcml2 LT5pc19tYXN0ZXIgPSAxOwogCWlmIChkZXYtPmRyaXZlci0+bWFzdGVyX3NldCkgewpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9mb3BzLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Zv cHMuYwppbmRleCBjNTljZTRkLi40YjVjMTFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ZvcHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZvcHMuYwpAQCAtMTI2LDYgKzEy Niw1NiBAQCBzdGF0aWMgaW50IGRybV9jcHVfdmFsaWQodm9pZCkKIH0KIAogLyoqCisgKiBkcm1f bmV3X3NldF9tYXN0ZXIgLSBBbGxvY2F0ZSBhIG5ldyBtYXN0ZXIgb2JqZWN0IGFuZCBiZWNvbWUg bWFzdGVyIGZvciB0aGUKKyAqIGFzc29jaWF0ZWQgbWFzdGVyIHJlYWxtLgorICoKKyAqIEBkZXY6 IFRoZSBhc3NvY2lhdGVkIGRldmljZS4KKyAqIEBmcHJpdjogRmlsZSBwcml2YXRlIGlkZW50aWZ5 aW5nIHRoZSBjbGllbnQuCisgKgorICogVGhpcyBmdW5jdGlvbiBtdXN0IGJlIGNhbGxlZCB3aXRo IGRldjo6c3RydWN0X211dGV4IGhlbGQuIFJldHVybnMgbmVnYXRpdmUKKyAqIGVycm9yIGNvZGUg b24gZmFpbHVyZSwgemVybyBvbiBzdWNjZXNzLgorICovCitpbnQgZHJtX25ld19zZXRfbWFzdGVy KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZnByaXYpCit7CisJaW50 IHJldDsKKworCWxvY2tkZXBfYXNzZXJ0X2hlbGRfb25jZSgmZGV2LT5tYXN0ZXJfbXV0ZXgpOwor CS8qIGNyZWF0ZSBhIG5ldyBtYXN0ZXIgKi8KKwlmcHJpdi0+bWlub3ItPm1hc3RlciA9IGRybV9t YXN0ZXJfY3JlYXRlKGZwcml2LT5taW5vcik7CisJaWYgKCFmcHJpdi0+bWlub3ItPm1hc3RlcikK KwkJcmV0dXJuIC1FTk9NRU07CisKKwlmcHJpdi0+aXNfbWFzdGVyID0gMTsKKwlmcHJpdi0+YWxs b3dlZF9tYXN0ZXIgPSAxOworCisJLyogdGFrZSBhbm90aGVyIHJlZmVyZW5jZSBmb3IgdGhlIGNv cHkgaW4gdGhlIGxvY2FsIGZpbGUgcHJpdiAqLworCWZwcml2LT5tYXN0ZXIgPSBkcm1fbWFzdGVy X2dldChmcHJpdi0+bWlub3ItPm1hc3Rlcik7CisKKwlmcHJpdi0+YXV0aGVudGljYXRlZCA9IDE7 CisKKwlpZiAoZGV2LT5kcml2ZXItPm1hc3Rlcl9jcmVhdGUpIHsKKwkJcmV0ID0gZGV2LT5kcml2 ZXItPm1hc3Rlcl9jcmVhdGUoZGV2LCBmcHJpdi0+bWFzdGVyKTsKKwkJaWYgKHJldCkgeworCQkJ LyogZHJvcCBib3RoIHJlZmVyZW5jZXMgaWYgdGhpcyBmYWlscyAqLworCQkJZHJtX21hc3Rlcl9w dXQoJmZwcml2LT5taW5vci0+bWFzdGVyKTsKKwkJCWRybV9tYXN0ZXJfcHV0KCZmcHJpdi0+bWFz dGVyKTsKKwkJCXJldHVybiByZXQ7CisJCX0KKwl9CisJaWYgKGRldi0+ZHJpdmVyLT5tYXN0ZXJf c2V0KSB7CisJCXJldCA9IGRldi0+ZHJpdmVyLT5tYXN0ZXJfc2V0KGRldiwgZnByaXYsIHRydWUp OworCQlpZiAocmV0KSB7CisJCQkvKiBkcm9wIGJvdGggcmVmZXJlbmNlcyBpZiB0aGlzIGZhaWxz ICovCisJCQlkcm1fbWFzdGVyX3B1dCgmZnByaXYtPm1pbm9yLT5tYXN0ZXIpOworCQkJZHJtX21h c3Rlcl9wdXQoJmZwcml2LT5tYXN0ZXIpOworCQkJcmV0dXJuIHJldDsKKwkJfQorCX0KKworCXJl dHVybiAwOworfQorCisvKioKICAqIENhbGxlZCB3aGVuZXZlciBhIHByb2Nlc3Mgb3BlbnMgL2Rl di9kcm0uCiAgKgogICogXHBhcmFtIGZpbHAgZmlsZSBwb2ludGVyLgpAQCAtMTg5LDM1ICsyMzks OSBAQCBzdGF0aWMgaW50IGRybV9vcGVuX2hlbHBlcihzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0 IGRybV9taW5vciAqbWlub3IpCiAJbXV0ZXhfbG9jaygmZGV2LT5tYXN0ZXJfbXV0ZXgpOwogCWlm IChkcm1faXNfcHJpbWFyeV9jbGllbnQocHJpdikgJiYgIXByaXYtPm1pbm9yLT5tYXN0ZXIpIHsK IAkJLyogY3JlYXRlIGEgbmV3IG1hc3RlciAqLwotCQlwcml2LT5taW5vci0+bWFzdGVyID0gZHJt X21hc3Rlcl9jcmVhdGUocHJpdi0+bWlub3IpOwotCQlpZiAoIXByaXYtPm1pbm9yLT5tYXN0ZXIp IHsKLQkJCXJldCA9IC1FTk9NRU07CisJCXJldCA9IGRybV9uZXdfc2V0X21hc3RlcihkZXYsIHBy aXYpOworCQlpZiAocmV0KQogCQkJZ290byBvdXRfY2xvc2U7Ci0JCX0KLQotCQlwcml2LT5pc19t YXN0ZXIgPSAxOwotCQkvKiB0YWtlIGFub3RoZXIgcmVmZXJlbmNlIGZvciB0aGUgY29weSBpbiB0 aGUgbG9jYWwgZmlsZSBwcml2ICovCi0JCXByaXYtPm1hc3RlciA9IGRybV9tYXN0ZXJfZ2V0KHBy aXYtPm1pbm9yLT5tYXN0ZXIpOwotCQlwcml2LT5hdXRoZW50aWNhdGVkID0gMTsKLQotCQlpZiAo ZGV2LT5kcml2ZXItPm1hc3Rlcl9jcmVhdGUpIHsKLQkJCXJldCA9IGRldi0+ZHJpdmVyLT5tYXN0 ZXJfY3JlYXRlKGRldiwgcHJpdi0+bWFzdGVyKTsKLQkJCWlmIChyZXQpIHsKLQkJCQkvKiBkcm9w IGJvdGggcmVmZXJlbmNlcyBpZiB0aGlzIGZhaWxzICovCi0JCQkJZHJtX21hc3Rlcl9wdXQoJnBy aXYtPm1pbm9yLT5tYXN0ZXIpOwotCQkJCWRybV9tYXN0ZXJfcHV0KCZwcml2LT5tYXN0ZXIpOwot CQkJCWdvdG8gb3V0X2Nsb3NlOwotCQkJfQotCQl9Ci0JCWlmIChkZXYtPmRyaXZlci0+bWFzdGVy X3NldCkgewotCQkJcmV0ID0gZGV2LT5kcml2ZXItPm1hc3Rlcl9zZXQoZGV2LCBwcml2LCB0cnVl KTsKLQkJCWlmIChyZXQpIHsKLQkJCQkvKiBkcm9wIGJvdGggcmVmZXJlbmNlcyBpZiB0aGlzIGZh aWxzICovCi0JCQkJZHJtX21hc3Rlcl9wdXQoJnByaXYtPm1pbm9yLT5tYXN0ZXIpOwotCQkJCWRy bV9tYXN0ZXJfcHV0KCZwcml2LT5tYXN0ZXIpOwotCQkJCWdvdG8gb3V0X2Nsb3NlOwotCQkJfQot CQl9CiAJfSBlbHNlIGlmIChkcm1faXNfcHJpbWFyeV9jbGllbnQocHJpdikpIHsKIAkJLyogZ2V0 IGEgcmVmZXJlbmNlIHRvIHRoZSBtYXN0ZXIgKi8KIAkJcHJpdi0+bWFzdGVyID0gZHJtX21hc3Rl cl9nZXQocHJpdi0+bWlub3ItPm1hc3Rlcik7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1Q LmggYi9pbmNsdWRlL2RybS9kcm1QLmgKaW5kZXggMGI5MjFhZS4uNTY2YjU5ZSAxMDA2NDQKLS0t IGEvaW5jbHVkZS9kcm0vZHJtUC5oCisrKyBiL2luY2x1ZGUvZHJtL2RybVAuaApAQCAtMzA5LDYg KzMwOSwxMSBAQCBzdHJ1Y3QgZHJtX2ZpbGUgewogCXVuc2lnbmVkIHVuaXZlcnNhbF9wbGFuZXM6 MTsKIAkvKiB0cnVlIGlmIGNsaWVudCB1bmRlcnN0YW5kcyBhdG9taWMgcHJvcGVydGllcyAqLwog CXVuc2lnbmVkIGF0b21pYzoxOworCS8qCisJICogVGhpcyBjbGllbnQgaXMgYWxsb3dlZCB0byBn YWluIG1hc3RlciBwcml2aWxlZ2VzIGZvciBAbWFzdGVyLgorCSAqIFByb3RlY3RlZCBieSBzdHJ1 Y3QgZHJtX2RldmljZTo6bWFzdGVyX211dGV4LgorCSAqLworCXVuc2lnbmVkIGFsbG93ZWRfbWFz dGVyOjE7CiAKIAlzdHJ1Y3QgcGlkICpwaWQ7CiAJa3VpZF90IHVpZDsKQEAgLTkxMCw2ICs5MTUs NyBAQCBleHRlcm4gaW50IGRybV9vcGVuKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxl ICpmaWxwKTsKIGV4dGVybiBzc2l6ZV90IGRybV9yZWFkKHN0cnVjdCBmaWxlICpmaWxwLCBjaGFy IF9fdXNlciAqYnVmZmVyLAogCQkJc2l6ZV90IGNvdW50LCBsb2ZmX3QgKm9mZnNldCk7CiBleHRl cm4gaW50IGRybV9yZWxlYXNlKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxw KTsKK2V4dGVybiBpbnQgZHJtX25ld19zZXRfbWFzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBkcm1fZmlsZSAqZnByaXYpOwogCiAJCQkJLyogTWFwcGluZyBzdXBwb3J0IChkcm1f dm0uaCkgKi8KIGV4dGVybiB1bnNpZ25lZCBpbnQgZHJtX3BvbGwoc3RydWN0IGZpbGUgKmZpbHAs IHN0cnVjdCBwb2xsX3RhYmxlX3N0cnVjdCAqd2FpdCk7Ci0tIAoyLjUuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK