From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH v3 02/10] drm/fb-helper: Reshuffle code for subsequent patches Date: Tue, 21 Mar 2017 09:13:50 +0100 Message-ID: <20170321081358.27237-3-thierry.reding@gmail.com> References: <20170321081358.27237-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: <20170321081358.27237-1-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkFuIHVubG9ja2VkIHZl cnNpb24gb2YgdGhlIGRybV9mYl9oZWxwZXJfYWRkX29uZV9jb25uZWN0b3IoKSBmdW5jdGlvbgp3 aWxsIGJlIGFkZGVkIGluIGEgc3Vic2VxdWVudCBwYXRjaC4gUmVzaHVmZmxlIHRoZSBjb2RlIHNl cGFyYXRlbHkgdG8KbWFrZSB0aGUgZGlmZiBtb3JlIHJlYWRhYmxlIGxhdGVyIG9uLgoKVGVzdGVk LWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KU2lnbmVkLW9mZi1ieTog VGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v ZHJtX2ZiX2hlbHBlci5jIHwgNTkgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVycy9n cHUvZHJtL2RybV9mYl9oZWxwZXIuYwppbmRleCAyYmUxY2Q5NDljZWMuLjg3NWE0OTA0ODIyMiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCkBAIC0xMDksNiArMTA5LDM1IEBAIHN0YXRpYyBERUZJ TkVfTVVURVgoa2VybmVsX2ZiX2hlbHBlcl9sb2NrKTsKIAlmb3IgKCh7IGxvY2tkZXBfYXNzZXJ0 X2hlbGQoJihmYmgpLT5kZXYtPm1vZGVfY29uZmlnLm11dGV4KTsgfSksIFwKIAkgICAgIGlfXyA9 IDA7IGlfXyA8IChmYmgpLT5jb25uZWN0b3JfY291bnQ7IGlfXysrKQogCitpbnQgZHJtX2ZiX2hl bHBlcl9hZGRfb25lX2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLCBz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQoreworCXN0cnVjdCBkcm1fZmJfaGVscGVy X2Nvbm5lY3RvciAqKnRlbXA7CisJc3RydWN0IGRybV9mYl9oZWxwZXJfY29ubmVjdG9yICpmYl9o ZWxwZXJfY29ubmVjdG9yOworCisJaWYgKCFkcm1fZmJkZXZfZW11bGF0aW9uKQorCQlyZXR1cm4g MDsKKworCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZmJfaGVscGVyLT5kZXYtPm1vZGVfY29u ZmlnLm11dGV4KSk7CisJaWYgKGZiX2hlbHBlci0+Y29ubmVjdG9yX2NvdW50ICsgMSA+IGZiX2hl bHBlci0+Y29ubmVjdG9yX2luZm9fYWxsb2NfY291bnQpIHsKKwkJdGVtcCA9IGtyZWFsbG9jKGZi X2hlbHBlci0+Y29ubmVjdG9yX2luZm8sIHNpemVvZihzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25u ZWN0b3IgKikgKiAoZmJfaGVscGVyLT5jb25uZWN0b3JfY291bnQgKyAxKSwgR0ZQX0tFUk5FTCk7 CisJCWlmICghdGVtcCkKKwkJCXJldHVybiAtRU5PTUVNOworCisJCWZiX2hlbHBlci0+Y29ubmVj dG9yX2luZm9fYWxsb2NfY291bnQgPSBmYl9oZWxwZXItPmNvbm5lY3Rvcl9jb3VudCArIDE7CisJ CWZiX2hlbHBlci0+Y29ubmVjdG9yX2luZm8gPSB0ZW1wOworCX0KKworCWZiX2hlbHBlcl9jb25u ZWN0b3IgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25uZWN0b3IpLCBH RlBfS0VSTkVMKTsKKwlpZiAoIWZiX2hlbHBlcl9jb25uZWN0b3IpCisJCXJldHVybiAtRU5PTUVN OworCisJZHJtX2Nvbm5lY3Rvcl9nZXQoY29ubmVjdG9yKTsKKwlmYl9oZWxwZXJfY29ubmVjdG9y LT5jb25uZWN0b3IgPSBjb25uZWN0b3I7CisJZmJfaGVscGVyLT5jb25uZWN0b3JfaW5mb1tmYl9o ZWxwZXItPmNvbm5lY3Rvcl9jb3VudCsrXSA9IGZiX2hlbHBlcl9jb25uZWN0b3I7CisJcmV0dXJu IDA7Cit9CitFWFBPUlRfU1lNQk9MKGRybV9mYl9oZWxwZXJfYWRkX29uZV9jb25uZWN0b3IpOwor CiAvKioKICAqIGRybV9mYl9oZWxwZXJfc2luZ2xlX2FkZF9hbGxfY29ubmVjdG9ycygpIC0gYWRk IGFsbCBjb25uZWN0b3JzIHRvIGZiZGV2CiAgKiAJCQkJCSAgICAgICBlbXVsYXRpb24gaGVscGVy CkBAIC0xNjIsMzYgKzE5MSw2IEBAIGludCBkcm1fZmJfaGVscGVyX3NpbmdsZV9hZGRfYWxsX2Nv bm5lY3RvcnMoc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlcikKIH0KIEVYUE9SVF9TWU1C T0woZHJtX2ZiX2hlbHBlcl9zaW5nbGVfYWRkX2FsbF9jb25uZWN0b3JzKTsKIAotaW50IGRybV9m Yl9oZWxwZXJfYWRkX29uZV9jb25uZWN0b3Ioc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBl ciwgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKLXsKLQlzdHJ1Y3QgZHJtX2ZiX2hl bHBlcl9jb25uZWN0b3IgKip0ZW1wOwotCXN0cnVjdCBkcm1fZmJfaGVscGVyX2Nvbm5lY3RvciAq ZmJfaGVscGVyX2Nvbm5lY3RvcjsKLQotCWlmICghZHJtX2ZiZGV2X2VtdWxhdGlvbikKLQkJcmV0 dXJuIDA7Ci0KLQlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmZiX2hlbHBlci0+ZGV2LT5tb2Rl X2NvbmZpZy5tdXRleCkpOwotCWlmIChmYl9oZWxwZXItPmNvbm5lY3Rvcl9jb3VudCArIDEgPiBm Yl9oZWxwZXItPmNvbm5lY3Rvcl9pbmZvX2FsbG9jX2NvdW50KSB7Ci0JCXRlbXAgPSBrcmVhbGxv YyhmYl9oZWxwZXItPmNvbm5lY3Rvcl9pbmZvLCBzaXplb2Yoc3RydWN0IGRybV9mYl9oZWxwZXJf Y29ubmVjdG9yICopICogKGZiX2hlbHBlci0+Y29ubmVjdG9yX2NvdW50ICsgMSksIEdGUF9LRVJO RUwpOwotCQlpZiAoIXRlbXApCi0JCQlyZXR1cm4gLUVOT01FTTsKLQotCQlmYl9oZWxwZXItPmNv bm5lY3Rvcl9pbmZvX2FsbG9jX2NvdW50ID0gZmJfaGVscGVyLT5jb25uZWN0b3JfY291bnQgKyAx OwotCQlmYl9oZWxwZXItPmNvbm5lY3Rvcl9pbmZvID0gdGVtcDsKLQl9Ci0KLQotCWZiX2hlbHBl cl9jb25uZWN0b3IgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25uZWN0 b3IpLCBHRlBfS0VSTkVMKTsKLQlpZiAoIWZiX2hlbHBlcl9jb25uZWN0b3IpCi0JCXJldHVybiAt RU5PTUVNOwotCi0JZHJtX2Nvbm5lY3Rvcl9nZXQoY29ubmVjdG9yKTsKLQlmYl9oZWxwZXJfY29u bmVjdG9yLT5jb25uZWN0b3IgPSBjb25uZWN0b3I7Ci0JZmJfaGVscGVyLT5jb25uZWN0b3JfaW5m b1tmYl9oZWxwZXItPmNvbm5lY3Rvcl9jb3VudCsrXSA9IGZiX2hlbHBlcl9jb25uZWN0b3I7Ci0J cmV0dXJuIDA7Ci19Ci1FWFBPUlRfU1lNQk9MKGRybV9mYl9oZWxwZXJfYWRkX29uZV9jb25uZWN0 b3IpOwotCiBpbnQgZHJtX2ZiX2hlbHBlcl9yZW1vdmVfb25lX2Nvbm5lY3RvcihzdHJ1Y3QgZHJt X2ZiX2hlbHBlciAqZmJfaGVscGVyLAogCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yKQogewotLSAKMi4xMi4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK