From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hai Li Subject: [PATCH v2 1/4] drm/msm/mdp5: Move *_modeset_init out of construct_encoder function Date: Thu, 26 Mar 2015 19:25:14 -0400 Message-ID: <1427412317-17741-2-git-send-email-hali@codeaurora.org> References: <1427412317-17741-1-git-send-email-hali@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1427412317-17741-1-git-send-email-hali@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 Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org VGhpcyBjaGFuZ2UgaXMgdG8gbWFrZSB0aGUgY29udGVudCBpbiBjb25zdHJ1Y3RfZW5jb2RlciBy ZWZsZWN0IGl0cwpuYW1lLgpBbHNvLCBEU0kgY29ubmVjdG9yIG1heSBiZSBjb25uZWN0ZWQgdG8g dmlkZW8gbW9kZSBvciBjb21tYW5kIG1vZGUKZW5jb2Rlciwgc28gdGhhdCAyIGRpZmZlcmVudCBl bmNvZGVycyBuZWVkIHRvIGJlIGNvbnN0cnVjdGVkIGZvciBEU0kuCgpTaWduZWQtb2ZmLWJ5OiBI YWkgTGkgPGhhbGlAY29kZWF1cm9yYS5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9tZHAv bWRwNS9tZHA1X2ttcy5jIHwgODkgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2ttcy5jIGIvZHJpdmVycy9n cHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2ttcy5jCmluZGV4IGY4ODIwMTkuLjZkOTY3YTggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9rbXMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfa21zLmMKQEAgLTE2Myw4ICsxNjMsOSBA QCBpbnQgbWRwNV9lbmFibGUoc3RydWN0IG1kcDVfa21zICptZHA1X2ttcykKIAlyZXR1cm4gMDsK IH0KIAotc3RhdGljIGludCBjb25zdHJ1Y3RfZW5jb2RlcihzdHJ1Y3QgbWRwNV9rbXMgKm1kcDVf a21zLAotCQllbnVtIG1kcDVfaW50Zl90eXBlIGludGZfdHlwZSwgaW50IGludGZfbnVtKQorc3Rh dGljIHN0cnVjdCBkcm1fZW5jb2RlciAqY29uc3RydWN0X2VuY29kZXIoc3RydWN0IG1kcDVfa21z ICptZHA1X2ttcywKKwkJZW51bSBtZHA1X2ludGZfdHlwZSBpbnRmX3R5cGUsIGludCBpbnRmX251 bSwKKwkJZW51bSBtZHA1X2ludGZfbW9kZSBpbnRmX21vZGUpCiB7CiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IG1kcDVfa21zLT5kZXY7CiAJc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xNzIsMzAgKzE3Myw2NCBAQCBzdGF0aWMgaW50IGNvbnN0 cnVjdF9lbmNvZGVyKHN0cnVjdCBtZHA1X2ttcyAqbWRwNV9rbXMsCiAJc3RydWN0IG1kcDVfaW50 ZXJmYWNlIGludGYgPSB7CiAJCQkubnVtCT0gaW50Zl9udW0sCiAJCQkudHlwZQk9IGludGZfdHlw ZSwKLQkJCS5tb2RlCT0gTURQNV9JTlRGX01PREVfTk9ORSwKKwkJCS5tb2RlCT0gaW50Zl9tb2Rl LAogCX07Ci0JaW50IHJldCA9IDA7CiAKIAllbmNvZGVyID0gbWRwNV9lbmNvZGVyX2luaXQoZGV2 LCAmaW50Zik7CiAJaWYgKElTX0VSUihlbmNvZGVyKSkgewotCQlyZXQgPSBQVFJfRVJSKGVuY29k ZXIpOwotCQlkZXZfZXJyKGRldi0+ZGV2LCAiZmFpbGVkIHRvIGNvbnN0cnVjdCBlbmNvZGVyOiAl ZFxuIiwgcmV0KTsKLQkJcmV0dXJuIHJldDsKKwkJZGV2X2VycihkZXYtPmRldiwgImZhaWxlZCB0 byBjb25zdHJ1Y3QgZW5jb2RlclxuIik7CisJCXJldHVybiBlbmNvZGVyOwogCX0KIAogCWVuY29k ZXItPnBvc3NpYmxlX2NydGNzID0gKDEgPDwgcHJpdi0+bnVtX2NydGNzKSAtIDE7CiAJcHJpdi0+ ZW5jb2RlcnNbcHJpdi0+bnVtX2VuY29kZXJzKytdID0gZW5jb2RlcjsKIAotCWlmIChpbnRmX3R5 cGUgPT0gSU5URl9IRE1JKSB7Ci0JCXJldCA9IGhkbWlfbW9kZXNldF9pbml0KHByaXYtPmhkbWks IGRldiwgZW5jb2Rlcik7Ci0JCWlmIChyZXQpCi0JCQlkZXZfZXJyKGRldi0+ZGV2LCAiZmFpbGVk IHRvIGluaXQgSERNSTogJWRcbiIsIHJldCk7CisJcmV0dXJuIGVuY29kZXI7Cit9CisKK3N0YXRp YyBpbnQgbW9kZXNldF9pbml0X2ludGYoc3RydWN0IG1kcDVfa21zICptZHA1X2ttcywgaW50IGlu dGZfbnVtKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBtZHA1X2ttcy0+ZGV2OworCXN0 cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCWNvbnN0IHN0 cnVjdCBtZHA1X2NmZ19odyAqaHdfY2ZnID0KKwkJCQkJbWRwNV9jZmdfZ2V0X2h3X2NvbmZpZyht ZHA1X2ttcy0+Y2ZnKTsKKwllbnVtIG1kcDVfaW50Zl90eXBlIGludGZfdHlwZSA9IGh3X2NmZy0+ aW50ZnNbaW50Zl9udW1dOworCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKKwlpbnQgcmV0 ID0gMDsKKworCXN3aXRjaCAoaW50Zl90eXBlKSB7CisJY2FzZSBJTlRGX0RJU0FCTEVEOgorCQli cmVhazsKKwljYXNlIElOVEZfZURQOgorCQlpZiAoIXByaXYtPmVkcCkKKwkJCWJyZWFrOworCisJ CWVuY29kZXIgPSBjb25zdHJ1Y3RfZW5jb2RlcihtZHA1X2ttcywgSU5URl9lRFAsIGludGZfbnVt LAorCQkJCQlNRFA1X0lOVEZfTU9ERV9OT05FKTsKKwkJaWYgKElTX0VSUihlbmNvZGVyKSkgewor CQkJcmV0ID0gUFRSX0VSUihlbmNvZGVyKTsKKwkJCWJyZWFrOworCQl9CiAKLQl9IGVsc2UgaWYg KGludGZfdHlwZSA9PSBJTlRGX2VEUCkgewotCQkvKiBDb25zdHJ1Y3QgYnJpZGdlL2Nvbm5lY3Rv ciBmb3IgZURQOiAqLwogCQlyZXQgPSBtc21fZWRwX21vZGVzZXRfaW5pdChwcml2LT5lZHAsIGRl diwgZW5jb2Rlcik7Ci0JCWlmIChyZXQpCi0JCQlkZXZfZXJyKGRldi0+ZGV2LCAiZmFpbGVkIHRv IGluaXQgZURQOiAlZFxuIiwgcmV0KTsKKwkJYnJlYWs7CisJY2FzZSBJTlRGX0hETUk6CisJCWlm ICghcHJpdi0+aGRtaSkKKwkJCWJyZWFrOworCisJCWVuY29kZXIgPSBjb25zdHJ1Y3RfZW5jb2Rl cihtZHA1X2ttcywgSU5URl9IRE1JLCBpbnRmX251bSwKKwkJCQkJTURQNV9JTlRGX01PREVfTk9O RSk7CisJCWlmIChJU19FUlIoZW5jb2RlcikpIHsKKwkJCXJldCA9IFBUUl9FUlIoZW5jb2Rlcik7 CisJCQlicmVhazsKKwkJfQorCisJCXJldCA9IGhkbWlfbW9kZXNldF9pbml0KHByaXYtPmhkbWks IGRldiwgZW5jb2Rlcik7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCWRldl9lcnIoZGV2LT5kZXYs ICJ1bmtub3duIGludGY6ICVkXG4iLCBpbnRmX3R5cGUpOworCQlyZXQgPSAtRUlOVkFMOworCQli cmVhazsKIAl9CiAKIAlyZXR1cm4gcmV0OwpAQCAtMjYxLDI3ICsyOTYsMTEgQEAgc3RhdGljIGlu dCBtb2Rlc2V0X2luaXQoc3RydWN0IG1kcDVfa21zICptZHA1X2ttcykKIAkJfQogCX0KIAotCS8q IENvbnN0cnVjdCBleHRlcm5hbCBkaXNwbGF5IGludGVyZmFjZXMnIGVuY29kZXJzOiAqLworCS8q IENvbnN0cnVjdCBlbmNvZGVycyBhbmQgbW9kZXNldCBpbml0aWFsaXplIGNvbm5lY3RvciBkZXZp Y2VzCisJICogZm9yIGVhY2ggZXh0ZXJuYWwgZGlzcGxheSBpbnRlcmZhY2UuCisJICovCiAJZm9y IChpID0gMDsgaSA8IEFSUkFZX1NJWkUoaHdfY2ZnLT5pbnRmcyk7IGkrKykgewotCQllbnVtIG1k cDVfaW50Zl90eXBlIGludGZfdHlwZSA9IGh3X2NmZy0+aW50ZnNbaV07Ci0KLQkJc3dpdGNoIChp bnRmX3R5cGUpIHsKLQkJY2FzZSBJTlRGX0RJU0FCTEVEOgotCQkJYnJlYWs7Ci0JCWNhc2UgSU5U Rl9lRFA6Ci0JCQlpZiAocHJpdi0+ZWRwKQotCQkJCXJldCA9IGNvbnN0cnVjdF9lbmNvZGVyKG1k cDVfa21zLCBJTlRGX2VEUCwgaSk7Ci0JCQlicmVhazsKLQkJY2FzZSBJTlRGX0hETUk6Ci0JCQlp ZiAocHJpdi0+aGRtaSkKLQkJCQlyZXQgPSBjb25zdHJ1Y3RfZW5jb2RlcihtZHA1X2ttcywgSU5U Rl9IRE1JLCBpKTsKLQkJCWJyZWFrOwotCQlkZWZhdWx0OgotCQkJZGV2X2VycihkZXYtPmRldiwg InVua25vd24gaW50ZjogJWRcbiIsIGludGZfdHlwZSk7Ci0JCQlyZXQgPSAtRUlOVkFMOwotCQkJ YnJlYWs7Ci0JCX0KLQorCQlyZXQgPSBtb2Rlc2V0X2luaXRfaW50ZihtZHA1X2ttcywgaSk7CiAJ CWlmIChyZXQpCiAJCQlnb3RvIGZhaWw7CiAJfQotLSAKVGhlIFF1YWxjb21tIElubm92YXRpb24g Q2VudGVyLCBJbmMuIGlzIGEgbWVtYmVyIG9mIHRoZSBDb2RlIEF1cm9yYSBGb3J1bSwKaG9zdGVk IGJ5IFRoZSBMaW51eCBGb3VuZGF0aW9uCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo=