From: Hans de Goede Subject: [PATCH 02/12] staging: vboxvideo: Move setup of modesetting from driver_load to mode_init Date: Tue, 18 Sep 2018 19:44:28 +0200 Message-ID: <20180918174438.19780-3-hdegoede@redhat.com> References: <20180918174438.19780-1-hdegoede@redhat.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 E57216E438 for ; Tue, 18 Sep 2018 17:44:44 +0000 (UTC) In-Reply-To: <20180918174438.19780-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Hans de Goede , Michael Thayer , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org TW92ZSB0aGUgc2V0dXAgb2YgZHJtIG1vZGVzZXR0aW5nIGNvbmZpZyBmcm9tIHZib3hfZHJpdmVy X2xvYWQoKSB0bwp2Ym94X21vZGVfaW5pdCgpLgoKU2lnbmVkLW9mZi1ieTogSGFucyBkZSBHb2Vk ZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zi b3hfbWFpbi5jIHwgNDUgLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9zdGFnaW5nL3Zib3h2 aWRlby92Ym94X21vZGUuYyB8IDYyICsrKysrKysrKysrKysrKysrKysrKysrKy0tLQogMiBmaWxl cyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfbWFpbi5jIGIvZHJpdmVycy9zdGFnaW5n L3Zib3h2aWRlby92Ym94X21haW4uYwppbmRleCA3ODNhNjhjMGRlM2IuLmExY2QyOWZlOThmZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21haW4uYworKysgYi9k cml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfbWFpbi5jCkBAIC0xNzMsNDAgKzE3Myw2IEBA IGludCB2Ym94X2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXR1 cm4gMDsKIH0KIAotc3RhdGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKnZib3hfdXNlcl9mcmFt ZWJ1ZmZlcl9jcmVhdGUoCi0JCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCXN0cnVjdCBkcm1f ZmlsZSAqZmlscCwKLQkJY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kKQot ewotCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqOwotCXN0cnVjdCB2Ym94X2ZyYW1lYnVmZmVy ICp2Ym94X2ZiOwotCWludCByZXQgPSAtRU5PTUVNOwotCi0Jb2JqID0gZHJtX2dlbV9vYmplY3Rf bG9va3VwKGZpbHAsIG1vZGVfY21kLT5oYW5kbGVzWzBdKTsKLQlpZiAoIW9iaikKLQkJcmV0dXJu IEVSUl9QVFIoLUVOT0VOVCk7Ci0KLQl2Ym94X2ZiID0ga3phbGxvYyhzaXplb2YoKnZib3hfZmIp LCBHRlBfS0VSTkVMKTsKLQlpZiAoIXZib3hfZmIpCi0JCWdvdG8gZXJyX3VucmVmX29iajsKLQot CXJldCA9IHZib3hfZnJhbWVidWZmZXJfaW5pdChkZXYsIHZib3hfZmIsIG1vZGVfY21kLCBvYmop OwotCWlmIChyZXQpCi0JCWdvdG8gZXJyX2ZyZWVfdmJveF9mYjsKLQotCXJldHVybiAmdmJveF9m Yi0+YmFzZTsKLQotZXJyX2ZyZWVfdmJveF9mYjoKLQlrZnJlZSh2Ym94X2ZiKTsKLWVycl91bnJl Zl9vYmo6Ci0JZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKG9iaik7Ci0JcmV0dXJuIEVSUl9Q VFIocmV0KTsKLX0KLQotc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVuY3Mg dmJveF9tb2RlX2Z1bmNzID0gewotCS5mYl9jcmVhdGUgPSB2Ym94X3VzZXJfZnJhbWVidWZmZXJf Y3JlYXRlLAotfTsKLQogc3RhdGljIGludCB2Ym94X2FjY2VsX2luaXQoc3RydWN0IHZib3hfcHJp dmF0ZSAqdmJveCkKIHsKIAl1bnNpZ25lZCBpbnQgaTsKQEAgLTM3NSwxNSArMzQxLDYgQEAgaW50 IHZib3hfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAocmV0KQogCQln b3RvIGVycl9od19maW5pOwogCi0JZHJtX21vZGVfY29uZmlnX2luaXQoZGV2KTsKLQotCWRldi0+ bW9kZV9jb25maWcuZnVuY3MgPSAodm9pZCAqKSZ2Ym94X21vZGVfZnVuY3M7Ci0JZGV2LT5tb2Rl X2NvbmZpZy5taW5fd2lkdGggPSA2NDsKLQlkZXYtPm1vZGVfY29uZmlnLm1pbl9oZWlnaHQgPSA2 NDsKLQlkZXYtPm1vZGVfY29uZmlnLnByZWZlcnJlZF9kZXB0aCA9IDI0OwotCWRldi0+bW9kZV9j b25maWcubWF4X3dpZHRoID0gVkJFX0RJU1BJX01BWF9YUkVTOwotCWRldi0+bW9kZV9jb25maWcu bWF4X2hlaWdodCA9IFZCRV9ESVNQSV9NQVhfWVJFUzsKLQogCXJldCA9IHZib3hfbW9kZV9pbml0 KGRldik7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfZHJtX21vZGVfY2xlYW51cDsKQEAgLTQwMyw3 ICszNjAsNiBAQCBpbnQgdmJveF9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog ZXJyX21vZGVfZmluaToKIAl2Ym94X21vZGVfZmluaShkZXYpOwogZXJyX2RybV9tb2RlX2NsZWFu dXA6Ci0JZHJtX21vZGVfY29uZmlnX2NsZWFudXAoZGV2KTsKIAl2Ym94X21tX2ZpbmkodmJveCk7 CiBlcnJfaHdfZmluaToKIAl2Ym94X2h3X2ZpbmkodmJveCk7CkBAIC00MTcsNyArMzczLDYgQEAg dm9pZCB2Ym94X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl2Ym94X2Zi ZGV2X2ZpbmkoZGV2KTsKIAl2Ym94X2lycV9maW5pKHZib3gpOwogCXZib3hfbW9kZV9maW5pKGRl dik7Ci0JZHJtX21vZGVfY29uZmlnX2NsZWFudXAoZGV2KTsKIAl2Ym94X21tX2ZpbmkodmJveCk7 CiAJdmJveF9od19maW5pKHZib3gpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL3Zi b3h2aWRlby92Ym94X21vZGUuYyBiL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9tb2Rl LmMKaW5kZXggNzA3MDFhNjA1NGMyLi4yNTg3ZTZhZWNjYTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv c3RhZ2luZy92Ym94dmlkZW8vdmJveF9tb2RlLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL3Zib3h2 aWRlby92Ym94X21vZGUuYwpAQCAtNjk2LDYgKzY5Niw0MCBAQCBzdGF0aWMgaW50IHZib3hfY29u bmVjdG9yX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXR1cm4gMDsKIH0KIAorc3Rh dGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKnZib3hfdXNlcl9mcmFtZWJ1ZmZlcl9jcmVhdGUo CisJCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCXN0cnVjdCBkcm1fZmlsZSAqZmlscCwKKwkJ Y29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kKQoreworCXN0cnVjdCBkcm1f Z2VtX29iamVjdCAqb2JqOworCXN0cnVjdCB2Ym94X2ZyYW1lYnVmZmVyICp2Ym94X2ZiOworCWlu dCByZXQgPSAtRU5PTUVNOworCisJb2JqID0gZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbHAsIG1v ZGVfY21kLT5oYW5kbGVzWzBdKTsKKwlpZiAoIW9iaikKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT0VO VCk7CisKKwl2Ym94X2ZiID0ga3phbGxvYyhzaXplb2YoKnZib3hfZmIpLCBHRlBfS0VSTkVMKTsK KwlpZiAoIXZib3hfZmIpCisJCWdvdG8gZXJyX3VucmVmX29iajsKKworCXJldCA9IHZib3hfZnJh bWVidWZmZXJfaW5pdChkZXYsIHZib3hfZmIsIG1vZGVfY21kLCBvYmopOworCWlmIChyZXQpCisJ CWdvdG8gZXJyX2ZyZWVfdmJveF9mYjsKKworCXJldHVybiAmdmJveF9mYi0+YmFzZTsKKworZXJy X2ZyZWVfdmJveF9mYjoKKwlrZnJlZSh2Ym94X2ZiKTsKK2Vycl91bnJlZl9vYmo6CisJZHJtX2dl bV9vYmplY3RfcHV0X3VubG9ja2VkKG9iaik7CisJcmV0dXJuIEVSUl9QVFIocmV0KTsKK30KKwor c3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVuY3MgdmJveF9tb2RlX2Z1bmNz ID0geworCS5mYl9jcmVhdGUgPSB2Ym94X3VzZXJfZnJhbWVidWZmZXJfY3JlYXRlLAorfTsKKwog aW50IHZib3hfbW9kZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IHZi b3hfcHJpdmF0ZSAqdmJveCA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC03MDQsMjQgKzczOCw0MiBA QCBpbnQgdmJveF9tb2RlX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl1bnNpZ25lZCBp bnQgaTsKIAlpbnQgcmV0OwogCisJZHJtX21vZGVfY29uZmlnX2luaXQoZGV2KTsKKworCWRldi0+ bW9kZV9jb25maWcuZnVuY3MgPSAodm9pZCAqKSZ2Ym94X21vZGVfZnVuY3M7CisJZGV2LT5tb2Rl X2NvbmZpZy5taW5fd2lkdGggPSA2NDsKKwlkZXYtPm1vZGVfY29uZmlnLm1pbl9oZWlnaHQgPSA2 NDsKKwlkZXYtPm1vZGVfY29uZmlnLnByZWZlcnJlZF9kZXB0aCA9IDI0OworCWRldi0+bW9kZV9j b25maWcubWF4X3dpZHRoID0gVkJFX0RJU1BJX01BWF9YUkVTOworCWRldi0+bW9kZV9jb25maWcu bWF4X2hlaWdodCA9IFZCRV9ESVNQSV9NQVhfWVJFUzsKKwogCS8qIHZib3hfY3Vyc29yX2luaXQo ZGV2KTsgKi8KIAlmb3IgKGkgPSAwOyBpIDwgdmJveC0+bnVtX2NydGNzOyArK2kpIHsKIAkJdmJv eF9jcnRjID0gdmJveF9jcnRjX2luaXQoZGV2LCBpKTsKLQkJaWYgKCF2Ym94X2NydGMpCi0JCQly ZXR1cm4gLUVOT01FTTsKKwkJaWYgKCF2Ym94X2NydGMpIHsKKwkJCXJldCA9IC1FTk9NRU07CisJ CQlnb3RvIGVycl9kcm1fbW9kZV9jbGVhbnVwOworCQl9CiAJCWVuY29kZXIgPSB2Ym94X2VuY29k ZXJfaW5pdChkZXYsIGkpOwotCQlpZiAoIWVuY29kZXIpCi0JCQlyZXR1cm4gLUVOT01FTTsKKwkJ aWYgKCFlbmNvZGVyKSB7CisJCQlyZXQgPSAtRU5PTUVNOworCQkJZ290byBlcnJfZHJtX21vZGVf Y2xlYW51cDsKKwkJfQogCQlyZXQgPSB2Ym94X2Nvbm5lY3Rvcl9pbml0KGRldiwgdmJveF9jcnRj LCBlbmNvZGVyKTsKIAkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7CisJCQlnb3RvIGVycl9kcm1f bW9kZV9jbGVhbnVwOwogCX0KIAogCXJldHVybiAwOworCitlcnJfZHJtX21vZGVfY2xlYW51cDoK Kwlkcm1fbW9kZV9jb25maWdfY2xlYW51cChkZXYpOworCXJldHVybiByZXQ7CiB9CiAKIHZvaWQg dmJveF9tb2RlX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKKwlkcm1fbW9kZV9jb25m aWdfY2xlYW51cChkZXYpOwogCS8qIHZib3hfY3Vyc29yX2ZpbmkoZGV2KTsgKi8KIH0KIAotLSAK Mi4xOS4wLnJjMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==