From: Ander Conselvan de Oliveira Subject: [PATCH 6/7] drm/i915: Improve how the memory for crtc state is allocated Date: Thu, 15 Jan 2015 14:55:26 +0200 Message-ID: <1421326527-24906-7-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1421326527-24906-1-git-send-email-ander.conselvan.de.oliveira@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 8ACF46E175 for ; Thu, 15 Jan 2015 04:55:43 -0800 (PST) In-Reply-To: <1421326527-24906-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhlIHByZXZpb3VzIHBhdGNoIGNoYW5nZWQgdGhlIGNvbmZpZyBmaWVsZCBpbiBpbnRlbF9jcnRj IHRvIGEgcG9pbnRlciwKYnV0IHRvIGtlZXAgdGhlIG1lY2hhbmljYWwgY2hhbmdlcyAoZG9uZSB3 aXRoIHNwYXRjaCkgc2VwYXJhdGUgZnJvbSB0aGUKbmV3IGNvZGUsIHRoZSBwb2ludGVyIHdhcyBt YWRlIHRvIHBvaW50IHRvIGEgbmV3IF9jb25maWcgZmllbGQgd2l0aCB0eXBlCnN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlIGFkZGVkIHRvIHRoYXQgc3RydWN0LiBUaGlzIHBhdGNoIGltcHJvdmVzIHRo YXQKY29kZSBieSBnZXR0aW5nIHJpZCBvZiB0aGF0IGZpZWxkLCBhbGxvY2F0aW5nIGEgc3RhdGUg c3RydWN0IGluCmludGVsX2NydGNfaW5pdCgpIGEga2VlcGluZyBpdCBwcm9wZXJseSB1cGRhdGVk IHdoZW4gYSBtb2RlIHNldApoYXBwZW5zLgoKdjI6IE1hbnVhbCBjaGFuZ2VzIHNwbGl0IGZyb20g cHJldmlvdXMgcGF0Y2guIChNYXR0KQogICAgRG9uJ3QgbGVhayB0aGUgY3VycmVudCBzdGF0ZSB3 aGVuIHRoZSBjcnRjIGlzIGRlc3Ryb3llZCAoTWF0dCkKClNpZ25lZC1vZmYtYnk6IEFuZGVyIENv bnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMCArKysrKysr KysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEg LQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhY2RhZWQyLi4wMDJlNWE5IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC04OTI2LDYgKzg5MjYsMTMgQEAgb3V0 OgogCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIH0KIAorc3RhdGljIHZvaWQgaW50 ZWxfY3J0Y19zZXRfc3RhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJIHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWtmcmVlKGNydGMtPmNvbmZpZyk7CisJ Y3J0Yy0+Y29uZmlnID0gY3J0Y19zdGF0ZTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19k ZXN0cm95KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CkBAIC04OTQ0LDYgKzg5NTEsNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9jcnRjX2Rlc3Ryb3koc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJZHJt X2NydGNfY2xlYW51cChjcnRjKTsKIAorCWludGVsX2NydGNfc2V0X3N0YXRlKGludGVsX2NydGMs IE5VTEwpOwogCWtmcmVlKGludGVsX2NydGMpOwogfQogCkBAIC0xMDk5NSw4ICsxMTAwMyw3IEBA IHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWNy dGMtPm1vZGUgPSAqbW9kZTsKIAkJLyogbW9kZV9zZXQvZW5hYmxlL2Rpc2FibGUgZnVuY3Rpb25z IHJlbHkgb24gYSBjb3JyZWN0IHBpcGUKIAkJICogY29uZmlnLiAqLwotCQkoKih0b19pbnRlbF9j cnRjKGNydGMpLT5jb25maWcpKSA9ICpwaXBlX2NvbmZpZzsKLQkJdG9faW50ZWxfY3J0YyhjcnRj KS0+bmV3X2NvbmZpZyA9IHRvX2ludGVsX2NydGMoY3J0YyktPmNvbmZpZzsKKwkJaW50ZWxfY3J0 Y19zZXRfc3RhdGUodG9faW50ZWxfY3J0YyhjcnRjKSwgcGlwZV9jb25maWcpOwogCiAJCS8qCiAJ CSAqIENhbGN1bGF0ZSBhbmQgc3RvcmUgdmFyaW91cyBjb25zdGFudHMgd2hpY2gKQEAgLTExMDQw LDcgKzExMDQ3LDYgQEAgZG9uZToKIAlpZiAocmV0ICYmIGNydGMtPmVuYWJsZWQpCiAJCWNydGMt Pm1vZGUgPSAqc2F2ZWRfbW9kZTsKIAotCWtmcmVlKHBpcGVfY29uZmlnKTsKIAlrZnJlZShzYXZl ZF9tb2RlKTsKIAlyZXR1cm4gcmV0OwogfQpAQCAtMTIxODcsNiArMTIxOTMsNyBAQCBzdGF0aWMg dm9pZCBpbnRlbF9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUpCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IE5VTEw7 CiAJc3RydWN0IGRybV9wbGFuZSAqY3Vyc29yID0gTlVMTDsKIAlpbnQgaSwgcmV0OwpAQCAtMTIx OTUsNiArMTIyMDIsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGludCBwaXBlKQogCWlmIChpbnRlbF9jcnRjID09IE5VTEwpCiAJCXJldHVy bjsKIAorCWNydGNfc3RhdGUgPSBremFsbG9jKHNpemVvZigqY3J0Y19zdGF0ZSksIEdGUF9LRVJO RUwpOworCWlmICghY3J0Y19zdGF0ZSkKKwkJZ290byBmYWlsOworCWludGVsX2NydGNfc2V0X3N0 YXRlKGludGVsX2NydGMsIGNydGNfc3RhdGUpOworCiAJcHJpbWFyeSA9IGludGVsX3ByaW1hcnlf cGxhbmVfY3JlYXRlKGRldiwgcGlwZSk7CiAJaWYgKCFwcmltYXJ5KQogCQlnb3RvIGZhaWw7CkBA IC0xMjI0MCw3ICsxMjI1Miw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKIAlkcm1fY3J0Y19oZWxwZXJfYWRkKCZpbnRlbF9j cnRjLT5iYXNlLCAmaW50ZWxfaGVscGVyX2Z1bmNzKTsKIAogCVdBUk5fT04oZHJtX2NydGNfaW5k ZXgoJmludGVsX2NydGMtPmJhc2UpICE9IGludGVsX2NydGMtPnBpcGUpOwotCWludGVsX2NydGMt PmNvbmZpZyA9ICZpbnRlbF9jcnRjLT5fY29uZmlnOwogCXJldHVybjsKIAogZmFpbDoKQEAgLTEy MjQ4LDYgKzEyMjU5LDcgQEAgZmFpbDoKIAkJZHJtX3BsYW5lX2NsZWFudXAocHJpbWFyeSk7CiAJ aWYgKGN1cnNvcikKIAkJZHJtX3BsYW5lX2NsZWFudXAoY3Vyc29yKTsKKwlrZnJlZShjcnRjX3N0 YXRlKTsKIAlrZnJlZShpbnRlbF9jcnRjKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp bmRleCAwYjU5YTkzLi5jOGMwYjdmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDY5 LDcgKzQ2OSw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAl1aW50MzJfdCBjdXJzb3JfYmFzZTsK IAogCXN0cnVjdCBpbnRlbF9wbGFuZV9jb25maWcgcGxhbmVfY29uZmlnOwotCXN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlIF9jb25maWc7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZzsK IAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NvbmZpZzsKIAlib29sIG5ld19lbmFibGVk OwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==