From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 13/22] drm/i915: Move the partial and rotated
	view data into the same union
Date: Wed, 14 Oct 2015 19:29:05 +0300
Message-ID: <1444840154-7804-14-git-send-email-ville.syrjala@linux.intel.com>
References: <1444840154-7804-1-git-send-email-ville.syrjala@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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 8E7DD6ED34
 for <intel-gfx@lists.freedesktop.org>; Wed, 14 Oct 2015 09:30:07 -0700 (PDT)
In-Reply-To: <1444840154-7804-1-git-send-email-ville.syrjala@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
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkVh
Y2ggZ3R0IHZpZXcgb25seSBoYXMgYSBzaW5nbGUgdHlwZSwgYW5kIHNvIGRvbid0IG5lZWQgdG8g
Y29udGFpbiBkYXRhCmZvciBib3RoIHJvdGF0ZWQgYW5kIHBhcnRpYWwgdmlld3MuIFNvIHdlIGNh
biBtb3ZlIHRoZSBkYXRhIGludG8gdGhlCnNhbWUgdW5pb24gdG8gYXZvaWQgd2FzdGluZyBzcGFj
ZS4KCkFsc28gcmVuYW1lICdyb3RhdGlvbl9pbmZvJyB0byAncm90YXRlZCcgdG8gbWF0Y2ggdGhl
IHZpZXcgdHlwZSBleGFjdGx5LAp0aGlzIHNob3VsZCBhdm9pZCBjb25mdXNpb24gd2hpY2ggdW5p
b24gbWVtYmVycyBpcyB2YWxpZCBmb3IgZWFjaCB2aWV3CnR5cGUuIEFsc28gbWFrZSB0aGUgdW5p
b24gYW5vbnltb3VzIHRvIGF2b2lkIHRoZSAucGFyYW1zLiBzdHVmZiBhbGwKb3Zlci4KClNpZ25l
ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+
Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgIHwgMTAgKysrKystLS0t
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgIHwgMTIgKysrKysrLS0tLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCAgfCAxMSArKysrLS0tLS0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDQgKystLQogNCBmaWxlcyBj
aGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW0uYwppbmRleCBlNTcwNjFhLi5iOTNlZDE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK
QEAgLTE3NzIsMTIgKzE3NzIsMTIgQEAgaW50IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVh
X3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKIAogCQltZW1zZXQoJnZpZXcsIDAs
IHNpemVvZih2aWV3KSk7CiAJCXZpZXcudHlwZSA9IEk5MTVfR0dUVF9WSUVXX1BBUlRJQUw7Ci0J
CXZpZXcucGFyYW1zLnBhcnRpYWwub2Zmc2V0ID0gcm91bmRkb3duKHBhZ2Vfb2Zmc2V0LCBjaHVu
a19zaXplKTsKLQkJdmlldy5wYXJhbXMucGFydGlhbC5zaXplID0KKwkJdmlldy5wYXJ0aWFsLm9m
ZnNldCA9IHJvdW5kZG93bihwYWdlX29mZnNldCwgY2h1bmtfc2l6ZSk7CisJCXZpZXcucGFydGlh
bC5zaXplID0KIAkJCW1pbl90KHVuc2lnbmVkIGludCwKIAkJCSAgICAgIGNodW5rX3NpemUsCiAJ
CQkgICAgICAodm1hLT52bV9lbmQgLSB2bWEtPnZtX3N0YXJ0KS9QQUdFX1NJWkUgLQotCQkJICAg
ICAgdmlldy5wYXJhbXMucGFydGlhbC5vZmZzZXQpOworCQkJICAgICAgdmlldy5wYXJ0aWFsLm9m
ZnNldCk7CiAJfQogCiAJLyogTm93IHBpbiBpdCBpbnRvIHRoZSBHVFQgaWYgbmVlZGVkICovCkBA
IC0xODA1LDEwICsxODA1LDEwIEBAIGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fYXJlYV9z
dHJ1Y3QgKnZtYSwgc3RydWN0IHZtX2ZhdWx0ICp2bWYpCiAJCSAqIGhhdmluZyBhY2Nlc3NlZCBp
dCBiZWZvcmUgKGF0IHRoaXMgcGFydGlhbHMnIHJhbmdlKS4KIAkJICovCiAJCXVuc2lnbmVkIGxv
bmcgYmFzZSA9IHZtYS0+dm1fc3RhcnQgKwotCQkJCSAgICAgKHZpZXcucGFyYW1zLnBhcnRpYWwu
b2Zmc2V0IDw8IFBBR0VfU0hJRlQpOworCQkJCSAgICAgKHZpZXcucGFydGlhbC5vZmZzZXQgPDwg
UEFHRV9TSElGVCk7CiAJCXVuc2lnbmVkIGludCBpOwogCi0JCWZvciAoaSA9IDA7IGkgPCB2aWV3
LnBhcmFtcy5wYXJ0aWFsLnNpemU7IGkrKykgeworCQlmb3IgKGkgPSAwOyBpIDwgdmlldy5wYXJ0
aWFsLnNpemU7IGkrKykgewogCQkJcmV0ID0gdm1faW5zZXJ0X3Bmbih2bWEsIGJhc2UgKyBpICog
UEFHRV9TSVpFLCBwZm4gKyBpKTsKIAkJCWlmIChyZXQpCiAJCQkJYnJlYWs7CmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDcxYWNjNzEuLmUwYmFmZjIgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMjgyLDcgKzMyODIsNyBAQCBzdGF0aWMgc3RydWN0IHNn
X3RhYmxlICoKIGludGVsX3JvdGF0ZV9mYl9vYmpfcGFnZXMoc3RydWN0IGk5MTVfZ2d0dF92aWV3
ICpnZ3R0X3ZpZXcsCiAJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7Ci0J
c3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gKnJvdF9pbmZvID0gJmdndHRfdmlldy0+cm90YXRp
b25faW5mbzsKKwlzdHJ1Y3QgaW50ZWxfcm90YXRpb25faW5mbyAqcm90X2luZm8gPSAmZ2d0dF92
aWV3LT5yb3RhdGVkOwogCXVuc2lnbmVkIGludCBzaXplX3BhZ2VzID0gcm90X2luZm8tPnNpemUg
Pj4gUEFHRV9TSElGVDsKIAl1bnNpZ25lZCBpbnQgc2l6ZV9wYWdlc191djsKIAlzdHJ1Y3Qgc2df
cGFnZV9pdGVyIHNnX2l0ZXI7CkBAIC0zMzgwLDE2ICszMzgwLDE2IEBAIGludGVsX3BhcnRpYWxf
cGFnZXMoY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3LAogCWlmICghc3QpCiAJCWdv
dG8gZXJyX3N0X2FsbG9jOwogCi0JcmV0ID0gc2dfYWxsb2NfdGFibGUoc3QsIHZpZXctPnBhcmFt
cy5wYXJ0aWFsLnNpemUsIEdGUF9LRVJORUwpOworCXJldCA9IHNnX2FsbG9jX3RhYmxlKHN0LCB2
aWV3LT5wYXJ0aWFsLnNpemUsIEdGUF9LRVJORUwpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3Nn
X2FsbG9jOwogCiAJc2cgPSBzdC0+c2dsOwogCXN0LT5uZW50cyA9IDA7CiAJZm9yX2VhY2hfc2df
cGFnZShvYmotPnBhZ2VzLT5zZ2wsICZvYmpfc2dfaXRlciwgb2JqLT5wYWdlcy0+bmVudHMsCi0J
CXZpZXctPnBhcmFtcy5wYXJ0aWFsLm9mZnNldCkKKwkJdmlldy0+cGFydGlhbC5vZmZzZXQpCiAJ
ewotCQlpZiAoc3QtPm5lbnRzID49IHZpZXctPnBhcmFtcy5wYXJ0aWFsLnNpemUpCisJCWlmIChz
dC0+bmVudHMgPj0gdmlldy0+cGFydGlhbC5zaXplKQogCQkJYnJlYWs7CiAKIAkJc2dfc2V0X3Bh
Z2Uoc2csIE5VTEwsIFBBR0VfU0laRSwgMCk7CkBAIC0zNTE0LDkgKzM1MTQsOSBAQCBpOTE1X2dn
dHRfdmlld19zaXplKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKHZpZXct
PnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdfTk9STUFMKSB7CiAJCXJldHVybiBvYmotPmJhc2Uuc2l6
ZTsKIAl9IGVsc2UgaWYgKHZpZXctPnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdfUk9UQVRFRCkgewot
CQlyZXR1cm4gdmlldy0+cm90YXRpb25faW5mby5zaXplOworCQlyZXR1cm4gdmlldy0+cm90YXRl
ZC5zaXplOwogCX0gZWxzZSBpZiAodmlldy0+dHlwZSA9PSBJOTE1X0dHVFRfVklFV19QQVJUSUFM
KSB7Ci0JCXJldHVybiB2aWV3LT5wYXJhbXMucGFydGlhbC5zaXplIDw8IFBBR0VfU0hJRlQ7CisJ
CXJldHVybiB2aWV3LT5wYXJ0aWFsLnNpemUgPDwgUEFHRV9TSElGVDsKIAl9IGVsc2UgewogCQlX
QVJOX09OQ0UoMSwgIkdHVFQgdmlldyAldSBub3QgaW1wbGVtZW50ZWQhXG4iLCB2aWV3LT50eXBl
KTsKIAkJcmV0dXJuIG9iai0+YmFzZS5zaXplOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu
aAppbmRleCBhMjE2Mzk3Li5jYWExODJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu
aApAQCAtMTUxLDE3ICsxNTEsMTQgQEAgc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gewogc3Ry
dWN0IGk5MTVfZ2d0dF92aWV3IHsKIAllbnVtIGk5MTVfZ2d0dF92aWV3X3R5cGUgdHlwZTsKIAor
CXN0cnVjdCBzZ190YWJsZSAqcGFnZXM7CisKIAl1bmlvbiB7CisJCXN0cnVjdCBpbnRlbF9yb3Rh
dGlvbl9pbmZvIHJvdGF0ZWQ7CiAJCXN0cnVjdCB7CiAJCQl1NjQgb2Zmc2V0OwogCQkJdW5zaWdu
ZWQgaW50IHNpemU7CiAJCX0gcGFydGlhbDsKLQl9IHBhcmFtczsKLQotCXN0cnVjdCBzZ190YWJs
ZSAqcGFnZXM7Ci0KLQl1bmlvbiB7Ci0JCXN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvIHJvdGF0
aW9uX2luZm87CiAJfTsKIH07CiAKQEAgLTU1Nyw3ICs1NTQsNyBAQCBpOTE1X2dndHRfdmlld19l
cXVhbChjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKmEsCiAJaWYgKGEtPnR5cGUgIT0gYi0+
dHlwZSkKIAkJcmV0dXJuIGZhbHNlOwogCWlmIChhLT50eXBlID09IEk5MTVfR0dUVF9WSUVXX1BB
UlRJQUwpCi0JCXJldHVybiAhbWVtY21wKCZhLT5wYXJhbXMsICZiLT5wYXJhbXMsIHNpemVvZihh
LT5wYXJhbXMpKTsKKwkJcmV0dXJuICFtZW1jbXAoJmEtPnBhcnRpYWwsICZiLT5wYXJ0aWFsLCBz
aXplb2YoYS0+cGFydGlhbCkpOwogCXJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMKaW5kZXggODBlOWYyZS4uY2UzNDZjZmUgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyODAsNyArMjI4MCw3IEBAIGludGVsX2ZpbGxfZmJfZ2d0
dF92aWV3KHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldywKIAkJCXVuc2lnbmVkIGludCByb3Rh
dGlvbikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGZi
LT5kZXYpOwotCXN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvICppbmZvID0gJnZpZXctPnJvdGF0
aW9uX2luZm87CisJc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gKmluZm8gPSAmdmlldy0+cm90
YXRlZDsKIAl1bnNpZ25lZCBpbnQgdGlsZV9zaXplLCB0aWxlX3dpZHRoLCB0aWxlX2hlaWdodCwg
Y3BwOwogCiAJKnZpZXcgPSBpOTE1X2dndHRfdmlld19ub3JtYWw7CkBAIC0zMDIwLDcgKzMwMjAs
NyBAQCB1bnNpZ25lZCBsb25nIGludGVsX3BsYW5lX29ial9vZmZzZXQoc3RydWN0IGludGVsX3Bs
YW5lICppbnRlbF9wbGFuZSwKIAlvZmZzZXQgPSAodW5zaWduZWQgY2hhciAqKXZtYS0+bm9kZS5z
dGFydDsKIAogCWlmIChwbGFuZSA9PSAxKSB7Ci0JCW9mZnNldCArPSB2bWEtPmdndHRfdmlldy5y
b3RhdGlvbl9pbmZvLnV2X3N0YXJ0X3BhZ2UgKgorCQlvZmZzZXQgKz0gdm1hLT5nZ3R0X3ZpZXcu
cm90YXRlZC51dl9zdGFydF9wYWdlICoKIAkJCSAgUEFHRV9TSVpFOwogCX0KIAotLSAKMi40LjkK
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm
eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==