From: Ville Syrjala Subject: [PATCH 9/9] drm/i915: Add windowing for primary planes on gen2/3 and chv Date: Wed, 11 Oct 2017 19:04:55 +0300 Message-ID: <20171011160455.1874-10-ville.syrjala@linux.intel.com> References: <20171011160455.1874-1-ville.syrjala@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 ESMTPS id 6D7406E6DA for ; Wed, 11 Oct 2017 16:05:30 +0000 (UTC) In-Reply-To: <20171011160455.1874-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClBs YW5lIEIgYW5kIEMgKG5vdGUgdGhhdCB3ZSBkb24ndCBhY3R1YWxseSBleHBvc2UgcGxhbmUgQyBj dXJyZW50bHkpCm9uIGdlbjIvMyBoYXZlIGEgd2luZG93IGdlbmVyYXRvciwgYXMgZG9lcyB0aGUg cHJpbWFyeSBwbGFuZSBvbiBDSFYKcGlwZSBCLiBTbyBsZXQncyBhbGxvdyBwb3NpdGlvbmluZyBv ZiB0aGVzZSBwbGFuZXMgZnJlZWx5IHdpdGhpbiB0aGUKcGlwZSBzb3VyY2UgYXJlYS4KClBsYW5l IEEgb24gZ2VuMi8zIHNlZW1zIHRvIGhhdmUgc29tZSBraW5kIG9mIHBhcnRpYWwgd2luZG93IGdl bmVyYXRvcgp3aGljaCB3b3VsZCBhbGxvdyB5b3UgdG8gY3V0IHRoZSBwbGFuZSBvZmYgbWlkd2F5 IHRocm91Z2ggdGhlIHNjYW5vdXQsCmJ1dCBpdCB3b3VsZCBzdGlsbCBoYXZlIHRvIHN0YXJ0IGF0 IHRoZSB0b3AtbGVmdCBjb3JuZXIgb2YgdGhlIHBpcGUsCmFuZCBpdCB3b3VsZCBoYXZlIHRvIGJl IGZ1bGwgd2lkdGguIFRoYXQncyBkb2Vzbid0IHNvdW5kIGFsbCB0aGF0CnVzZWZ1bCwgc28gZm9y IHNpbXBsaWNpdHkgbGV0J3MganVzdCBrZWVwIHRvIHRoZSBpZGVhIHRoYXQgcGxhbmUgQQpoYXMg dG8gYmUgZnVsbHNjcmVlbi4KCkdlbjQgcmVtb3ZlZCB0aGUgcGxhbmUgQS9CIHdpbmRvd2luZyBz dXBwb3J0IGVudGlyZWx5LCBhbmQgaXQgd2Fzbid0CnJlaW50cm9kdWNlZCB1bnRpbCBTS0wgKGFw YXJ0IGZyb20gdGhlIENIViBwaXBlIEIgc3BlY2lhbCBjYXNlKS4KClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNDMgKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMTYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDYyMmI0ODc2 MjlkNy4uNTk1YjQ2MjU1ZGQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0zMjM2LDYgKzMyMzYsMTAgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcGxhbmUoc3RydWN0 IGludGVsX3BsYW5lICpwbGFuZSwKIAlpOTE1X3JlZ190IHJlZyA9IERTUENOVFIocGxhbmVfaWQp OwogCWludCB4ID0gcGxhbmVfc3RhdGUtPm1haW4ueDsKIAlpbnQgeSA9IHBsYW5lX3N0YXRlLT5t YWluLnk7CisJaW50IGNydGNfeCA9IHBsYW5lX3N0YXRlLT5iYXNlLmRzdC54MTsKKwlpbnQgY3J0 Y195ID0gcGxhbmVfc3RhdGUtPmJhc2UuZHN0LnkxOworCWludCBjcnRjX3cgPSBkcm1fcmVjdF93 aWR0aCgmcGxhbmVfc3RhdGUtPmJhc2UuZHN0KTsKKwlpbnQgY3J0Y19oID0gZHJtX3JlY3RfaGVp Z2h0KCZwbGFuZV9zdGF0ZS0+YmFzZS5kc3QpOwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAK IAlsaW5lYXJfb2Zmc2V0ID0gaW50ZWxfZmJfeHlfdG9fbGluZWFyKHgsIHksIHBsYW5lX3N0YXRl LCAwKTsKQEAgLTMyNTEsMTggKzMyNTUsMTggQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcGxh bmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3By aXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8 IDQpIHsKLQkJLyogcGlwZXNyYyBhbmQgZHNwc2l6ZSBjb250cm9sIHRoZSBzaXplIHRoYXQgaXMg c2NhbGVkIGZyb20sCi0JCSAqIHdoaWNoIHNob3VsZCBhbHdheXMgYmUgdGhlIHVzZXIncyByZXF1 ZXN0ZWQgc2l6ZS4KKwkJLyoKKwkJICogUExBTkVfQSBkb2Vzbid0IGFjdHVhbGx5IGhhdmUgYSBm dWxsIHdpbmRvdworCQkgKiBnZW5lcmF0b3IgYnV0IGxldCdzIGFzc3VtZSB3ZSBzdGlsbCBuZWVk IHRvCisJCSAqIHByb2dyYW0gd2hhdGV2ZXIgaXMgdGhlcmUuCiAJCSAqLworCQlJOTE1X1dSSVRF X0ZXKERTUFBPUyhwbGFuZV9pZCksIChjcnRjX3kgPDwgMTYpIHwgY3J0Y194KTsKIAkJSTkxNV9X UklURV9GVyhEU1BTSVpFKHBsYW5lX2lkKSwKLQkJCSAgICAgICgoY3J0Y19zdGF0ZS0+cGlwZV9z cmNfaCAtIDEpIDw8IDE2KSB8Ci0JCQkgICAgICAoY3J0Y19zdGF0ZS0+cGlwZV9zcmNfdyAtIDEp KTsKLQkJSTkxNV9XUklURV9GVyhEU1BQT1MocGxhbmVfaWQpLCAwKTsKKwkJCSAgICAgICgoY3J0 Y19oIC0gMSkgPDwgMTYpIHwgKGNydGNfdyAtIDEpKTsKIAl9IGVsc2UgaWYgKElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpICYmIHBsYW5lX2lkID09IFBMQU5FX0IpIHsKKwkJSTkxNV9XUklURV9GVyhQ UklNUE9TKHBsYW5lX2lkKSwgKGNydGNfeSA8PCAxNikgfCBjcnRjX3gpOwogCQlJOTE1X1dSSVRF X0ZXKFBSSU1TSVpFKHBsYW5lX2lkKSwKLQkJCSAgICAgICgoY3J0Y19zdGF0ZS0+cGlwZV9zcmNf aCAtIDEpIDw8IDE2KSB8Ci0JCQkgICAgICAoY3J0Y19zdGF0ZS0+cGlwZV9zcmNfdyAtIDEpKTsK LQkJSTkxNV9XUklURV9GVyhQUklNUE9TKHBsYW5lX2lkKSwgMCk7CisJCQkgICAgICAoKGNydGNf aCAtIDEpIDw8IDE2KSB8IChjcnRjX3cgLSAxKSk7CiAJCUk5MTVfV1JJVEVfRlcoUFJJTUNOU1RB TFBIQShwbGFuZV9pZCksIDApOwogCX0KIApAQCAtMTI3MzcsNiArMTI3NDEsMTUgQEAgc2tsX21h eF9zY2FsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0Yywgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUKIAlyZXR1cm4gbWF4X3NjYWxlOwogfQogCitzdGF0aWMgYm9vbCBp bnRlbF9wcmltYXJ5X3BsYW5lX2hhc193aW5kb3dpbmcoc3RydWN0IGludGVsX3BsYW5lICpwbGFu ZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5l LT5iYXNlLmRldik7CisKKwlyZXR1cm4gSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8CisJCShJ U19DSEVSUllWSUVXKGRldl9wcml2KSAmJiBwbGFuZS0+cGxhbmUgPT0gUExBTkVfQikgfHwKKwkJ KElOVEVMX0dFTihkZXZfcHJpdikgPCA0ICYmIHBsYW5lLT5wbGFuZSAhPSBQTEFORV9BKTsKK30K Kwogc3RhdGljIGludAogaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxh bmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKQEAg LTEyNzQ2LDE2ICsxMjc1OSwxNCBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBp bnRlbF9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2Uu Y3J0YzsKIAlpbnQgbWluX3NjYWxlID0gRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HOwogCWlu dCBtYXhfc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkc7Ci0JYm9vbCBjYW5fcG9z aXRpb24gPSBmYWxzZTsKKwlib29sIGNhbl9wb3NpdGlvbiA9IGludGVsX3ByaW1hcnlfcGxhbmVf aGFzX3dpbmRvd2luZyhwbGFuZSk7CiAJaW50IHJldDsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDkpIHsKLQkJLyogdXNlIHNjYWxlciB3aGVuIGNvbG9ya2V5IGlzIG5vdCByZXF1aXJl ZCAqLwotCQlpZiAoc3RhdGUtPmNrZXkuZmxhZ3MgPT0gSTkxNV9TRVRfQ09MT1JLRVlfTk9ORSkg ewotCQkJbWluX3NjYWxlID0gMTsKLQkJCW1heF9zY2FsZSA9IHNrbF9tYXhfc2NhbGUodG9faW50 ZWxfY3J0YyhjcnRjKSwgY3J0Y19zdGF0ZSk7Ci0JCX0KLQkJY2FuX3Bvc2l0aW9uID0gdHJ1ZTsK KwkvKiB1c2Ugc2NhbGVyIHdoZW4gY29sb3JrZXkgaXMgbm90IHJlcXVpcmVkICovCisJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gOSAmJgorCSAgICBzdGF0ZS0+Y2tleS5mbGFncyA9PSBJOTE1 X1NFVF9DT0xPUktFWV9OT05FKSB7CisJCW1pbl9zY2FsZSA9IDE7CisJCW1heF9zY2FsZSA9IHNr bF9tYXhfc2NhbGUodG9faW50ZWxfY3J0YyhjcnRjKSwgY3J0Y19zdGF0ZSk7CiAJfQogCiAJcmV0 ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZSgmc3RhdGUtPmJhc2UsCi0tIAoyLjEzLjYK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=