From: Tvrtko Ursulin Subject: [PATCH 6/8] drm/i915: Support NV12 in rotated GGTT mapping Date: Fri, 8 May 2015 13:02:41 +0100 Message-ID: <1431086563-4498-7-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1431086563-4498-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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A9A86E909 for ; Fri, 8 May 2015 05:03:12 -0700 (PDT) In-Reply-To: <1431086563-4498-1-git-send-email-tvrtko.ursulin@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkp1c3QgYWRk aW5nIHRoZSByb3RhdGVkIFVWIHBsYW5lIGF0IHRoZSBlbmQgb2YgdGhlIHJvdGF0ZWQgWSBwbGFu ZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgIHwgNDcgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaCAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBkN2YyZTVkLi5iZjNlZTQ0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMjY5MywxMiArMjY5MywxOCBAQCBp bnRlbF9jYWxjX3RpbGVkX2dlb21ldHJ5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgIHVu c2lnbmVkIGludCBwbGFuZSkKIHsKIAl1bnNpZ25lZCBpbnQgdGlsZV9oZWlnaHQsIHRpbGVfcGl0 Y2g7CisJdW5zaWduZWQgaW50IGhlaWdodDsKKworCWlmIChyb3RfaW5mby0+cGl4ZWxfZm9ybWF0 ID09IERSTV9GT1JNQVRfTlYxMiAmJiBwbGFuZSA9PSAxKQorCQloZWlnaHQgPSByb3RfaW5mby0+ aGVpZ2h0IC8gMjsKKwllbHNlCisJCWhlaWdodCA9IHJvdF9pbmZvLT5oZWlnaHQ7CiAKIAl0aWxl X2hlaWdodCA9IGludGVsX3RpbGVfaGVpZ2h0KGRldiwgcm90X2luZm8tPnBpeGVsX2Zvcm1hdCwK IAkJCQkJcm90X2luZm8tPmZiX21vZGlmaWVyLCBwbGFuZSk7CiAJdGlsZV9waXRjaCA9IFBBR0Vf U0laRSAvIHRpbGVfaGVpZ2h0OwogCSp3aWR0aF9wYWdlcyA9IERJVl9ST1VORF9VUChyb3RfaW5m by0+cGl0Y2gsIHRpbGVfcGl0Y2gpOwotCSpoZWlnaHRfcGFnZXMgPSBESVZfUk9VTkRfVVAocm90 X2luZm8tPmhlaWdodCwgdGlsZV9oZWlnaHQpOworCSpoZWlnaHRfcGFnZXMgPSBESVZfUk9VTkRf VVAoaGVpZ2h0LCB0aWxlX2hlaWdodCk7CiAKIAlyZXR1cm4gKCp3aWR0aF9wYWdlcykgKiAoKmhl aWdodF9wYWdlcyk7CiB9CkBAIC0yNzA5LDEyICsyNzE1LDE1IEBAIGludGVsX3JvdGF0ZV9mYl9v YmpfcGFnZXMoc3RydWN0IGk5MTVfZ2d0dF92aWV3ICpnZ3R0X3ZpZXcsCiB7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IG9iai0+YmFzZS5kZXY7CiAJc3RydWN0IGludGVsX3JvdGF0aW9uX2lu Zm8gKnJvdF9pbmZvID0gJmdndHRfdmlldy0+cm90YXRpb25faW5mbzsKLQl1bnNpZ25lZCBsb25n IHBhZ2VzLCByb3RfcGFnZXM7CisJdW5zaWduZWQgbG9uZyBwYWdlcywgcm90X3BhZ2VzLCByb3Rf cGFnZXNfdXYgPSAwOwogCXN0cnVjdCBzZ19wYWdlX2l0ZXIgc2dfaXRlcjsKIAl1bnNpZ25lZCBs b25nIGk7CiAJZG1hX2FkZHJfdCAqcGFnZV9hZGRyX2xpc3Q7CiAJc3RydWN0IHNnX3RhYmxlICpz dDsKIAl1bnNpZ25lZCBpbnQgd2lkdGhfcGFnZXMsIGhlaWdodF9wYWdlczsKKwl1bnNpZ25lZCBp bnQgd2lkdGhfcGFnZXNfdXYsIGhlaWdodF9wYWdlc191djsKKwl1bnNpZ25lZCBpbnQgdXZfc3Rh cnRfcGFnZTsKKwlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOwogCWludCByZXQgPSAtRU5PTUVNOwog CiAJcGFnZXMgPSBvYmotPmJhc2Uuc2l6ZSAvIFBBR0VfU0laRTsKQEAgLTI3MjMsNiArMjczMiwx MyBAQCBpbnRlbF9yb3RhdGVfZmJfb2JqX3BhZ2VzKHN0cnVjdCBpOTE1X2dndHRfdmlldyAqZ2d0 dF92aWV3LAogCXJvdF9wYWdlcyA9IGludGVsX2NhbGNfdGlsZWRfZ2VvbWV0cnkoZGV2LCByb3Rf aW5mbywKIAkJCQkJICAgICAgJndpZHRoX3BhZ2VzLCAmaGVpZ2h0X3BhZ2VzLCAwKTsKIAorCS8q IEFjY291bnQgZm9yIFVWIHBsYW5lIHdpdGggTlYxMi4gKi8KKwlpZiAocm90X2luZm8tPnBpeGVs X2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKKwkJcm90X3BhZ2VzX3V2ID0gaW50ZWxfY2Fs Y190aWxlZF9nZW9tZXRyeShkZXYsIHJvdF9pbmZvLAorCQkJCQkJCSAmd2lkdGhfcGFnZXNfdXYs CisJCQkJCQkJICZoZWlnaHRfcGFnZXNfdXYsIDEpOworCX0KKwogCS8qIEFsbG9jYXRlIGEgdGVt cG9yYXJ5IGxpc3Qgb2Ygc291cmNlIHBhZ2VzIGZvciByYW5kb20gYWNjZXNzLiAqLwogCXBhZ2Vf YWRkcl9saXN0ID0gZHJtX21hbGxvY19hYihwYWdlcywgc2l6ZW9mKGRtYV9hZGRyX3QpKTsKIAlp ZiAoIXBhZ2VfYWRkcl9saXN0KQpAQCAtMjczMyw3ICsyNzQ5LDcgQEAgaW50ZWxfcm90YXRlX2Zi X29ial9wYWdlcyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKmdndHRfdmlldywKIAlpZiAoIXN0KQog CQlnb3RvIGVycl9zdF9hbGxvYzsKIAotCXJldCA9IHNnX2FsbG9jX3RhYmxlKHN0LCByb3RfcGFn ZXMsIEdGUF9LRVJORUwpOworCXJldCA9IHNnX2FsbG9jX3RhYmxlKHN0LCByb3RfcGFnZXMgKyBy b3RfcGFnZXNfdXYsIEdGUF9LRVJORUwpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3NnX2FsbG9j OwogCkBAIC0yNzQ1LDEzICsyNzYxLDI4IEBAIGludGVsX3JvdGF0ZV9mYl9vYmpfcGFnZXMoc3Ry dWN0IGk5MTVfZ2d0dF92aWV3ICpnZ3R0X3ZpZXcsCiAJfQogCiAJLyogUm90YXRlIHRoZSBwYWdl cy4gKi8KLQlyb3RhdGVfcGFnZXMocGFnZV9hZGRyX2xpc3QsIDAsIHdpZHRoX3BhZ2VzLCBoZWln aHRfcGFnZXMsIHN0LCBOVUxMKTsKKwlzZyA9IHJvdGF0ZV9wYWdlcyhwYWdlX2FkZHJfbGlzdCwg MCwKKwkJCSAgd2lkdGhfcGFnZXMsIGhlaWdodF9wYWdlcywKKwkJCSAgc3QsIE5VTEwpOworCisJ LyogQXBwZW5kIHRoZSBVViBwbGFuZSBpZiBOVjEyLiAqLworCWlmIChyb3RfaW5mby0+cGl4ZWxf Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikgeworCQl1dl9zdGFydF9wYWdlID0gcm90X3BhZ2Vz OworCisJCS8qIENoZWNrIGZvciB0aWxlLXJvdyB1bi1hbGlnbm1lbnQuICovCisJCWlmIChvZmZz ZXRfaW5fcGFnZShyb3RfaW5mby0+dXZfb2Zmc2V0KSkKKwkJCXV2X3N0YXJ0X3BhZ2UtLTsKKwor CQlyb3RhdGVfcGFnZXMocGFnZV9hZGRyX2xpc3QsIHV2X3N0YXJ0X3BhZ2UsCisJCQkgICAgIHdp ZHRoX3BhZ2VzX3V2LCBoZWlnaHRfcGFnZXNfdXYsCisJCQkgICAgIHN0LCBzZyk7CisJfQogCiAJ RFJNX0RFQlVHX0tNUygKLQkJICAgICAgIkNyZWF0ZWQgcm90YXRlZCBwYWdlIG1hcHBpbmcgZm9y IG9iamVjdCBzaXplICVsdSAocGl0Y2g9JXUsIGhlaWdodD0ldSwgcGl4ZWxfZm9ybWF0PTB4JXgs ICV1eCV1IHRpbGVzLCAlbHUgcGFnZXMpLlxuIiwKKwkJICAgICAgIkNyZWF0ZWQgcm90YXRlZCBw YWdlIG1hcHBpbmcgZm9yIG9iamVjdCBzaXplICVsdSAocGl0Y2g9JXUsIGhlaWdodD0ldSwgcGl4 ZWxfZm9ybWF0PTB4JXgsICV1eCV1IHRpbGVzLCAlbHUgcGFnZXMgKCVsdSBwbGFuZSAwKSkuXG4i LAogCQkgICAgICBvYmotPmJhc2Uuc2l6ZSwgcm90X2luZm8tPnBpdGNoLCByb3RfaW5mby0+aGVp Z2h0LAogCQkgICAgICByb3RfaW5mby0+cGl4ZWxfZm9ybWF0LCB3aWR0aF9wYWdlcywgaGVpZ2h0 X3BhZ2VzLAotCQkgICAgICByb3RfcGFnZXMpOworCQkgICAgICByb3RfcGFnZXMgKyByb3RfcGFn ZXNfdXYsIHJvdF9wYWdlcyk7CiAKIAlkcm1fZnJlZV9sYXJnZShwYWdlX2FkZHJfbGlzdCk7CiAK QEAgLTI3NjMsMTAgKzI3OTQsMTAgQEAgZXJyX3N0X2FsbG9jOgogCWRybV9mcmVlX2xhcmdlKHBh Z2VfYWRkcl9saXN0KTsKIAogCURSTV9ERUJVR19LTVMoCi0JCSAgICAgICJGYWlsZWQgdG8gY3Jl YXRlIHJvdGF0ZWQgbWFwcGluZyBmb3Igb2JqZWN0IHNpemUgJWx1ISAoJWQpIChwaXRjaD0ldSwg aGVpZ2h0PSV1LCBwaXhlbF9mb3JtYXQ9MHgleCwgJXV4JXUgdGlsZXMsICVsdSBwYWdlcylcbiIs CisJCSAgICAgICJGYWlsZWQgdG8gY3JlYXRlIHJvdGF0ZWQgbWFwcGluZyBmb3Igb2JqZWN0IHNp emUgJWx1ISAoJWQpIChwaXRjaD0ldSwgaGVpZ2h0PSV1LCBwaXhlbF9mb3JtYXQ9MHgleCwgJXV4 JXUgdGlsZXMsICVsdSBwYWdlcyAoJWx1IHBsYW5lIDApKVxuIiwKIAkJICAgICAgb2JqLT5iYXNl LnNpemUsIHJldCwgcm90X2luZm8tPnBpdGNoLCByb3RfaW5mby0+aGVpZ2h0LAogCQkgICAgICBy b3RfaW5mby0+cGl4ZWxfZm9ybWF0LCB3aWR0aF9wYWdlcywgaGVpZ2h0X3BhZ2VzLAotCQkgICAg ICByb3RfcGFnZXMpOworCQkgICAgICByb3RfcGFnZXMgKyByb3RfcGFnZXNfdXYsIHJvdF9wYWdl cyk7CiAJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaAppbmRleCA0ZTZjYWM1Li41MTE4ZGExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaApAQCAtMTIzLDYgKzEyMyw3IEBAIGVudW0gaTkxNV9nZ3R0X3ZpZXdfdHlwZSB7CiBzdHJ1 Y3QgaW50ZWxfcm90YXRpb25faW5mbyB7CiAJdW5zaWduZWQgaW50IGhlaWdodDsKIAl1bnNpZ25l ZCBpbnQgcGl0Y2g7CisJdW5zaWduZWQgaW50IHV2X29mZnNldDsKIAl1aW50MzJfdCBwaXhlbF9m b3JtYXQ7CiAJdWludDY0X3QgZmJfbW9kaWZpZXI7CiB9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IGE4N2ZhY2EuLmI0YmY5OTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTIzNDYsNiArMjM0Niw3IEBAIGludGVsX2ZpbGxfZmJfZ2d0dF92aWV3 KHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs CiAJaW5mby0+cGl4ZWxfZm9ybWF0ID0gZmItPnBpeGVsX2Zvcm1hdDsKIAlpbmZvLT5waXRjaCA9 IGZiLT5waXRjaGVzWzBdOwogCWluZm8tPmZiX21vZGlmaWVyID0gZmItPm1vZGlmaWVyWzBdOwor CWluZm8tPnV2X29mZnNldCA9IGZiLT5vZmZzZXRzWzFdOwogCiAJcmV0dXJuIDA7CiB9Ci0tIAoy LjQuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK