From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: [PATCH v2 20/25] drm/nouveau: Use new drm_fb_helper functions Date: Wed, 22 Jul 2015 12:29:56 +0530 Message-ID: <1437548401-10125-21-git-send-email-architt@codeaurora.org> References: <1436769501-4105-1-git-send-email-architt@codeaurora.org> <1437548401-10125-1-git-send-email-architt@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41EEC6EAAB for ; Wed, 22 Jul 2015 00:01:30 -0700 (PDT) In-Reply-To: <1437548401-10125-1-git-send-email-architt@codeaurora.org> 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, daniel@ffwll.ch Cc: Ben Skeggs List-Id: dri-devel@lists.freedesktop.org VXNlIHRoZSBuZXdseSBjcmVhdGVkIHdyYXBwZXIgZHJtX2ZiX2hlbHBlciBmdW5jdGlvbnMgaW5z dGVhZCBvZiBjYWxsaW5nCmNvcmUgZmJkZXYgZnVuY3Rpb25zIGRpcmVjdGx5LiBUaGV5IGFsc28g c2ltcGxpZnkgdGhlIGZiX2luZm8gY3JlYXRpb24uCgpDT01QSUxFIFRFU1RFRCBPTkxZLgoKQ2M6 IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IEJlbiBTa2VnZ3MgPGJza2VnZ3NA cmVkaGF0LmNvbT4KQ2M6IEFsZXhhbmRyZSBDb3VyYm90IDxhY291cmJvdEBudmlkaWEuY29tPgoK U2lnbmVkLW9mZi1ieTogQXJjaGl0IFRhbmVqYSA8YXJjaGl0dEBjb2RlYXVyb3JhLm9yZz4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2RybS5jICAgfCAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZmJjb24uYyB8IDM5ICsrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAyOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1 X2RybS5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kcm0uYwppbmRleCA2NDkw MjRkLi4wMWQzZmIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1 X2RybS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJtLmMKQEAgLTMx Nyw3ICszMTcsOCBAQCBzdGF0aWMgaW50IG5vdXZlYXVfZHJtX3Byb2JlKHN0cnVjdCBwY2lfZGV2 ICpwZGV2LAogCWJvb3QgPSBwZGV2LT5yZXNvdXJjZVtQQ0lfUk9NX1JFU09VUkNFXS5mbGFncyAm IElPUkVTT1VSQ0VfUk9NX1NIQURPVzsKICNlbmRpZgogCWlmIChub3V2ZWF1X21vZGVzZXQgIT0g MikKLQkJcmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVycyhhcGVyLCAibm91dmVhdWZiIiwg Ym9vdCk7CisJCWRybV9mYl9oZWxwZXJfcmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVycyhh cGVyLCAibm91dmVhdWZiIiwKKwkJCWJvb3QpOwogCWtmcmVlKGFwZXIpOwogCiAJcmV0ID0gbnZr bV9kZXZpY2VfY3JlYXRlKHBkZXYsIE5WS01fQlVTX1BDSSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZmJjb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L25vdXZlYXVfZmJjb24uYwppbmRleCA2NzUxNTUzLi4yNzkxNzAxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2ZiY29uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L25vdXZlYXUvbm91dmVhdV9mYmNvbi5jCkBAIC04NCw3ICs4NCw3IEBAIG5vdXZlYXVfZmJjb25f ZmlsbHJlY3Qoc3RydWN0IGZiX2luZm8gKmluZm8sIGNvbnN0IHN0cnVjdCBmYl9maWxscmVjdCAq cmVjdCkKIAogCWlmIChyZXQgIT0gLUVOT0RFVikKIAkJbm91dmVhdV9mYmNvbl9ncHVfbG9ja3Vw KGluZm8pOwotCWNmYl9maWxscmVjdChpbmZvLCByZWN0KTsKKwlkcm1fZmJfaGVscGVyX2NmYl9m aWxscmVjdChpbmZvLCByZWN0KTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTExNiw3ICsxMTYsNyBA QCBub3V2ZWF1X2ZiY29uX2NvcHlhcmVhKHN0cnVjdCBmYl9pbmZvICppbmZvLCBjb25zdCBzdHJ1 Y3QgZmJfY29weWFyZWEgKmltYWdlKQogCiAJaWYgKHJldCAhPSAtRU5PREVWKQogCQlub3V2ZWF1 X2ZiY29uX2dwdV9sb2NrdXAoaW5mbyk7Ci0JY2ZiX2NvcHlhcmVhKGluZm8sIGltYWdlKTsKKwlk cm1fZmJfaGVscGVyX2NmYl9jb3B5YXJlYShpbmZvLCBpbWFnZSk7CiB9CiAKIHN0YXRpYyB2b2lk CkBAIC0xNDgsNyArMTQ4LDcgQEAgbm91dmVhdV9mYmNvbl9pbWFnZWJsaXQoc3RydWN0IGZiX2lu Zm8gKmluZm8sIGNvbnN0IHN0cnVjdCBmYl9pbWFnZSAqaW1hZ2UpCiAKIAlpZiAocmV0ICE9IC1F Tk9ERVYpCiAJCW5vdXZlYXVfZmJjb25fZ3B1X2xvY2t1cChpbmZvKTsKLQljZmJfaW1hZ2VibGl0 KGluZm8sIGltYWdlKTsKKwlkcm1fZmJfaGVscGVyX2NmYl9pbWFnZWJsaXQoaW5mbywgaW1hZ2Up OwogfQogCiBzdGF0aWMgaW50CkBAIC0xOTcsOSArMTk3LDkgQEAgc3RhdGljIHN0cnVjdCBmYl9v cHMgbm91dmVhdV9mYmNvbl9zd19vcHMgPSB7CiAJLm93bmVyID0gVEhJU19NT0RVTEUsCiAJLmZi X2NoZWNrX3ZhciA9IGRybV9mYl9oZWxwZXJfY2hlY2tfdmFyLAogCS5mYl9zZXRfcGFyID0gZHJt X2ZiX2hlbHBlcl9zZXRfcGFyLAotCS5mYl9maWxscmVjdCA9IGNmYl9maWxscmVjdCwKLQkuZmJf Y29weWFyZWEgPSBjZmJfY29weWFyZWEsCi0JLmZiX2ltYWdlYmxpdCA9IGNmYl9pbWFnZWJsaXQs CisJLmZiX2ZpbGxyZWN0ID0gZHJtX2ZiX2hlbHBlcl9jZmJfZmlsbHJlY3QsCisJLmZiX2NvcHlh cmVhID0gZHJtX2ZiX2hlbHBlcl9jZmJfY29weWFyZWEsCisJLmZiX2ltYWdlYmxpdCA9IGRybV9m Yl9oZWxwZXJfY2ZiX2ltYWdlYmxpdCwKIAkuZmJfcGFuX2Rpc3BsYXkgPSBkcm1fZmJfaGVscGVy X3Bhbl9kaXNwbGF5LAogCS5mYl9ibGFuayA9IGRybV9mYl9oZWxwZXJfYmxhbmssCiAJLmZiX3Nl dGNtYXAgPSBkcm1fZmJfaGVscGVyX3NldGNtYXAsCkBAIC0zMTksNyArMzE5LDYgQEAgbm91dmVh dV9mYmNvbl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAlzdHJ1Y3Qgbm91 dmVhdV9jaGFubmVsICpjaGFuOwogCXN0cnVjdCBub3V2ZWF1X2JvICpudmJvOwogCXN0cnVjdCBk cm1fbW9kZV9mYl9jbWQyIG1vZGVfY21kOwotCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2LT5w ZGV2OwogCWludCBzaXplLCByZXQ7CiAKIAltb2RlX2NtZC53aWR0aCA9IHNpemVzLT5zdXJmYWNl X3dpZHRoOwpAQCAtMzY1LDIwICszNjQsMTMgQEAgbm91dmVhdV9mYmNvbl9jcmVhdGUoc3RydWN0 IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKIAotCWluZm8gPSBmcmFtZWJ1ZmZlcl9hbGxvYygwLCAmcGRldi0+ZGV2KTsKLQlpZiAoIWlu Zm8pIHsKLQkJcmV0ID0gLUVOT01FTTsKKwlpbmZvID0gZHJtX2ZiX2hlbHBlcl9hbGxvY19mYmko aGVscGVyKTsKKwlpZiAoSVNfRVJSKGluZm8pKSB7CisJCXJldCA9IFBUUl9FUlIoaW5mbyk7CiAJ CWdvdG8gb3V0X3VubG9jazsKIAl9CiAJaW5mby0+c2tpcF92dF9zd2l0Y2ggPSAxOwogCi0JcmV0 ID0gZmJfYWxsb2NfY21hcCgmaW5mby0+Y21hcCwgMjU2LCAwKTsKLQlpZiAocmV0KSB7Ci0JCXJl dCA9IC1FTk9NRU07Ci0JCWZyYW1lYnVmZmVyX3JlbGVhc2UoaW5mbyk7Ci0JCWdvdG8gb3V0X3Vu bG9jazsKLQl9Ci0KIAlpbmZvLT5wYXIgPSBmYmNvbjsKIAogCW5vdXZlYXVfZnJhbWVidWZmZXJf aW5pdChkZXYsICZmYmNvbi0+bm91dmVhdV9mYiwgJm1vZGVfY21kLCBudmJvKTsKQEAgLTM4OCw3 ICszODAsNiBAQCBub3V2ZWF1X2ZiY29uX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVs cGVyLAogCiAJLyogc2V0dXAgaGVscGVyICovCiAJZmJjb24tPmhlbHBlci5mYiA9IGZiOwotCWZi Y29uLT5oZWxwZXIuZmJkZXYgPSBpbmZvOwogCiAJc3RyY3B5KGluZm8tPmZpeC5pZCwgIm5vdXZl YXVmYiIpOwogCWlmICghY2hhbikKQEAgLTQ1MCwxNSArNDQxLDkgQEAgc3RhdGljIGludAogbm91 dmVhdV9mYmNvbl9kZXN0cm95KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBub3V2ZWF1 X2ZiZGV2ICpmYmNvbikKIHsKIAlzdHJ1Y3Qgbm91dmVhdV9mcmFtZWJ1ZmZlciAqbm91dmVhdV9m YiA9ICZmYmNvbi0+bm91dmVhdV9mYjsKLQlzdHJ1Y3QgZmJfaW5mbyAqaW5mbzsKIAotCWlmIChm YmNvbi0+aGVscGVyLmZiZGV2KSB7Ci0JCWluZm8gPSBmYmNvbi0+aGVscGVyLmZiZGV2OwotCQl1 bnJlZ2lzdGVyX2ZyYW1lYnVmZmVyKGluZm8pOwotCQlpZiAoaW5mby0+Y21hcC5sZW4pCi0JCQlm Yl9kZWFsbG9jX2NtYXAoJmluZm8tPmNtYXApOwotCQlmcmFtZWJ1ZmZlcl9yZWxlYXNlKGluZm8p OwotCX0KKwlkcm1fZmJfaGVscGVyX3VucmVnaXN0ZXJfZmJpKCZmYmNvbi0+aGVscGVyKTsKKwlk cm1fZmJfaGVscGVyX3JlbGVhc2VfZmJpKCZmYmNvbi0+aGVscGVyKTsKIAogCWlmIChub3V2ZWF1 X2ZiLT5udmJvKSB7CiAJCW5vdXZlYXVfYm9fdW5tYXAobm91dmVhdV9mYi0+bnZibyk7CkBAIC00 OTYsNyArNDgxLDcgQEAgbm91dmVhdV9mYmNvbl9zZXRfc3VzcGVuZChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBpbnQgc3RhdGUpCiAJCWNvbnNvbGVfbG9jaygpOwogCQlpZiAoc3RhdGUgPT0gRkJJ TkZPX1NUQVRFX1JVTk5JTkcpCiAJCQlub3V2ZWF1X2ZiY29uX2FjY2VsX3Jlc3RvcmUoZGV2KTsK LQkJZmJfc2V0X3N1c3BlbmQoZHJtLT5mYmNvbi0+aGVscGVyLmZiZGV2LCBzdGF0ZSk7CisJCWRy bV9mYl9oZWxwZXJfc2V0X3N1c3BlbmQoJmRybS0+ZmJjb24tPmhlbHBlciwgc3RhdGUpOwogCQlp ZiAoc3RhdGUgIT0gRkJJTkZPX1NUQVRFX1JVTk5JTkcpCiAJCQlub3V2ZWF1X2ZiY29uX2FjY2Vs X3NhdmVfZGlzYWJsZShkZXYpOwogCQljb25zb2xlX3VubG9jaygpOwotLSAKVGhlIFF1YWxjb21t IElubm92YXRpb24gQ2VudGVyLCBJbmMuIGlzIGEgbWVtYmVyIG9mIHRoZSBDb2RlIEF1cm9yYSBG b3J1bSwKaG9zdGVkIGJ5IFRoZSBMaW51eCBGb3VuZGF0aW9uCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=