From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stone Subject: [PATCH 10/11] drm/atomic: Add current-mode blob to CRTC state Date: Fri, 22 May 2015 13:34:53 +0100 Message-ID: <1432298094-22239-11-git-send-email-daniels@collabora.com> References: <1432298094-22239-1-git-send-email-daniels@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [93.93.135.160]) by gabe.freedesktop.org (Postfix) with ESMTP id 5979D6EA7A for ; Fri, 22 May 2015 05:35:08 -0700 (PDT) In-Reply-To: <1432298094-22239-1-git-send-email-daniels@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QWRkIGEgYmxvYiBwcm9wZXJ0eSB0cmFja2luZyB0aGUgY3VycmVudCBtb2RlIHRvIHRoZSBDUlRD IHN0YXRlLCBhbmQKZW5zdXJlIGl0IGlzIHByb3Blcmx5IHVwZGF0ZWQgYW5kIHJlZmVyZW5jZWQu CgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KVGVz dGVkLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pYy5jICAgICAgICB8IDYyICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgMTEgKysr Ky0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmMgICAgICAgICAgfCAgMyArLQogaW5jbHVk ZS9kcm0vZHJtX2NydGMuaCAgICAgICAgICAgICAgfCAgMyArKwogNCBmaWxlcyBjaGFuZ2VkLCA3 MyBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCmluZGV4IDY3 YzI1MWYuLjYzZmM1OGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwpAQCAtMzAxLDYgKzMwMSw4IEBAIEVY UE9SVF9TWU1CT0woZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZSk7CiBpbnQgZHJtX2F0b21pY19z ZXRfbW9kZV9mb3JfY3J0YyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlLAogCQkJCSBzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSkKIHsKKwlzdHJ1Y3QgZHJtX21vZGVfbW9kZWluZm8g dW1vZGU7CisKIAkvKiBFYXJseSByZXR1cm4gZm9yIG5vIGNoYW5nZS4gKi8KIAlpZiAoIW1vZGUg JiYgIXN0YXRlLT5lbmFibGUpCiAJCXJldHVybiAwOwpAQCAtMzA4LDkgKzMxMCwyMCBAQCBpbnQg ZHJtX2F0b21pY19zZXRfbW9kZV9mb3JfY3J0YyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRl LAogCSAgICBtZW1jbXAoJnN0YXRlLT5tb2RlLCBtb2RlLCBzaXplb2YoKm1vZGUpKSA9PSAwKQog CQlyZXR1cm4gMDsKIAorCWlmIChzdGF0ZS0+bW9kZV9ibG9iKQorCQlkcm1fcHJvcGVydHlfdW5y ZWZlcmVuY2VfYmxvYihzdGF0ZS0+bW9kZV9ibG9iKTsKKwlzdGF0ZS0+bW9kZV9ibG9iID0gTlVM TDsKIAlzdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKIAogCWlmIChtb2RlKSB7CisJCWRybV9t b2RlX2NvbnZlcnRfdG9fdW1vZGUoJnVtb2RlLCBtb2RlKTsKKwkJc3RhdGUtPm1vZGVfYmxvYiA9 CisJCQlkcm1fcHJvcGVydHlfY3JlYXRlX2Jsb2Ioc3RhdGUtPmNydGMtPmRldiwKKwkJICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKHVtb2RlKSwKKwkJICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJnVtb2RlKTsKKwkJaWYgKCFzdGF0ZS0+bW9kZV9ibG9iKQor CQkJcmV0dXJuIC1FTk9NRU07CisKIAkJZHJtX21vZGVfY29weSgmc3RhdGUtPm1vZGUsIG1vZGUp OwogCQlzdGF0ZS0+ZW5hYmxlID0gdHJ1ZTsKIAl9IGVsc2UgewpAQCAtMzMwLDYgKzM0Myw1NSBA QCBpbnQgZHJtX2F0b21pY19zZXRfbW9kZV9mb3JfY3J0YyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg KnN0YXRlLAogfQogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX3NldF9tb2RlX2Zvcl9jcnRjKTsK IAorLyoqCisgKiBkcm1fYXRvbWljX3NldF9tb2RlX3Byb3BfZm9yX2NydGMgLSBzZXQgbW9kZSBm b3IgQ1JUQworICogQHN0YXRlOiB0aGUgQ1JUQyB3aG9zZSBpbmNvbWluZyBzdGF0ZSB0byB1cGRh dGUKKyAqIEBibG9iOiBwb2ludGVyIHRvIGJsb2IgcHJvcGVydHkgdG8gdXNlIGZvciBtb2RlCisg KgorICogU2V0IGEgbW9kZSAob3JpZ2luYXRpbmcgZnJvbSBhIGJsb2IgcHJvcGVydHkpIG9uIHRo ZSBkZXNpcmVkIENSVEMgc3RhdGUuCisgKiBUaGlzIGZ1bmN0aW9uIHdpbGwgdGFrZSBhIHJlZmVy ZW5jZSBvbiB0aGUgYmxvYiBwcm9wZXJ0eSBmb3IgdGhlIENSVEMgc3RhdGUsCisgKiBhbmQgcmVs ZWFzZSB0aGUgcmVmZXJlbmNlIGhlbGQgb24gdGhlIHN0YXRlJ3MgZXhpc3RpbmcgbW9kZSBwcm9w ZXJ0eSwgaWYgYW55CisgKiB3YXMgc2V0LgorICovCitpbnQgZHJtX2F0b21pY19zZXRfbW9kZV9w cm9wX2Zvcl9jcnRjKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikK K3sKKwlpZiAoYmxvYiA9PSBzdGF0ZS0+bW9kZV9ibG9iKQorCQlyZXR1cm4gMDsKKworCWlmIChz dGF0ZS0+bW9kZV9ibG9iKQorCQlkcm1fcHJvcGVydHlfdW5yZWZlcmVuY2VfYmxvYihzdGF0ZS0+ bW9kZV9ibG9iKTsKKwlzdGF0ZS0+bW9kZV9ibG9iID0gTlVMTDsKKworCWlmIChibG9iKSB7CisJ CWlmIChibG9iLT5sZW5ndGggIT0gc2l6ZW9mKHN0cnVjdCBkcm1fbW9kZV9tb2RlaW5mbykgfHwK KwkJICAgIGRybV9tb2RlX2NvbnZlcnRfdW1vZGUoJnN0YXRlLT5tb2RlLAorCQkgICAgICAgICAg ICAgICAgICAgICAgICAgICAoY29uc3Qgc3RydWN0IGRybV9tb2RlX21vZGVpbmZvICopCisJCSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBibG9iLT5kYXRhKSkKKwkJCXJldHVybiAtRUlOVkFM OworCisJCXN0YXRlLT5tb2RlX2Jsb2IgPSBkcm1fcHJvcGVydHlfcmVmZXJlbmNlX2Jsb2IoYmxv Yik7CisJCXN0YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOworCQlzdGF0ZS0+ZW5hYmxlID0gdHJ1 ZTsKKwl9IGVsc2UgeworCQltZW1zZXQoJnN0YXRlLT5tb2RlLCAwLCBzaXplb2Yoc3RhdGUtPm1v ZGUpKTsKKworCQlpZiAoc3RhdGUtPmVuYWJsZSkKKwkJCXN0YXRlLT5tb2RlX2NoYW5nZWQgPSB0 cnVlOworCQlzdGF0ZS0+ZW5hYmxlID0gZmFsc2U7CisJCXN0YXRlLT5hY3RpdmUgPSBmYWxzZTsK Kwl9CisKKwlpZiAoc3RhdGUtPmVuYWJsZSkKKwkJRFJNX0RFQlVHX0FUT01JQygiU2V0IFtNT0RF OiVzXSBmb3IgQ1JUQyBzdGF0ZSAlcFxuIiwKKwkJCQkgc3RhdGUtPm1vZGUubmFtZSwgc3RhdGUp OworCWVsc2UKKwkJRFJNX0RFQlVHX0FUT01JQygiU2V0IFtOT01PREVdIGZvciBDUlRDIHN0YXRl ICVwXG4iLAorCQkJCSBzdGF0ZSk7CisKKwlyZXR1cm4gMDsKK30KK0VYUE9SVF9TWU1CT0woZHJt X2F0b21pY19zZXRfbW9kZV9wcm9wX2Zvcl9jcnRjKTsKIAogLyoqCiAgKiBkcm1fYXRvbWljX2Ny dGNfc2V0X3Byb3BlcnR5IC0gc2V0IHByb3BlcnR5IG9uIENSVEMKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMKaW5kZXggNzBjZTI0My4uNWQ1OTZkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMKQEAgLTIwMjcsNiArMjAyNyw4IEBAIEVYUE9SVF9TWU1CT0woZHJtX2F0b21p Y19oZWxwZXJfY29ubmVjdG9yX2RwbXMpOwogICovCiB2b2lkIGRybV9hdG9taWNfaGVscGVyX2Ny dGNfcmVzZXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogeworCWlmIChjcnRjLT5zdGF0ZSAmJiBj cnRjLT5zdGF0ZS0+bW9kZV9ibG9iKQorCQlkcm1fcHJvcGVydHlfdW5yZWZlcmVuY2VfYmxvYihj cnRjLT5zdGF0ZS0+bW9kZV9ibG9iKTsKIAlrZnJlZShjcnRjLT5zdGF0ZSk7CiAJY3J0Yy0+c3Rh dGUgPSBremFsbG9jKHNpemVvZigqY3J0Yy0+c3RhdGUpLCBHRlBfS0VSTkVMKTsKIApAQCAtMjA0 OCw2ICsyMDUwLDggQEAgdm9pZCBfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0 YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIHsKIAltZW1jcHkoc3RhdGUsIGNydGMtPnN0YXRl LCBzaXplb2YoKnN0YXRlKSk7CiAKKwlpZiAoc3RhdGUtPm1vZGVfYmxvYikKKwkJZHJtX3Byb3Bl cnR5X3JlZmVyZW5jZV9ibG9iKHN0YXRlLT5tb2RlX2Jsb2IpOwogCXN0YXRlLT5tb2RlX2NoYW5n ZWQgPSBmYWxzZTsKIAlzdGF0ZS0+YWN0aXZlX2NoYW5nZWQgPSBmYWxzZTsKIAlzdGF0ZS0+cGxh bmVzX2NoYW5nZWQgPSBmYWxzZTsKQEAgLTIwOTAsMTEgKzIwOTQsOCBAQCBFWFBPUlRfU1lNQk9M KGRybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKTsKIHZvaWQgX19kcm1fYXRv bWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJ CQkgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKLQkvKgotCSAqIFRoaXMgaXMg Y3VycmVudGx5IGEgcGxhY2Vob2xkZXIgc28gdGhhdCBkcml2ZXJzIHRoYXQgc3ViY2xhc3MgdGhl Ci0JICogc3RhdGUgd2lsbCBhdXRvbWF0aWNhbGx5IGRvIHRoZSByaWdodCB0aGluZyBpZiBjb2Rl IGlzIGV2ZXIgYWRkZWQKLQkgKiB0byB0aGlzIGZ1bmN0aW9uLgotCSAqLworCWlmIChzdGF0ZS0+ bW9kZV9ibG9iKQorCQlkcm1fcHJvcGVydHlfdW5yZWZlcmVuY2VfYmxvYihzdGF0ZS0+bW9kZV9i bG9iKTsKIH0KIEVYUE9SVF9TWU1CT0woX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lf c3RhdGUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fY3J0Yy5jCmluZGV4IDkyNjNiMjIuLmVlODcwNDUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0 Yy5jCkBAIC0xOTYxLDcgKzE5NjEsOCBAQCBpbnQgZHJtX21vZGVfZ2V0Y3J0YyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQljcnRjX3Jlc3AtPnggPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+c3Jj X3ggPj4gMTY7CiAJCWNydGNfcmVzcC0+eSA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5zcmNfeSA+ PiAxNjsKIAkJaWYgKGNydGMtPnN0YXRlLT5lbmFibGUpIHsKLQkJCWRybV9tb2RlX2NvbnZlcnRf dG9fdW1vZGUoJmNydGNfcmVzcC0+bW9kZSwgJmNydGMtPnN0YXRlLT5tb2RlKTsKKwkJCW1lbWNw eSgmY3J0Y19yZXNwLT5tb2RlLCAmY3J0Yy0+c3RhdGUtPm1vZGVfYmxvYi0+ZGF0YSwKKwkJCSAg ICAgICBzaXplb2YoY3J0Y19yZXNwLT5tb2RlKSk7CiAJCQljcnRjX3Jlc3AtPm1vZGVfdmFsaWQg PSAxOwogCiAJCX0gZWxzZSB7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oIGIv aW5jbHVkZS9kcm0vZHJtX2NydGMuaAppbmRleCA3MmI2MGRiLi5jNTRmYTRhIDEwMDY0NAotLS0g YS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKQEAg LTI5OSw2ICsyOTksOSBAQCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgewogCiAJc3RydWN0IGRybV9k aXNwbGF5X21vZGUgbW9kZTsKIAorCS8qIGJsb2IgcHJvcGVydHkgdG8gZXhwb3NlIGN1cnJlbnQg bW9kZSB0byBhdG9taWMgdXNlcnNwYWNlICovCisJc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpt b2RlX2Jsb2I7CisKIAlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpldmVudDsKIAog CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKLS0gCjIuNC4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=