From: Tvrtko Ursulin Subject: [PATCH 2/3] drm/i915: Move rotated geometry calculations into the fill helper Date: Tue, 23 Jun 2015 11:04:41 +0100 Message-ID: <1435053882-27849-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1435053882-27849-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id B2D5F6E92C for ; Tue, 23 Jun 2015 03:04:48 -0700 (PDT) In-Reply-To: <1435053882-27849-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgd2F5 IGRhdGEgaXMgYXZhaWxhYmxlIGFzIHNvb24gYXMgdGhlIHZpZXcgaXMgcGFzc2VkIGludG8gdGhl IGNhbGwgY2hhaW4uCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3Vs aW5AaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXgu aW50ZWwuY29tPgotLS0KVGhpcyB3aWxsIGJlIG5lZWRlZCBpbiB0aGUgZm9sbG93aW5nIHBhdGNo IHdoaWNoIGZpeGVzIGk5MTVfZ2d0dF92aWV3X3NpemUuCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgIHwgMzUgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oICB8ICAyICsrCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgOCArKysrKysrKwogMyBmaWxlcyBjaGFu Z2VkLCAyMiBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCmluZGV4IGMxYzE2YjAuLjQzNDcyYzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCkBAIC0yNzAwLDI5ICsyNzAwLDE2IEBAIHN0YXRpYyBzdHJ1Y3Qgc2dfdGFi bGUgKgogaW50ZWxfcm90YXRlX2ZiX29ial9wYWdlcyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKmdn dHRfdmlldywKIAkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRldjsKIAlzdHJ1Y3QgaW50ZWxfcm90YXRp b25faW5mbyAqcm90X2luZm8gPSAmZ2d0dF92aWV3LT5yb3RhdGlvbl9pbmZvOwotCXVuc2lnbmVk IGxvbmcgcGFnZXMsIHJvdF9wYWdlczsKIAlzdHJ1Y3Qgc2dfcGFnZV9pdGVyIHNnX2l0ZXI7CiAJ dW5zaWduZWQgbG9uZyBpOwogCWRtYV9hZGRyX3QgKnBhZ2VfYWRkcl9saXN0OwogCXN0cnVjdCBz Z190YWJsZSAqc3Q7Ci0JdW5zaWduZWQgaW50IHRpbGVfcGl0Y2gsIHRpbGVfaGVpZ2h0OwotCXVu c2lnbmVkIGludCB3aWR0aF9wYWdlcywgaGVpZ2h0X3BhZ2VzOwogCWludCByZXQgPSAtRU5PTUVN OwogCi0JcGFnZXMgPSBvYmotPmJhc2Uuc2l6ZSAvIFBBR0VfU0laRTsKLQotCS8qIENhbGN1bGF0 ZSB0aWxpbmcgZ2VvbWV0cnkuICovCi0JdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChk ZXYsIHJvdF9pbmZvLT5waXhlbF9mb3JtYXQsCi0JCQkJCXJvdF9pbmZvLT5mYl9tb2RpZmllcik7 Ci0JdGlsZV9waXRjaCA9IFBBR0VfU0laRSAvIHRpbGVfaGVpZ2h0OwotCXdpZHRoX3BhZ2VzID0g RElWX1JPVU5EX1VQKHJvdF9pbmZvLT5waXRjaCwgdGlsZV9waXRjaCk7Ci0JaGVpZ2h0X3BhZ2Vz ID0gRElWX1JPVU5EX1VQKHJvdF9pbmZvLT5oZWlnaHQsIHRpbGVfaGVpZ2h0KTsKLQlyb3RfcGFn ZXMgPSB3aWR0aF9wYWdlcyAqIGhlaWdodF9wYWdlczsKLQogCS8qIEFsbG9jYXRlIGEgdGVtcG9y YXJ5IGxpc3Qgb2Ygc291cmNlIHBhZ2VzIGZvciByYW5kb20gYWNjZXNzLiAqLwotCXBhZ2VfYWRk cl9saXN0ID0gZHJtX21hbGxvY19hYihwYWdlcywgc2l6ZW9mKGRtYV9hZGRyX3QpKTsKKwlwYWdl X2FkZHJfbGlzdCA9IGRybV9tYWxsb2NfYWIob2JqLT5iYXNlLnNpemUgLyBQQUdFX1NJWkUsCisJ CQkJICAgICAgIHNpemVvZihkbWFfYWRkcl90KSk7CiAJaWYgKCFwYWdlX2FkZHJfbGlzdCkKIAkJ cmV0dXJuIEVSUl9QVFIocmV0KTsKIApAQCAtMjczMSw3ICsyNzE4LDcgQEAgaW50ZWxfcm90YXRl X2ZiX29ial9wYWdlcyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKmdndHRfdmlldywKIAlpZiAoIXN0 KQogCQlnb3RvIGVycl9zdF9hbGxvYzsKIAotCXJldCA9IHNnX2FsbG9jX3RhYmxlKHN0LCByb3Rf cGFnZXMsIEdGUF9LRVJORUwpOworCXJldCA9IHNnX2FsbG9jX3RhYmxlKHN0LCByb3RfaW5mby0+ cGFnZXMsIEdGUF9LRVJORUwpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3NnX2FsbG9jOwogCkBA IC0yNzQzLDEzICsyNzMwLDE1IEBAIGludGVsX3JvdGF0ZV9mYl9vYmpfcGFnZXMoc3RydWN0IGk5 MTVfZ2d0dF92aWV3ICpnZ3R0X3ZpZXcsCiAJfQogCiAJLyogUm90YXRlIHRoZSBwYWdlcy4gKi8K LQlyb3RhdGVfcGFnZXMocGFnZV9hZGRyX2xpc3QsIHdpZHRoX3BhZ2VzLCBoZWlnaHRfcGFnZXMs IHN0KTsKKwlyb3RhdGVfcGFnZXMocGFnZV9hZGRyX2xpc3QsCisJCSAgICAgcm90X2luZm8tPndp ZHRoX3BhZ2VzLCByb3RfaW5mby0+aGVpZ2h0X3BhZ2VzLAorCQkgICAgIHN0KTsKIAogCURSTV9E RUJVR19LTVMoCi0JCSAgICAgICJDcmVhdGVkIHJvdGF0ZWQgcGFnZSBtYXBwaW5nIGZvciBvYmpl Y3Qgc2l6ZSAlbHUgKHBpdGNoPSV1LCBoZWlnaHQ9JXUsIHBpeGVsX2Zvcm1hdD0weCV4LCAldXgl dSB0aWxlcywgJWx1IHBhZ2VzKS5cbiIsCisJCSAgICAgICJDcmVhdGVkIHJvdGF0ZWQgcGFnZSBt YXBwaW5nIGZvciBvYmplY3Qgc2l6ZSAlbHUgKHBpdGNoPSV1LCBoZWlnaHQ9JXUsIHBpeGVsX2Zv cm1hdD0weCV4LCAldXgldSB0aWxlcywgJXUgcGFnZXMpLlxuIiwKIAkJICAgICAgb2JqLT5iYXNl LnNpemUsIHJvdF9pbmZvLT5waXRjaCwgcm90X2luZm8tPmhlaWdodCwKLQkJICAgICAgcm90X2lu Zm8tPnBpeGVsX2Zvcm1hdCwgd2lkdGhfcGFnZXMsIGhlaWdodF9wYWdlcywKLQkJICAgICAgcm90 X3BhZ2VzKTsKKwkJICAgICAgcm90X2luZm8tPnBpeGVsX2Zvcm1hdCwgcm90X2luZm8tPndpZHRo X3BhZ2VzLAorCQkgICAgICByb3RfaW5mby0+aGVpZ2h0X3BhZ2VzLCByb3RfaW5mby0+cGFnZXMp OwogCiAJZHJtX2ZyZWVfbGFyZ2UocGFnZV9hZGRyX2xpc3QpOwogCkBAIC0yNzYxLDEwICsyNzUw LDEwIEBAIGVycl9zdF9hbGxvYzoKIAlkcm1fZnJlZV9sYXJnZShwYWdlX2FkZHJfbGlzdCk7CiAK IAlEUk1fREVCVUdfS01TKAotCQkgICAgICAiRmFpbGVkIHRvIGNyZWF0ZSByb3RhdGVkIG1hcHBp bmcgZm9yIG9iamVjdCBzaXplICVsdSEgKCVkKSAocGl0Y2g9JXUsIGhlaWdodD0ldSwgcGl4ZWxf Zm9ybWF0PTB4JXgsICV1eCV1IHRpbGVzLCAlbHUgcGFnZXMpXG4iLAorCQkgICAgICAiRmFpbGVk IHRvIGNyZWF0ZSByb3RhdGVkIG1hcHBpbmcgZm9yIG9iamVjdCBzaXplICVsdSEgKCVkKSAocGl0 Y2g9JXUsIGhlaWdodD0ldSwgcGl4ZWxfZm9ybWF0PTB4JXgsICV1eCV1IHRpbGVzLCAldSBwYWdl cylcbiIsCiAJCSAgICAgIG9iai0+YmFzZS5zaXplLCByZXQsIHJvdF9pbmZvLT5waXRjaCwgcm90 X2luZm8tPmhlaWdodCwKLQkJICAgICAgcm90X2luZm8tPnBpeGVsX2Zvcm1hdCwgd2lkdGhfcGFn ZXMsIGhlaWdodF9wYWdlcywKLQkJICAgICAgcm90X3BhZ2VzKTsKKwkJICAgICAgcm90X2luZm8t PnBpeGVsX2Zvcm1hdCwgcm90X2luZm8tPndpZHRoX3BhZ2VzLAorCQkgICAgICByb3RfaW5mby0+ aGVpZ2h0X3BhZ2VzLCByb3RfaW5mby0+cGFnZXMpOwogCXJldHVybiBFUlJfUFRSKHJldCk7CiB9 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggNzM1ZjExOS4uMzNiOTU4MCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTEyNiw2ICsxMjYsOCBAQCBzdHJ1 Y3QgaW50ZWxfcm90YXRpb25faW5mbyB7CiAJdW5zaWduZWQgaW50IHBpdGNoOwogCXVpbnQzMl90 IHBpeGVsX2Zvcm1hdDsKIAl1aW50NjRfdCBmYl9tb2RpZmllcjsKKwl1bnNpZ25lZCBpbnQgd2lk dGhfcGFnZXMsIGhlaWdodF9wYWdlczsKKwl1bnNpZ25lZCBpbnQgcGFnZXM7CiB9OwogCiBzdHJ1 Y3QgaTkxNV9nZ3R0X3ZpZXcgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IDFiYzIxN2EuLmQ4NjQwNmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAg LTIyNjgsNiArMjI2OCw3IEBAIGludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KHN0cnVjdCBpOTE1X2dn dHRfdmlldyAqdmlldywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQljb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcm90YXRp b25faW5mbyAqaW5mbyA9ICZ2aWV3LT5yb3RhdGlvbl9pbmZvOworCXVuc2lnbmVkIGludCB0aWxl X2hlaWdodCwgdGlsZV9waXRjaDsKIAogCSp2aWV3ID0gaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsOwog CkBAIC0yMjg0LDYgKzIyODUsMTMgQEAgaW50ZWxfZmlsbF9mYl9nZ3R0X3ZpZXcoc3RydWN0IGk5 MTVfZ2d0dF92aWV3ICp2aWV3LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAlpbmZvLT5w aXRjaCA9IGZiLT5waXRjaGVzWzBdOwogCWluZm8tPmZiX21vZGlmaWVyID0gZmItPm1vZGlmaWVy WzBdOwogCisJdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChmYi0+ZGV2LCBmYi0+cGl4 ZWxfZm9ybWF0LAorCQkJCQlmYi0+bW9kaWZpZXJbMF0pOworCXRpbGVfcGl0Y2ggPSBQQUdFX1NJ WkUgLyB0aWxlX2hlaWdodDsKKwlpbmZvLT53aWR0aF9wYWdlcyA9IERJVl9ST1VORF9VUChmYi0+ cGl0Y2hlc1swXSwgdGlsZV9waXRjaCk7CisJaW5mby0+aGVpZ2h0X3BhZ2VzID0gRElWX1JPVU5E X1VQKGZiLT5oZWlnaHQsIHRpbGVfaGVpZ2h0KTsKKwlpbmZvLT5wYWdlcyA9IGluZm8tPndpZHRo X3BhZ2VzICogaW5mby0+aGVpZ2h0X3BhZ2VzOworCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuNC4y CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=