From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 07/13] drm/i915: Switch +intel_fb_align_height
	to fb format modifiers
Date: Tue, 10 Feb 2015 17:16:10 +0000
Message-ID: <1423588576-11339-8-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1423505008-15515-1-git-send-email-daniel.vetter@ffwll.ch>
 <1423588576-11339-1-git-send-email-tvrtko.ursulin@linux.intel.com>
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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 394E26E69C
 for <Intel-gfx@lists.freedesktop.org>; Tue, 10 Feb 2015 09:16:33 -0800 (PST)
In-Reply-To: <1423588576-11339-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Daniel Vetter <daniel.vetter@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KCldpdGggdGhpcyB3
ZSBjYW4gdHJlYXQgdGhlIGZiIGZvcm1hdCBtb2RpZmllciBjb21wbGV0ZWx5IGluZGVwZW5kZW50
bHkKZnJvbSB0aGUgZmVuY2luZyBtb2RlIGluIG9iai0+dGlsaW5nX21vZGUgaW4gdGhlIGluaXRp
YWwgcGxhbmUgY29kZS4KV2hpY2ggbWVhbnMgbmV3IHRpbGluZyBtb2RlcyB3aXRob3V0IGFueSBn
dHQgZmVuY2UgYXJlIG5vdyBmdWxseQpzdXBwb3J0IGluIHRoZSBjb3JlIGk5MTUgZHJpdmVyIGNv
ZGUuCgp2MjogQWxzbyBhZGQgcGl4ZWxfZm9ybWF0IHdoaWxlIGF0IGl0LCB3ZSBuZWVkIHRoaXMg
dG8gY29tcHV0ZSB0aGUKaGVpZ2h0IGZvciB0aGUgbmV3IHRpbGluZyBmb3JtYXRzLgoKU2lnbmVk
LW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+ClJldmlld2Vk
LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIwICsrKysrKysrKysrKysrLS0tLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMyArKy0KIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICB8ICAzICsrLQogMyBmaWxlcyBjaGFuZ2VkLCAx
OCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYwppbmRleCBmMjYyMmUzLi5lYzE3MmY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCkBAIC0yMTkwLDExICsyMTkwLDE1IEBAIHN0YXRpYyBib29sIG5lZWRfdnRkX3dh
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIGludAotaW50ZWxfZmJfYWxpZ25faGVpZ2h0
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBoZWlnaHQsIHVuc2lnbmVkIGludCB0aWxpbmcp
CitpbnRlbF9mYl9hbGlnbl9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGhlaWdo
dCwKKwkJICAgICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0LAorCQkgICAgICB1aW50NjRfdCBmYl9m
b3JtYXRfbW9kaWZpZXIpCiB7CiAJaW50IHRpbGVfaGVpZ2h0OwogCi0JdGlsZV9oZWlnaHQgPSB0
aWxpbmcgPyAoSVNfR0VOMihkZXYpID8gMTYgOiA4KSA6IDE7CisJdGlsZV9oZWlnaHQgPSBmYl9m
b3JtYXRfbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQgPworCQkoSVNfR0VOMihk
ZXYpID8gMTYgOiA4KSA6IDE7CisKIAlyZXR1cm4gQUxJR04oaGVpZ2h0LCB0aWxlX2hlaWdodCk7
CiB9CiAKQEAgLTY2NTgsNyArNjY2Miw4IEBAIGk5eHhfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmln
KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWZiLT5waXRjaGVzWzBdID0gdmFsICYgMHhmZmZm
ZmZjMDsKIAogCWFsaWduZWRfaGVpZ2h0ID0gaW50ZWxfZmJfYWxpZ25faGVpZ2h0KGRldiwgZmIt
PmhlaWdodCwKLQkJCQkJICAgICAgIHBsYW5lX2NvbmZpZy0+dGlsaW5nKTsKKwkJCQkJICAgICAg
IGZiLT5waXhlbF9mb3JtYXQsCisJCQkJCSAgICAgICBmYi0+bW9kaWZpZXJbMF0pOwogCiAJcGxh
bmVfY29uZmlnLT5zaXplID0gUEFHRV9BTElHTihmYi0+cGl0Y2hlc1swXSAqIGFsaWduZWRfaGVp
Z2h0KTsKIApAQCAtNzcwMCw3ICs3NzA1LDggQEAgc2t5bGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9j
b25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJZmItPnBpdGNoZXNbMF0gPSAodmFsICYg
MHgzZmYpICogc3RyaWRlX211bHQ7CiAKIAlhbGlnbmVkX2hlaWdodCA9IGludGVsX2ZiX2FsaWdu
X2hlaWdodChkZXYsIGZiLT5oZWlnaHQsCi0JCQkJCSAgICAgICBwbGFuZV9jb25maWctPnRpbGlu
Zyk7CisJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0LAorCQkJCQkgICAgICAgZmItPm1vZGlm
aWVyWzBdKTsKIAogCXBsYW5lX2NvbmZpZy0+c2l6ZSA9IEFMSUdOKGZiLT5waXRjaGVzWzBdICog
YWxpZ25lZF9oZWlnaHQsIFBBR0VfU0laRSk7CiAKQEAgLTc3OTYsNyArNzgwMiw4IEBAIGlyb25s
YWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlm
Yi0+cGl0Y2hlc1swXSA9IHZhbCAmIDB4ZmZmZmZmYzA7CiAKIAlhbGlnbmVkX2hlaWdodCA9IGlu
dGVsX2ZiX2FsaWduX2hlaWdodChkZXYsIGZiLT5oZWlnaHQsCi0JCQkJCSAgICAgICBwbGFuZV9j
b25maWctPnRpbGluZyk7CisJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0LAorCQkJCQkgICAg
ICAgZmItPm1vZGlmaWVyWzBdKTsKIAogCXBsYW5lX2NvbmZpZy0+c2l6ZSA9IFBBR0VfQUxJR04o
ZmItPnBpdGNoZXNbMF0gKiBhbGlnbmVkX2hlaWdodCk7CiAKQEAgLTEyODI0LDcgKzEyODMxLDgg
QEAgc3RhdGljIGludCBpbnRlbF9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsCiAJCXJldHVybiAtRUlOVkFMOwogCiAJYWxpZ25lZF9oZWlnaHQgPSBpbnRlbF9mYl9hbGln
bl9oZWlnaHQoZGV2LCBtb2RlX2NtZC0+aGVpZ2h0LAotCQkJCQkgICAgICAgb2JqLT50aWxpbmdf
bW9kZSk7CisJCQkJCSAgICAgICBtb2RlX2NtZC0+cGl4ZWxfZm9ybWF0LAorCQkJCQkgICAgICAg
bW9kZV9jbWQtPm1vZGlmaWVyWzBdKTsKIAkvKiBGSVhNRSBkcm0gaGVscGVyIGZvciBzaXplIGNo
ZWNrcyAoZXNwZWNpYWxseSBwbGFuYXIgZm9ybWF0cyk/ICovCiAJaWYgKG9iai0+YmFzZS5zaXpl
IDwgYWxpZ25lZF9oZWlnaHQgKiBtb2RlX2NtZC0+cGl0Y2hlc1swXSkKIAkJcmV0dXJuIC1FSU5W
QUw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDc2YjNjMjAuLmI5NTk4YmEgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC04NzksNyArODc5LDggQEAgdm9pZCBpbnRlbF9mcm9u
dGJ1ZmZlcl9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiB9CiAKIGludCBpbnRlbF9mYl9h
bGlnbl9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGhlaWdodCwKLQkJCSAgdW5z
aWduZWQgaW50IHRpbGluZyk7CisJCQkgIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCwKKwkJCSAgdWlu
dDY0X3QgZmJfZm9ybWF0X21vZGlmaWVyKTsKIHZvaWQgaW50ZWxfZmJfb2JqX2ZsdXNoKHN0cnVj
dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGJvb2wgcmV0aXJlKTsKIAogCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZmJkZXYuYwppbmRleCAzMDAxYTg2Ny4uMjM0YTY5OSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9mYmRldi5jCkBAIC01OTQsNyArNTk0LDggQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJk
ZXZfaW5pdF9iaW9zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJY3VyX3NpemUgPSBpbnRl
bF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX3ZkaXNwbGF5OwogCQljdXJf
c2l6ZSA9IGludGVsX2ZiX2FsaWduX2hlaWdodChkZXYsIGN1cl9zaXplLAotCQkJCQkJIHBsYW5l
X2NvbmZpZy0+dGlsaW5nKTsKKwkJCQkJCSBmYi0+YmFzZS5waXhlbF9mb3JtYXQsCisJCQkJCQkg
ZmItPmJhc2UubW9kaWZpZXJbMF0pOwogCQljdXJfc2l6ZSAqPSBmYi0+YmFzZS5waXRjaGVzWzBd
OwogCQlEUk1fREVCVUdfS01TKCJwaXBlICVjIGFyZWE6ICVkeCVkLCBicHA6ICVkLCBzaXplOiAl
ZFxuIiwKIAkJCSAgICAgIHBpcGVfbmFtZShpbnRlbF9jcnRjLT5waXBlKSwKLS0gCjIuMi4yCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz
LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=