From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915/skl: Consider plane rotation when calculating stride in skl_do_mmio_flip Date: Tue, 20 Oct 2015 15:54:11 +0100 Message-ID: <1445352851-26796-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 65AAD6E3DD for ; Tue, 20 Oct 2015 07:54:29 -0700 (PDT) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClByZXZpb3Vz bHkgcm90YXRpb24gd2FzIGlnbm9yZWQgYW5kIHdyb25nIHN0cmlkZSBwcm9ncmFtbWVkCmludG8g dGhlIHBsYW5lIHJlZ2lzdGVycyByZXN1bHRpbmcgaW4gYSBjb3JydXB0IGltYWdlIG9uIHNjcmVl bi4KCnYyOiBEbyBub3QgYWNjZXNzIHBvdGVudGlhbHkgb2xkIHBsYW5lIHN0YXRlIGF0IGZsaXAg dGltZSwKICAgIGJ1dCBzdG9yZSB0aGUgcm90YXRpb24gdmFsdWUgYXQgdGhlIHRpbWUgb2YgcXVl aW5nIHRoZSBmbGlwLgogICAgKFZpbGxlKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KVGVzdGNhc2U6IGlndC9rbXNfcm90YXRpb25fY3Jj L3ByaW1hcnktcm90YXRpb24tOTAtZmxpcC1zdHJlc3MgKFNLTCkKQ2M6IFNvbmlrYSBKaW5kYWwg PHNvbmlrYS5qaW5kYWxAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAzMCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0 aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDFmYzFkMjQwZDNjMS4uOWNiMjkwODY5NzFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC0xMTA5MSwxMyArMTEwOTEsMTQgQEAgc3RhdGljIGJvb2wgdXNlX21t aW9fZmxpcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogfQogCiBzdGF0aWMgdm9pZCBz a2xfZG9fbW1pb19mbGlwKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAorCQkJICAgICB1 bnNpZ25lZCBpbnQgcm90YXRpb24sCiAJCQkgICAgIHN0cnVjdCBpbnRlbF91bnBpbl93b3JrICp3 b3JrKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNlLmRldjsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5LT5m YjsKIAljb25zdCBlbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0JdTMyIGN0bCwg c3RyaWRlOworCXUzMiBjdGwsIHN0cmlkZSwgdGlsZV9oZWlnaHQ7CiAKIAljdGwgPSBJOTE1X1JF QUQoUExBTkVfQ1RMKHBpcGUsIDApKTsKIAljdGwgJj0gflBMQU5FX0NUTF9USUxFRF9NQVNLOwpA QCAtMTExMjEsOSArMTExMjIsMTYgQEAgc3RhdGljIHZvaWQgc2tsX2RvX21taW9fZmxpcChzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkgKiBUaGUgc3RyaWRlIGlzIGVpdGhlciBleHBy ZXNzZWQgYXMgYSBtdWx0aXBsZSBvZiA2NCBieXRlcyBjaHVua3MgZm9yCiAJICogbGluZWFyIGJ1 ZmZlcnMgb3IgaW4gbnVtYmVyIG9mIHRpbGVzIGZvciB0aWxlZCBidWZmZXJzLgogCSAqLwotCXN0 cmlkZSA9IGZiLT5waXRjaGVzWzBdIC8KLQkJIGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2 LCBmYi0+bW9kaWZpZXJbMF0sCi0JCQkJCSAgIGZiLT5waXhlbF9mb3JtYXQpOworCWlmIChpbnRl bF9yb3RhdGlvbl85MF9vcl8yNzAocm90YXRpb24pKSB7CisJCS8qIHN0cmlkZSA9IFN1cmZhY2Ug aGVpZ2h0IGluIHRpbGVzICovCisJCXRpbGVfaGVpZ2h0ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2 LCBmYi0+cGl4ZWxfZm9ybWF0LAorCQkJCQkJZmItPm1vZGlmaWVyWzBdLCAwKTsKKwkJc3RyaWRl ID0gRElWX1JPVU5EX1VQKGZiLT5oZWlnaHQsIHRpbGVfaGVpZ2h0KTsKKwl9IGVsc2UgeworCQlz dHJpZGUgPSBmYi0+cGl0Y2hlc1swXSAvCisJCQkJaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChk ZXYsIGZiLT5tb2RpZmllclswXSwKKwkJCQkJCQkgIGZiLT5waXhlbF9mb3JtYXQpOworCX0KIAog CS8qCiAJICogQm90aCBQTEFORV9DVEwgYW5kIFBMQU5FX1NUUklERSBhcmUgbm90IHVwZGF0ZWQg b24gdmJsYW5rIGJ1dCBvbgpAQCAtMTExODEsNyArMTExODksNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9kb19tbWlvX2ZsaXAoc3RydWN0IGludGVsX21taW9fZmxpcCAqbW1pb19mbGlwKQogCWludGVs X3BpcGVfdXBkYXRlX3N0YXJ0KGNydGMpOwogCiAJaWYgKElOVEVMX0lORk8obW1pb19mbGlwLT5p OTE1KS0+Z2VuID49IDkpCi0JCXNrbF9kb19tbWlvX2ZsaXAoY3J0Yywgd29yayk7CisJCXNrbF9k b19tbWlvX2ZsaXAoY3J0YywgbW1pb19mbGlwLT5yb3RhdGlvbiwgd29yayk7CiAJZWxzZQogCQkv KiB1c2VfbW1pb19mbGlwKCkgcmV0cmljdHMgTU1JTyBmbGlwcyB0byBpbGsrICovCiAJCWlsa19k b19tbWlvX2ZsaXAoY3J0Yywgd29yayk7CkBAIC0xMTIwOCwxMCArMTEyMTYsOCBAQCBzdGF0aWMg dm9pZCBpbnRlbF9tbWlvX2ZsaXBfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykK IAogc3RhdGljIGludCBpbnRlbF9xdWV1ZV9tbWlvX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJCQkgc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKLQkJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKLQkJCQkgc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJCQkgdWludDMyX3QgZmxhZ3MpCisJCQkJIHVu c2lnbmVkIGludCByb3RhdGlvbiwKKwkJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aikKIHsKIAlzdHJ1Y3QgaW50ZWxfbW1pb19mbGlwICptbWlvX2ZsaXA7CiAKQEAgLTExMjIyLDYg KzExMjI4LDcgQEAgc3RhdGljIGludCBpbnRlbF9xdWV1ZV9tbWlvX2ZsaXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAltbWlvX2ZsaXAtPmk5MTUgPSB0b19pOTE1KGRldik7CiAJbW1pb19mbGlw LT5yZXEgPSBpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShvYmotPmxhc3Rfd3JpdGVfcmVxKTsK IAltbWlvX2ZsaXAtPmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCW1taW9fZmxpcC0+cm90 YXRpb24gPSByb3RhdGlvbjsKIAogCUlOSVRfV09SSygmbW1pb19mbGlwLT53b3JrLCBpbnRlbF9t bWlvX2ZsaXBfd29ya19mdW5jKTsKIAlzY2hlZHVsZV93b3JrKCZtbWlvX2ZsaXAtPndvcmspOwpA QCAtMTE0MzgsOCArMTE0NDUsOSBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAl3b3JrLT5ndHRfb2Zmc2V0ICs9IGludGVsX2NydGMtPmRz cGFkZHJfb2Zmc2V0OwogCiAJaWYgKG1taW9fZmxpcCkgewotCQlyZXQgPSBpbnRlbF9xdWV1ZV9t bWlvX2ZsaXAoZGV2LCBjcnRjLCBmYiwgb2JqLCByaW5nLAotCQkJCQkgICAgcGFnZV9mbGlwX2Zs YWdzKTsKKwkJcmV0ID0gaW50ZWxfcXVldWVfbW1pb19mbGlwKGRldiwgY3J0YywKKwkJCQkJICAg IGNydGMtPnByaW1hcnktPnN0YXRlLT5yb3RhdGlvbiwKKwkJCQkJICAgIG9iaik7CiAJCWlmIChy ZXQpCiAJCQlnb3RvIGNsZWFudXBfdW5waW47CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggMjdkY2NmMzVmOWJjLi4xNDBmOTQ5MzAyYzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CkBAIC00OTMsNiArNDkzLDcgQEAgc3RydWN0IGludGVsX21taW9fZmxpcCB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTU7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7 CiAJc3RydWN0IGludGVsX2NydGMgKmNydGM7CisJdW5zaWduZWQgaW50IHJvdGF0aW9uOwogfTsK IAogc3RydWN0IHNrbF9waXBlX3dtIHsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=