From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH] drm/i915: Pin tiled objects for L-shaped configs Date: Thu, 20 Nov 2014 09:26:30 +0100 Message-ID: <1416471990-14593-1-git-send-email-daniel.vetter@ffwll.ch> References: <1416318082-4454-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 9552A6EA1A for ; Thu, 20 Nov 2014 00:26:39 -0800 (PST) Received: by mail-wg0-f50.google.com with SMTP id k14so2961082wgh.23 for ; Thu, 20 Nov 2014 00:26:38 -0800 (PST) In-Reply-To: <1416318082-4454-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org TGV0J3MganVzdCB0aHJvdyBpbiB0aGUgdG93ZWwgb24gdGhpcyBvbmUgYW5kIHRha2UgdGhlIGNo ZWFwIHdheSBvdXQuCgpCYXNlZCBvbiBhIHBhdGNoIGZyb20gQ2hyaXMgV2lsc29uLCBidXQgY2hl Y2tpbmcgZm9yIGEgZGlmZmVyZW50IGJpdC4KQ2hyaXMnIHBhdGNoIGNoZWNrZWQgZm9yIGV2ZW4g YmFuayBsYXlvdXQsIHRoaXMgb25lIGhlcmUgZm9yIGEgbWFnaWMKYml0LiBHaXZlbiB0aGUgZXZp ZGVuY2Ugd2UndmUgZ2F0aGVyZWQgKG5vdCBtdWNoKSBib3RoIHdvcmsgSSB0aGluaywKYnV0IGNo ZWNraW5nIGZvciB0aGUgbWFnaWMgYml0IG1pZ2h0IGJlIG1vcmUgYWNjdXJhdGUuCgpBbnl3YXks IHdvcmtzIG9uIG15IGdtNDUgaGVyZS4KCkZvciBwYXJhbm9pIHJlc3RyaWN0IHRvIGdlbjQgKGFu ZCBtb2JpbGUpLCBzaW5jZSB3ZSd2ZSBvbmx5IGV2ZXIgc2Vlbgp0aGlzIG9uIGdtNDUgYW5kIGk5 NjVnbS4KCkFsc28gYWRkIHNvbWUgZGVidWdmcyBvdXRwdXQgc28gdGhhdCB3ZSBjYW4gc2tpcCB0 aGUgdGlsZWQgc3dhcHBpbmcKdGVzdHMgcHJvcGVybHkgaW4gdGhlc2UgY2FzZXMuCgp2MjogQ2xl YW4gdXAgdGhlIHF1aXJrJ2VkIHBpbiBjb3VudCBpbiBmcmVlX29iamVjdCB0byBhdm9pZCB1cHNl dHRpbmcKdGhlIFdBUk5fT04uIFNwb3R0ZWQgYnkgQ2hyaXMuCgpDYzogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+CkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0 b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0yODgxMwpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVk ZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUwOTIKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZl dHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgICAgfCAgNiArKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg ICAgfCAxOSArKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV90aWxpbmcuYyB8IDE4ICsrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaCAgICAgICAgfCAgMiArKwogNSBmaWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAwYTY5ODEzOTk2NDIuLmE0 MzEyNGU0YTc3YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTE5NzUsNiAr MTk3NSw4IEBAIHN0YXRpYyBpbnQgaTkxNV9zd2l6emxlX2luZm8oc3RydWN0IHNlcV9maWxlICpt LCB2b2lkICpkYXRhKQogCWlmIChJU19HRU4zKGRldikgfHwgSVNfR0VONChkZXYpKSB7CiAJCXNl cV9wcmludGYobSwgIkREQyA9IDB4JTA4eFxuIiwKIAkJCSAgIEk5MTVfUkVBRChEQ0MpKTsKKwkJ c2VxX3ByaW50ZihtLCAiRERDMiA9IDB4JTA4eFxuIiwKKwkJCSAgIEk5MTVfUkVBRChEQ0MyKSk7 CiAJCXNlcV9wcmludGYobSwgIkMwRFJCMyA9IDB4JTA0eFxuIiwKIAkJCSAgIEk5MTVfUkVBRDE2 KEMwRFJCMykpOwogCQlzZXFfcHJpbnRmKG0sICJDMURSQjMgPSAweCUwNHhcbiIsCkBAIC0xOTk3 LDYgKzE5OTksMTAgQEAgc3RhdGljIGludCBpOTE1X3N3aXp6bGVfaW5mbyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHZvaWQgKmRhdGEpCiAJCXNlcV9wcmludGYobSwgIkRJU1BfQVJCX0NUTCA9IDB4JTA4 eFxuIiwKIAkJCSAgIEk5MTVfUkVBRChESVNQX0FSQl9DVEwpKTsKIAl9CisKKwlpZiAoZGV2X3By aXYtPnF1aXJrcyAmIFFVSVJLX1BJTl9TV0laWkxFRF9QQUdFUykKKwkJc2VxX3B1dHMobSwgIkwt c2hhcGVkIG1lbW9yeSBkZXRlY3RlZFxuIik7CisKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZf cHJpdik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IDU0NjkxYmNmMTgyMi4uZDVhY2NjNDgxMDgyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTc0Nyw2ICs3NDcsNyBAQCBlbnVtIGludGVsX3NiaV9kZXN0aW5hdGlv biB7CiAjZGVmaW5lIFFVSVJLX0lOVkVSVF9CUklHSFRORVNTICgxPDwyKQogI2RlZmluZSBRVUlS S19CQUNLTElHSFRfUFJFU0VOVCAoMTw8MykKICNkZWZpbmUgUVVJUktfUElQRUJfRk9SQ0UgKDE8 PDQpCisjZGVmaW5lIFFVSVJLX1BJTl9TV0laWkxFRF9QQUdFUyAoMTw8NSkKIAogc3RydWN0IGlu dGVsX2ZiZGV2Owogc3RydWN0IGludGVsX2ZiY193b3JrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK aW5kZXggMWRlOTRjYzYzNTE3Li44ZDA0ZTA5NzlkMGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwpAQCAtMjEyMCw2ICsyMTIwLDEwIEBAIGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXNfZ3R0KHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaWYgKGk5MTVfZ2VtX29iamVjdF9uZWVk c19iaXQxN19zd2l6emxlKG9iaikpCiAJCWk5MTVfZ2VtX29iamVjdF9kb19iaXRfMTdfc3dpenps ZShvYmopOwogCisJaWYgKG9iai0+dGlsaW5nX21vZGUgIT0gSTkxNV9USUxJTkdfTk9ORSAmJgor CSAgICBkZXZfcHJpdi0+cXVpcmtzICYgUVVJUktfUElOX1NXSVpaTEVEX1BBR0VTKQorCQlpOTE1 X2dlbV9vYmplY3RfcGluX3BhZ2VzKG9iaik7CisKIAlyZXR1cm4gMDsKIAogZXJyX3BhZ2VzOgpA QCAtNDMwMCw2ICs0MzA0LDcgQEAgaW50CiBpOTE1X2dlbV9tYWR2aXNlX2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZp bGVfcHJpdikKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fbWFkdmlzZSAqYXJncyA9IGRhdGE7CiAJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlpbnQgcmV0OwpAQCAtNDMyNyw2ICs0 MzMyLDE1IEBAIGk5MTVfZ2VtX21hZHZpc2VfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dm9pZCAqZGF0YSwKIAkJZ290byBvdXQ7CiAJfQogCisJaWYgKG9iai0+cGFnZXMgJiYKKwkgICAg b2JqLT50aWxpbmdfbW9kZSAhPSBJOTE1X1RJTElOR19OT05FICYmCisJICAgIGRldl9wcml2LT5x dWlya3MgJiBRVUlSS19QSU5fU1dJWlpMRURfUEFHRVMpIHsKKwkJaWYgKG9iai0+bWFkdiA9PSBJ OTE1X01BRFZfV0lMTE5FRUQpCisJCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMob2JqKTsK KwkJaWYgKGFyZ3MtPm1hZHYgPT0gSTkxNV9NQURWX1dJTExORUVEKQorCQkJaTkxNV9nZW1fb2Jq ZWN0X3Bpbl9wYWdlcyhvYmopOworCX0KKwogCWlmIChvYmotPm1hZHYgIT0gX19JOTE1X01BRFZf UFVSR0VEKQogCQlvYmotPm1hZHYgPSBhcmdzLT5tYWR2OwogCkBAIC00NDc4LDYgKzQ0OTIsMTEg QEAgdm9pZCBpOTE1X2dlbV9mcmVlX29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdlbV9v YmopCiAKIAlXQVJOX09OKG9iai0+ZnJvbnRidWZmZXJfYml0cyk7CiAKKwlpZiAob2JqLT5wYWdl cyAmJiBvYmotPm1hZHYgPT0gSTkxNV9NQURWX1dJTExORUVEICYmCisJICAgIGRldl9wcml2LT5x dWlya3MgJiBRVUlSS19QSU5fU1dJWlpMRURfUEFHRVMgJiYKKwkgICAgb2JqLT50aWxpbmdfbW9k ZSAhPSBJOTE1X1RJTElOR19OT05FKQorCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMob2Jq KTsKKwogCWlmIChXQVJOX09OKG9iai0+cGFnZXNfcGluX2NvdW50KSkKIAkJb2JqLT5wYWdlc19w aW5fY291bnQgPSAwOwogCWlmIChkaXNjYXJkX2JhY2tpbmdfc3RvcmFnZShvYmopKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5nLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYwppbmRleCA3NDlhYjQ4NTU2OWUuLjAzYzY3NWE0 NDc2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5nLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5nLmMKQEAgLTE3OCw2ICsx NzgsMTUgQEAgaTkxNV9nZW1fZGV0ZWN0X2JpdF82X3N3aXp6bGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJCX0KIAkJCWJyZWFrOwogCQl9CisKKwkJLyogY2hlY2sgZm9yIEwtc2hhcGVkIG1l bW9yeSBha2EgbW9kaWZpZWQgZW5oYW5jZWQgYWRkcmVzc2luZyAqLworCQlpZiAoSVNfR0VONChk ZXYpKSB7CisJCQl1aW50MzJfdCBkZGMyID0gSTkxNV9SRUFEKERDQzIpOworCisJCQlpZiAoIShk ZGMyICYgRENDMl9NT0RJRklFRF9FTkhBTkNFRF9ESVNBQkxFKSkKKwkJCQlkZXZfcHJpdi0+cXVp cmtzIHw9IFFVSVJLX1BJTl9TV0laWkxFRF9QQUdFUzsKKwkJfQorCiAJCWlmIChkY2MgPT0gMHhm ZmZmZmZmZikgewogCQkJRFJNX0VSUk9SKCJDb3VsZG4ndCByZWFkIGZyb20gTUNIQkFSLiAgIgog CQkJCSAgIkRpc2FibGluZyB0aWxpbmcuXG4iKTsKQEAgLTM5Myw2ICs0MDIsMTUgQEAgaTkxNV9n ZW1fc2V0X3RpbGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQl9CiAK IAkJaWYgKHJldCA9PSAwKSB7CisJCQlpZiAob2JqLT5wYWdlcyAmJgorCQkJICAgIG9iai0+bWFk diA9PSBJOTE1X01BRFZfV0lMTE5FRUQgJiYKKwkJCSAgICBkZXZfcHJpdi0+cXVpcmtzICYgUVVJ UktfUElOX1NXSVpaTEVEX1BBR0VTKSB7CisJCQkJaWYgKGFyZ3MtPnRpbGluZ19tb2RlID09IEk5 MTVfVElMSU5HX05PTkUpCisJCQkJCWk5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcyhvYmopOwor CQkJCWlmIChvYmotPnRpbGluZ19tb2RlID09IEk5MTVfVElMSU5HX05PTkUpCisJCQkJCWk5MTVf Z2VtX29iamVjdF9waW5fcGFnZXMob2JqKTsKKwkJCX0KKwogCQkJb2JqLT5mZW5jZV9kaXJ0eSA9 CiAJCQkJb2JqLT5sYXN0X2ZlbmNlZF9zZXFubyB8fAogCQkJCW9iai0+ZmVuY2VfcmVnICE9IEk5 MTVfRkVOQ0VfUkVHX05PTkU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCBmMzJjNjI0YmE5 ZjkuLjFmNjUxZDc0ODdlMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC0yMDMwLDYgKzIw MzAsOCBAQCBlbnVtIHB1bml0X3Bvd2VyX3dlbGwgewogI2RlZmluZSBEQ0NfQUREUkVTU0lOR19N T0RFX01BU0sJCQkoMyA8PCAwKQogI2RlZmluZSBEQ0NfQ0hBTk5FTF9YT1JfRElTQUJMRQkJCQko MSA8PCAxMCkKICNkZWZpbmUgRENDX0NIQU5ORUxfWE9SX0JJVF8xNwkJCQkoMSA8PCA5KQorI2Rl ZmluZSBEQ0MyCQkJMHgxMDIwNAorI2RlZmluZSBEQ0MyX01PRElGSUVEX0VOSEFOQ0VEX0RJU0FC TEUJCQkoMSA8PCAyMCkKIAogLyogUGluZXZpZXcgTUNIIHJlZ2lzdGVyIGNvbnRhaW5zIEREUjMg c2V0dGluZyAqLwogI2RlZmluZSBDU0hSRERSM0NUTCAgICAgICAgICAgIDB4MTAxYTgKLS0gCjEu OC40LnJjMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK