From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH v4 02/11] drm/fb-helper: Reshuffle code for subsequent patches Date: Wed, 29 Mar 2017 16:43:52 +0200 Message-ID: <20170329144401.1804-3-thierry.reding@gmail.com> References: <20170329144401.1804-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170329144401.1804-1-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: John Stultz , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkFuIHVubG9ja2VkIHZl cnNpb24gb2YgdGhlIGRybV9mYl9oZWxwZXJfYWRkX29uZV9jb25uZWN0b3IoKSBmdW5jdGlvbgp3 aWxsIGJlIGFkZGVkIGluIGEgc3Vic2VxdWVudCBwYXRjaC4gUmVzaHVmZmxlIHRoZSBjb2RlIHNl cGFyYXRlbHkgdG8KbWFrZSB0aGUgZGlmZiBtb3JlIHJlYWRhYmxlIGxhdGVyIG9uLgoKVGVzdGVk LWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KUmV2aWV3ZWQtYnk6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IFRoaWVy cnkgUmVkaW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9m Yl9oZWxwZXIuYyB8IDU5ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZmJfaGVscGVyLmMKaW5kZXggZDA2MDI3YTFiOWZhLi4xNTgxMzA1YzEwNTMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9mYl9oZWxwZXIuYwpAQCAtMTA5LDYgKzEwOSwzNSBAQCBzdGF0aWMgREVGSU5FX01V VEVYKGtlcm5lbF9mYl9oZWxwZXJfbG9jayk7CiAJZm9yICgoeyBsb2NrZGVwX2Fzc2VydF9oZWxk KCYoZmJoKS0+ZGV2LT5tb2RlX2NvbmZpZy5tdXRleCk7IH0pLCBcCiAJICAgICBpX18gPSAwOyBp X18gPCAoZmJoKS0+Y29ubmVjdG9yX2NvdW50OyBpX18rKykKIAoraW50IGRybV9mYl9oZWxwZXJf YWRkX29uZV9jb25uZWN0b3Ioc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwgc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKK3sKKwlzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25u ZWN0b3IgKip0ZW1wOworCXN0cnVjdCBkcm1fZmJfaGVscGVyX2Nvbm5lY3RvciAqZmJfaGVscGVy X2Nvbm5lY3RvcjsKKworCWlmICghZHJtX2ZiZGV2X2VtdWxhdGlvbikKKwkJcmV0dXJuIDA7CisK KwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmZiX2hlbHBlci0+ZGV2LT5tb2RlX2NvbmZpZy5t dXRleCkpOworCWlmIChmYl9oZWxwZXItPmNvbm5lY3Rvcl9jb3VudCArIDEgPiBmYl9oZWxwZXIt PmNvbm5lY3Rvcl9pbmZvX2FsbG9jX2NvdW50KSB7CisJCXRlbXAgPSBrcmVhbGxvYyhmYl9oZWxw ZXItPmNvbm5lY3Rvcl9pbmZvLCBzaXplb2Yoc3RydWN0IGRybV9mYl9oZWxwZXJfY29ubmVjdG9y ICopICogKGZiX2hlbHBlci0+Y29ubmVjdG9yX2NvdW50ICsgMSksIEdGUF9LRVJORUwpOworCQlp ZiAoIXRlbXApCisJCQlyZXR1cm4gLUVOT01FTTsKKworCQlmYl9oZWxwZXItPmNvbm5lY3Rvcl9p bmZvX2FsbG9jX2NvdW50ID0gZmJfaGVscGVyLT5jb25uZWN0b3JfY291bnQgKyAxOworCQlmYl9o ZWxwZXItPmNvbm5lY3Rvcl9pbmZvID0gdGVtcDsKKwl9CisKKwlmYl9oZWxwZXJfY29ubmVjdG9y ID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IGRybV9mYl9oZWxwZXJfY29ubmVjdG9yKSwgR0ZQX0tF Uk5FTCk7CisJaWYgKCFmYl9oZWxwZXJfY29ubmVjdG9yKQorCQlyZXR1cm4gLUVOT01FTTsKKwor CWRybV9jb25uZWN0b3JfZ2V0KGNvbm5lY3Rvcik7CisJZmJfaGVscGVyX2Nvbm5lY3Rvci0+Y29u bmVjdG9yID0gY29ubmVjdG9yOworCWZiX2hlbHBlci0+Y29ubmVjdG9yX2luZm9bZmJfaGVscGVy LT5jb25uZWN0b3JfY291bnQrK10gPSBmYl9oZWxwZXJfY29ubmVjdG9yOworCXJldHVybiAwOwor fQorRVhQT1JUX1NZTUJPTChkcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKTsKKwogLyoq CiAgKiBkcm1fZmJfaGVscGVyX3NpbmdsZV9hZGRfYWxsX2Nvbm5lY3RvcnMoKSAtIGFkZCBhbGwg Y29ubmVjdG9ycyB0byBmYmRldgogICogCQkJCQkgICAgICAgZW11bGF0aW9uIGhlbHBlcgpAQCAt MTYyLDM2ICsxOTEsNiBAQCBpbnQgZHJtX2ZiX2hlbHBlcl9zaW5nbGVfYWRkX2FsbF9jb25uZWN0 b3JzKHN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIpCiB9CiBFWFBPUlRfU1lNQk9MKGRy bV9mYl9oZWxwZXJfc2luZ2xlX2FkZF9hbGxfY29ubmVjdG9ycyk7CiAKLWludCBkcm1fZmJfaGVs cGVyX2FkZF9vbmVfY29ubmVjdG9yKHN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIsIHN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCi17Ci0Jc3RydWN0IGRybV9mYl9oZWxwZXJf Y29ubmVjdG9yICoqdGVtcDsKLQlzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25uZWN0b3IgKmZiX2hl bHBlcl9jb25uZWN0b3I7Ci0KLQlpZiAoIWRybV9mYmRldl9lbXVsYXRpb24pCi0JCXJldHVybiAw OwotCi0JV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZmYl9oZWxwZXItPmRldi0+bW9kZV9jb25m aWcubXV0ZXgpKTsKLQlpZiAoZmJfaGVscGVyLT5jb25uZWN0b3JfY291bnQgKyAxID4gZmJfaGVs cGVyLT5jb25uZWN0b3JfaW5mb19hbGxvY19jb3VudCkgewotCQl0ZW1wID0ga3JlYWxsb2MoZmJf aGVscGVyLT5jb25uZWN0b3JfaW5mbywgc2l6ZW9mKHN0cnVjdCBkcm1fZmJfaGVscGVyX2Nvbm5l Y3RvciAqKSAqIChmYl9oZWxwZXItPmNvbm5lY3Rvcl9jb3VudCArIDEpLCBHRlBfS0VSTkVMKTsK LQkJaWYgKCF0ZW1wKQotCQkJcmV0dXJuIC1FTk9NRU07Ci0KLQkJZmJfaGVscGVyLT5jb25uZWN0 b3JfaW5mb19hbGxvY19jb3VudCA9IGZiX2hlbHBlci0+Y29ubmVjdG9yX2NvdW50ICsgMTsKLQkJ ZmJfaGVscGVyLT5jb25uZWN0b3JfaW5mbyA9IHRlbXA7Ci0JfQotCi0KLQlmYl9oZWxwZXJfY29u bmVjdG9yID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IGRybV9mYl9oZWxwZXJfY29ubmVjdG9yKSwg R0ZQX0tFUk5FTCk7Ci0JaWYgKCFmYl9oZWxwZXJfY29ubmVjdG9yKQotCQlyZXR1cm4gLUVOT01F TTsKLQotCWRybV9jb25uZWN0b3JfZ2V0KGNvbm5lY3Rvcik7Ci0JZmJfaGVscGVyX2Nvbm5lY3Rv ci0+Y29ubmVjdG9yID0gY29ubmVjdG9yOwotCWZiX2hlbHBlci0+Y29ubmVjdG9yX2luZm9bZmJf aGVscGVyLT5jb25uZWN0b3JfY291bnQrK10gPSBmYl9oZWxwZXJfY29ubmVjdG9yOwotCXJldHVy biAwOwotfQotRVhQT1JUX1NZTUJPTChkcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKTsK LQogaW50IGRybV9mYl9oZWxwZXJfcmVtb3ZlX29uZV9jb25uZWN0b3Ioc3RydWN0IGRybV9mYl9o ZWxwZXIgKmZiX2hlbHBlciwKIAkJCQkgICAgICAgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvcikKIHsKLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==