From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 4/5] drm/i915: Quick spring clean of
	intel_prepare_plane_fb()
Date: Tue, 15 Nov 2016 08:58:16 +0000
Message-ID: <20161115085817.4210-4-chris@chris-wilson.co.uk>
References: <20161115085817.4210-1-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 622386E570
 for <intel-gfx@lists.freedesktop.org>; Tue, 15 Nov 2016 08:58:24 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id m203so23393100wma.3
 for <intel-gfx@lists.freedesktop.org>; Tue, 15 Nov 2016 00:58:24 -0800 (PST)
In-Reply-To: <20161115085817.4210-1-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

SnVzdCBhIHF1aWNrIHRpZHkgbm93IHRvIG1ha2UgdGhlIG5leHQgcGF0Y2ggbmVhdGVyLgoKU2ln
bmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzggKysrKysrKysrKysrKysr
KysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwg
MTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGNi
NTIxMTZmODU3Ny4uNGQ1NzhkYzZkMjNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCkBAIC0xNDEzMCw2ICsxNDEzMCwxNyBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVj
ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiBjYWxjX3dhdGVybWFya19kYXRhKHN0
YXRlKTsKIH0KIAorc3RhdGljIGJvb2wgb2xkX3BsYW5lX25lZWRzX21vZGVzZXQoc3RydWN0IGRy
bV9wbGFuZSAqcGxhbmUsCisJCQkJICAgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm5ld19zdGF0
ZSkKK3sKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisKKwljcnRjX3N0YXRl
ID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShuZXdfc3RhdGUtPnN0YXRlLAor
CQkJCQkJCXBsYW5lLT5zdGF0ZS0+Y3J0Yyk7CisKKwlyZXR1cm4gbmVlZHNfbW9kZXNldChjcnRj
X3N0YXRlKTsKK30KKwogLyoqCiAgKiBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiIC0gUHJlcGFyZSBm
YiBmb3IgdXNhZ2Ugb24gcGxhbmUKICAqIEBwbGFuZTogZHJtIHBsYW5lIHRvIHByZXBhcmUgZm9y
CkBAIC0xNDE1MywxNiArMTQxNjQsMTEgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3Qg
ZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0
b19pOTE1KHBsYW5lLT5kZXYpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gbmV3X3N0
YXRlLT5mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2Jq
KGZiKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX2ZiX29i
aihwbGFuZS0+c3RhdGUtPmZiKTsKIAlpbnQgcmV0OwogCi0JaWYgKCFvYmogJiYgIW9sZF9vYmop
Ci0JCXJldHVybiAwOwotCi0JaWYgKG9sZF9vYmopIHsKLQkJc3RydWN0IGRybV9jcnRjX3N0YXRl
ICpjcnRjX3N0YXRlID0KLQkJCWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUobmV3
X3N0YXRlLT5zdGF0ZSwKLQkJCQkJCQkgICBwbGFuZS0+c3RhdGUtPmNydGMpOworCWlmIChwbGFu
ZS0+c3RhdGUtPmZiICYmIG9sZF9wbGFuZV9uZWVkc19tb2Rlc2V0KHBsYW5lLCBuZXdfc3RhdGUp
KSB7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0KKwkJCWludGVsX2Zi
X29iaihwbGFuZS0+c3RhdGUtPmZiKTsKIAogCQkvKiBCaWcgSGFtbWVyLCB3ZSBhbHNvIG5lZWQg
dG8gZW5zdXJlIHRoYXQgYW55IHBlbmRpbmcKIAkJICogTUlfV0FJVF9GT1JfRVZFTlQgaW5zaWRl
IGEgdXNlciBiYXRjaCBidWZmZXIgb24gdGhlCkBAIC0xNDE3NSwxNCArMTQxODEsMTIgQEAgaW50
ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJICogVGhpcyBz
aG91bGQgb25seSBmYWlsIHVwb24gYSBodW5nIEdQVSwgaW4gd2hpY2ggY2FzZSB3ZQogCQkgKiBj
YW4gc2FmZWx5IGNvbnRpbnVlLgogCQkgKi8KLQkJaWYgKG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0
ZSkpIHsKLQkJCXJldCA9IGk5MTVfc3dfZmVuY2VfYXdhaXRfcmVzZXJ2YXRpb24oJmludGVsX3N0
YXRlLT5jb21taXRfcmVhZHksCi0JCQkJCQkJICAgICAgb2xkX29iai0+cmVzdiwgTlVMTCwKLQkJ
CQkJCQkgICAgICBmYWxzZSwgMCwKLQkJCQkJCQkgICAgICBHRlBfS0VSTkVMKTsKLQkJCWlmIChy
ZXQgPCAwKQotCQkJCXJldHVybiByZXQ7Ci0JCX0KKwkJcmV0ID0gaTkxNV9zd19mZW5jZV9hd2Fp
dF9yZXNlcnZhdGlvbigmaW50ZWxfc3RhdGUtPmNvbW1pdF9yZWFkeSwKKwkJCQkJCSAgICAgIG9s
ZF9vYmotPnJlc3YsIE5VTEwsCisJCQkJCQkgICAgICBmYWxzZSwgMCwKKwkJCQkJCSAgICAgIEdG
UF9LRVJORUwpOworCQlpZiAocmV0IDwgMCkKKwkJCXJldHVybiByZXQ7CiAJfQogCiAJaWYgKG5l
d19zdGF0ZS0+ZmVuY2UpIHsgLyogZXhwbGljaXQgZmVuY2luZyAqLwpAQCAtMTQyMjEsNyArMTQy
MjUsNyBAQCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog
CiAJCXZtYSA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGZiLCBuZXdfc3RhdGUtPnJvdGF0
aW9uKTsKIAkJaWYgKElTX0VSUih2bWEpKQotCQkJcmV0ID0gUFRSX0VSUih2bWEpOworCQkJcmV0
dXJuIFBUUl9FUlIodm1hKTsKIAogCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShuZXdfc3RhdGUpLT52
bWEgPSB2bWE7CiAJfQotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK