From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 3/3] drm/udl: move to embedding drm device inside udl device. Date: Fri, 5 Apr 2019 13:17:15 +1000 Message-ID: <20190405031715.5959-4-airlied@gmail.com> References: <20190405031715.5959-1-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9FAC86EA0E for ; Fri, 5 Apr 2019 03:17:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A6A530FE5BD for ; Fri, 5 Apr 2019 03:17:22 +0000 (UTC) Received: from tyrion-bne-redhat-com.redhat.com (vpn2-54-82.bne.redhat.com [10.64.54.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id A866E86E0E for ; Fri, 5 Apr 2019 03:17:21 +0000 (UTC) In-Reply-To: <20190405031715.5959-1-airlied@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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClRoaXMgc2hvdWxkIGhlbHAg d2l0aCBzb21lIG9mIHRoZSBsaWZldGltZSBpc3N1ZXMsIGFuZCBtb3ZlIHVzIGF3YXkKZnJvbSBs b2FkL3VubG9hZC4KClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZHJ2LmMgIHwgNTYgKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZHJ2LmggIHwg IDkgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9mYi5jICAgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL3VkbC91ZGxfbWFpbi5jIHwgMjMgKystLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hh bmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3VkbC91ZGxfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYu YwppbmRleCBmZjQ3Zjg5MGU2YWQuLjE1YzBlM2VlYWYzYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3VkbC91ZGxfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZHJ2LmMK QEAgLTQ4LDEwICs0OCwxNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGZpbGVfb3BlcmF0aW9ucyB1 ZGxfZHJpdmVyX2ZvcHMgPSB7CiAJLmxsc2VlayA9IG5vb3BfbGxzZWVrLAogfTsKIAorc3RhdGlj IHZvaWQgdWRsX2RyaXZlcl9yZWxlYXNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJdWRs X2ZpbmkoZGV2KTsKKwl1ZGxfbW9kZXNldF9jbGVhbnVwKGRldik7CisJZHJtX2Rldl9maW5pKGRl dik7CisJa2ZyZWUoZGV2KTsKK30KKwogc3RhdGljIHN0cnVjdCBkcm1fZHJpdmVyIGRyaXZlciA9 IHsKIAkuZHJpdmVyX2ZlYXR1cmVzID0gRFJJVkVSX01PREVTRVQgfCBEUklWRVJfR0VNIHwgRFJJ VkVSX1BSSU1FLAotCS5sb2FkID0gdWRsX2RyaXZlcl9sb2FkLAotCS51bmxvYWQgPSB1ZGxfZHJp dmVyX3VubG9hZCwKIAkucmVsZWFzZSA9IHVkbF9kcml2ZXJfcmVsZWFzZSwKIAogCS8qIGdlbSBo b29rcyAqLwpAQCAtNzUsMjggKzgxLDU2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBkcml2 ZXIgPSB7CiAJLnBhdGNobGV2ZWwgPSBEUklWRVJfUEFUQ0hMRVZFTCwKIH07CiAKK3N0YXRpYyBz dHJ1Y3QgdWRsX2RldmljZSAqdWRsX2RyaXZlcl9jcmVhdGUoc3RydWN0IHVzYl9pbnRlcmZhY2Ug KmludGVyZmFjZSkKK3sKKwlzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiA9IGludGVyZmFjZV90b191 c2JkZXYoaW50ZXJmYWNlKTsKKwlzdHJ1Y3QgdWRsX2RldmljZSAqdWRsOworCWludCByOworCisJ dWRsID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IHVkbF9kZXZpY2UpLCBHRlBfS0VSTkVMKTsKKwlp ZiAoIXVkbCkKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisKKwlyID0gZHJtX2Rldl9pbml0 KCZ1ZGwtPmRybSwgJmRyaXZlciwgJmludGVyZmFjZS0+ZGV2KTsKKwlpZiAocikgeworCQlrZnJl ZSh1ZGwpOworCQlyZXR1cm4gRVJSX1BUUihyKTsKKwl9CisKKwl1ZGwtPnVkZXYgPSB1ZGV2Owor CXVkbC0+ZHJtLmRldl9wcml2YXRlID0gdWRsOworCisJciA9IHVkbF9pbml0KHVkbCk7CisJaWYg KHIpIHsKKwkJZHJtX2Rldl9maW5pKCZ1ZGwtPmRybSk7CisJCWtmcmVlKHVkbCk7CisJCXJldHVy biBFUlJfUFRSKHIpOworCX0KKworCXVzYl9zZXRfaW50ZmRhdGEoaW50ZXJmYWNlLCB1ZGwpOwor CXJldHVybiB1ZGw7Cit9CisKKwogc3RhdGljIGludCB1ZGxfdXNiX3Byb2JlKHN0cnVjdCB1c2Jf aW50ZXJmYWNlICppbnRlcmZhY2UsCiAJCQkgY29uc3Qgc3RydWN0IHVzYl9kZXZpY2VfaWQgKmlk KQogewotCXN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2ID0gaW50ZXJmYWNlX3RvX3VzYmRldihpbnRl cmZhY2UpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CiAJaW50IHI7CiAKLQlkZXYgPSBkcm1f ZGV2X2FsbG9jKCZkcml2ZXIsICZpbnRlcmZhY2UtPmRldik7Ci0JaWYgKElTX0VSUihkZXYpKQot CQlyZXR1cm4gUFRSX0VSUihkZXYpOworCXN0cnVjdCB1ZGxfZGV2aWNlICp1ZGwgPSB1ZGxfZHJp dmVyX2NyZWF0ZShpbnRlcmZhY2UpOworCWlmIChJU19FUlIodWRsKSkKKwkJcmV0dXJuIFBUUl9F UlIodWRsKTsKIAotCXIgPSBkcm1fZGV2X3JlZ2lzdGVyKGRldiwgKHVuc2lnbmVkIGxvbmcpdWRl dik7CisJciA9IGRybV9kZXZfcmVnaXN0ZXIoJnVkbC0+ZHJtLCAwKTsKIAlpZiAocikKIAkJZ290 byBlcnJfZnJlZTsKIAotCXVzYl9zZXRfaW50ZmRhdGEoaW50ZXJmYWNlLCBkZXYpOwotCURSTV9J TkZPKCJJbml0aWFsaXplZCB1ZGwgb24gbWlub3IgJWRcbiIsIGRldi0+cHJpbWFyeS0+aW5kZXgp OworCURSTV9JTkZPKCJJbml0aWFsaXplZCB1ZGwgb24gbWlub3IgJWRcbiIsIHVkbC0+ZHJtLnBy aW1hcnktPmluZGV4KTsKIAogCXJldHVybiAwOwogCiBlcnJfZnJlZToKLQlkcm1fZGV2X3B1dChk ZXYpOworCWRybV9kZXZfcHV0KCZ1ZGwtPmRybSk7CiAJcmV0dXJuIHI7CiB9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL3VkbC91 ZGxfZHJ2LmgKaW5kZXggYjNlMDhlODc2ZDYyLi4zNWMxZjMzZmJjMWEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS91ZGwvdWRsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRs X2Rydi5oCkBAIC01MCw4ICs1MCw4IEBAIHN0cnVjdCB1cmJfbGlzdCB7CiBzdHJ1Y3QgdWRsX2Zi ZGV2OwogCiBzdHJ1Y3QgdWRsX2RldmljZSB7CisJc3RydWN0IGRybV9kZXZpY2UgZHJtOwogCXN0 cnVjdCBkZXZpY2UgKmRldjsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGRldjsKIAlzdHJ1Y3QgdXNi X2RldmljZSAqdWRldjsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAKQEAgLTcxLDcgKzcxLDcg QEAgc3RydWN0IHVkbF9kZXZpY2UgewogCWF0b21pY190IGNwdV9rY3ljbGVzX3VzZWQ7IC8qIHRy YW5zcGlyZWQgZHVyaW5nIHBpeGVsIHByb2Nlc3NpbmcgKi8KIH07CiAKLSNkZWZpbmUgdG9fdWRs KHgpICgoeCktPmRldl9wcml2YXRlKQorI2RlZmluZSB0b191ZGwoeCkgY29udGFpbmVyX29mKHgs IHN0cnVjdCB1ZGxfZGV2aWNlLCBkcm0pCiAKIHN0cnVjdCB1ZGxfZ2VtX29iamVjdCB7CiAJc3Ry dWN0IGRybV9nZW1fb2JqZWN0IGJhc2U7CkBAIC0xMDQsOSArMTA0LDggQEAgc3RydWN0IHVyYiAq dWRsX2dldF91cmIoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgdWRsX3N1Ym1pdF91cmIo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IHVyYiAqdXJiLCBzaXplX3QgbGVuKTsKIHZv aWQgdWRsX3VyYl9jb21wbGV0aW9uKHN0cnVjdCB1cmIgKnVyYik7CiAKLWludCB1ZGxfZHJpdmVy X2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncyk7Ci12b2lk IHVkbF9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotdm9pZCB1ZGxfZHJp dmVyX3JlbGVhc2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgdWRsX2luaXQoc3RydWN0 IHVkbF9kZXZpY2UgKnVkbCk7Cit2b2lkIHVkbF9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwogCiBpbnQgdWRsX2ZiZGV2X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIHVk bF9mYmRldl9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3VkbC91ZGxfZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2ZiLmMK aW5kZXggNTkwMzIzZWEyNjFmLi40YWIxMDFiZjFkZjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS91ZGwvdWRsX2ZiLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZmIuYwpAQCAt MjEzLDcgKzIxMyw3IEBAIHN0YXRpYyBpbnQgdWRsX2ZiX29wZW4oc3RydWN0IGZiX2luZm8gKmlu Zm8sIGludCB1c2VyKQogCXN0cnVjdCB1ZGxfZGV2aWNlICp1ZGwgPSB0b191ZGwoZGV2KTsKIAog CS8qIElmIHRoZSBVU0IgZGV2aWNlIGlzIGdvbmUsIHdlIGRvbid0IGFjY2VwdCBuZXcgb3BlbnMg Ki8KLQlpZiAoZHJtX2Rldl9pc191bnBsdWdnZWQodWRsLT5kZGV2KSkKKwlpZiAoZHJtX2Rldl9p c191bnBsdWdnZWQoJnVkbC0+ZHJtKSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKIAl1ZmJkZXYtPmZi X2NvdW50Kys7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9tYWluLmMgYi9k cml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9tYWluLmMKaW5kZXggODYyYzA5OWQ3YzRjLi42NzQzZWFl ZjQ1OTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX21haW4uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9tYWluLmMKQEAgLTMxMSwyMCArMzExLDEyIEBAIGludCB1 ZGxfc3VibWl0X3VyYihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgdXJiICp1cmIsIHNp emVfdCBsZW4pCiAJcmV0dXJuIHJldDsKIH0KIAotaW50IHVkbF9kcml2ZXJfbG9hZChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQoraW50IHVkbF9pbml0KHN0cnVj dCB1ZGxfZGV2aWNlICp1ZGwpCiB7Ci0Jc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYgPSAodm9pZCop ZmxhZ3M7Ci0Jc3RydWN0IHVkbF9kZXZpY2UgKnVkbDsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gJnVkbC0+ZHJtOwogCWludCByZXQgPSAtRU5PTUVNOwogCiAJRFJNX0RFQlVHKCJcbiIpOwot CXVkbCA9IGt6YWxsb2Moc2l6ZW9mKHN0cnVjdCB1ZGxfZGV2aWNlKSwgR0ZQX0tFUk5FTCk7Ci0J aWYgKCF1ZGwpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JdWRsLT51ZGV2ID0gdWRldjsKLQl1ZGwt PmRkZXYgPSBkZXY7Ci0JZGV2LT5kZXZfcHJpdmF0ZSA9IHVkbDsKIAogCW11dGV4X2luaXQoJnVk bC0+Z2VtX2xvY2spOwogCkBAIC0zNTgsNyArMzUwLDYgQEAgaW50IHVkbF9kcml2ZXJfbG9hZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogZXJyOgogCWlmICh1 ZGwtPnVyYnMuY291bnQpCiAJCXVkbF9mcmVlX3VyYl9saXN0KGRldik7Ci0Ja2ZyZWUodWRsKTsK IAlEUk1fRVJST1IoIiVkXG4iLCByZXQpOwogCXJldHVybiByZXQ7CiB9CkBAIC0zNjksNyArMzYw LDcgQEAgaW50IHVkbF9kcm9wX3VzYihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiAw OwogfQogCi12b2lkIHVkbF9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2 b2lkIHVkbF9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IHVkbF9kZXZp Y2UgKnVkbCA9IHRvX3VkbChkZXYpOwogCkBAIC0zNzksMTIgKzM3MCw0IEBAIHZvaWQgdWRsX2Ry aXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJdWRsX2ZyZWVfdXJiX2xpc3Qo ZGV2KTsKIAogCXVkbF9mYmRldl9jbGVhbnVwKGRldik7Ci0Ja2ZyZWUodWRsKTsKLX0KLQotdm9p ZCB1ZGxfZHJpdmVyX3JlbGVhc2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQl1ZGxfbW9k ZXNldF9jbGVhbnVwKGRldik7Ci0JZHJtX2Rldl9maW5pKGRldik7Ci0Ja2ZyZWUoZGV2KTsKIH0K LS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs