From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH v2 3/6] drm/plane: Add optional ->atomic_disable() callback Date: Tue, 25 Nov 2014 12:09:46 +0100 Message-ID: <1416913789-23209-3-git-send-email-thierry.reding@gmail.com> References: <1416913789-23209-1-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 01EA26E785 for ; Tue, 25 Nov 2014 03:09:54 -0800 (PST) Received: by mail-wi0-f181.google.com with SMTP id r20so1013119wiv.14 for ; Tue, 25 Nov 2014 03:09:53 -0800 (PST) In-Reply-To: <1416913789-23209-1-git-send-email-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkluIG9yZGVyIHRvIHBy ZXZlbnQgZHJpdmVycyBmcm9tIGhhdmluZyB0byBwZXJmb3JtIHRoZSBzYW1lIGNoZWNrcyBvdmVy CmFuZCBvdmVyIGFnYWluLCBhZGQgYW4gb3B0aW9uYWwgLT5hdG9taWNfZGlzYWJsZSBjYWxsYmFj ayB3aGljaCB0aGUgY29yZQpjYWxscyB1bmRlciB0aGUgcmlnaHQgY2lyY3Vtc3RhbmNlcy4KCnYy OiBwYXNzIG9sZCBzdGF0ZSBhbmQgZGV0ZWN0IGVkZ2VzIHRvIGF2b2lkIGNhbGxpbmcgLT5hdG9t aWNfZGlzYWJsZSBvbgphbHJlYWR5IGRpc2FibGVkIHBsYW5lcywgcmVtb3ZlIHJlZHVuZGFudCBj b21tZW50IChEYW5pZWwgVmV0dGVyKQoKU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBSZWRpbmcgPHRy ZWRpbmdAbnZpZGlhLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YyB8IDE1ICsrKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZV9oZWxwZXIu YyAgfCAxMCArKysrKysrKystCiBpbmNsdWRlL2RybS9kcm1fY3J0Yy5oICAgICAgICAgICAgICB8 IDI2ICsrKysrKysrKysrKysrKysrKysrKysrKysrCiBpbmNsdWRlL2RybS9kcm1fcGxhbmVfaGVs cGVyLmggICAgICB8ICAzICsrKwogNCBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hl bHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggN2YwMjA0 MDNmZmUwLi5hMWM3ZDFiNzNmODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBA IC0xMDIwLDEyICsxMDIwLDIzIEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5l cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJY29udGludWU7CiAKIAkJZnVuY3MgPSBwbGFu ZS0+aGVscGVyX3ByaXZhdGU7Ci0KLQkJaWYgKCFmdW5jcyB8fCAhZnVuY3MtPmF0b21pY191cGRh dGUpCisJCWlmICghZnVuY3MpCiAJCQljb250aW51ZTsKIAogCQlvbGRfcGxhbmVfc3RhdGUgPSBv bGRfc3RhdGUtPnBsYW5lX3N0YXRlc1tpXTsKIAorCQkvKgorCQkgKiBTcGVjaWFsLWNhc2UgZGlz YWJsaW5nIHRoZSBwbGFuZSBpZiBkcml2ZXJzIHN1cHBvcnQgaXQuCisJCSAqLworCQlpZiAoZHJt X3BsYW5lX2Rpc2FibGVkKHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUpICYmCisJCSAgICBmdW5jcy0+ YXRvbWljX2Rpc2FibGUpIHsKKwkJCWZ1bmNzLT5hdG9taWNfZGlzYWJsZShwbGFuZSwgb2xkX3Bs YW5lX3N0YXRlKTsKKwkJCWNvbnRpbnVlOworCQl9CisKKwkJaWYgKCFmdW5jcy0+YXRvbWljX3Vw ZGF0ZSkKKwkJCWNvbnRpbnVlOworCiAJCWZ1bmNzLT5hdG9taWNfdXBkYXRlKHBsYW5lLCBvbGRf cGxhbmVfc3RhdGUpOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFu ZV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMKaW5kZXggYWEz OTlkYjVkMzZkLi44YzgxZDNhOWU2MjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f cGxhbmVfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZV9oZWxwZXIuYwpA QCAtNDQzLDcgKzQ0MywxNSBAQCBpbnQgZHJtX3BsYW5lX2hlbHBlcl9jb21taXQoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJCQljcnRjX2Z1bmNzW2ldLT5hdG9taWNfYmVnaW4oY3J0Y1tpXSk7 CiAJfQogCi0JcGxhbmVfZnVuY3MtPmF0b21pY191cGRhdGUocGxhbmUsIHBsYW5lX3N0YXRlKTsK KwkvKgorCSAqIERyaXZlcnMgbWF5IG9wdGlvbmFsbHkgaW1wbGVtZW50IHRoZSAtPmF0b21pY19k aXNhYmxlIGNhbGxiYWNrLCBzbworCSAqIHNwZWNpYWwtY2FzZSB0aGF0IGhlcmUuCisJICovCisJ aWYgKGRybV9wbGFuZV9kaXNhYmxlZChwbGFuZSwgcGxhbmVfc3RhdGUpICYmCisJICAgIHBsYW5l X2Z1bmNzLT5hdG9taWNfZGlzYWJsZSkKKwkJcGxhbmVfZnVuY3MtPmF0b21pY19kaXNhYmxlKHBs YW5lLCBwbGFuZV9zdGF0ZSk7CisJZWxzZQorCQlwbGFuZV9mdW5jcy0+YXRvbWljX3VwZGF0ZShw bGFuZSwgcGxhbmVfc3RhdGUpOwogCiAJZm9yIChpID0gMDsgaSA8IDI7IGkrKykgewogCQlpZiAo Y3J0Y19mdW5jc1tpXSAmJiBjcnRjX2Z1bmNzW2ldLT5hdG9taWNfZmx1c2gpCmRpZmYgLS1naXQg YS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAppbmRleCA2 ZGE2N2RmY2I2ZmMuLjgwZDBmMWMyYjI2NSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2Ny dGMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC03OTUsNiArNzk1LDMyIEBAIHN0 cnVjdCBkcm1fcGxhbmUgewogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlOwogfTsKIAor LyoKKyAqIGRybV9wbGFuZV9kaXNhYmxlZCAtIGNoZWNrIHdoZXRoZXIgYSBwbGFuZSBpcyBiZWlu ZyBkaXNhYmxlZAorICogQHBsYW5lOiBwbGFuZSBvYmplY3QKKyAqIEBvbGRfc3RhdGU6IHByZXZp b3VzIGF0b21pYyBzdGF0ZQorICoKKyAqIENoZWNrcyB0aGUgYXRvbWljIHN0YXRlIG9mIGEgcGxh bmUgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgaXQncyBiZWluZyBkaXNhYmxlZAorICogb3Igbm90LiBU aGlzIGFsc28gV0FSTnMgaWYgaXQgZGV0ZWN0cyBhbiBpbnZhbGlkIHN0YXRlIChib3RoIENSVEMg YW5kIEZCCisgKiBuZWVkIHRvIGVpdGhlciBib3RoIGJlIE5VTEwgb3IgYm90aCBiZSBub24tTlVM TCkuCisgKgorICogUkVUVVJOUzoKKyAqIFRydWUgaWYgdGhlIHBsYW5lIGlzIGJlaW5nIGRpc2Fi bGVkLCBmYWxzZSBvdGhlcndpc2UuCisgKi8KK3N0YXRpYyBpbmxpbmUgYm9vbCBkcm1fcGxhbmVf ZGlzYWJsZWQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJICAgICAgc3RydWN0IGRybV9w bGFuZV9zdGF0ZSAqb2xkX3N0YXRlKQoreworCS8qCisJICogV2hlbiBkaXNhYmxpbmcgYSBwbGFu ZSwgQ1JUQyBhbmQgRkIgc2hvdWxkIGFsd2F5cyBiZSBOVUxMIHRvZ2V0aGVyLgorCSAqIEFueXRo aW5nIGVsc2Ugc2hvdWxkIGJlIGNvbnNpZGVyZWQgYSBidWcgaW4gdGhlIGF0b21pYyBjb3JlLCBz byB3ZQorCSAqIGdlbnRseSB3YXJuIGFib3V0IGl0LgorCSAqLworCVdBUk5fT04oKHBsYW5lLT5z dGF0ZS0+Y3J0YyA9PSBOVUxMICYmIHBsYW5lLT5zdGF0ZS0+ZmIgIT0gTlVMTCkgfHwKKwkJKHBs YW5lLT5zdGF0ZS0+Y3J0YyAhPSBOVUxMICYmIHBsYW5lLT5zdGF0ZS0+ZmIgPT0gTlVMTCkpOwor CisJcmV0dXJuICghb2xkX3N0YXRlIHx8IG9sZF9zdGF0ZS0+Y3J0YykgJiYgIXBsYW5lLT5zdGF0 ZS0+Y3J0YzsKK30KKwogLyoqCiAgKiBzdHJ1Y3QgZHJtX2JyaWRnZV9mdW5jcyAtIGRybV9icmlk Z2UgY29udHJvbCBmdW5jdGlvbnMKICAqIEBtb2RlX2ZpeHVwOiBUcnkgdG8gZml4dXAgKG9yIHJl amVjdCBlbnRpcmVseSkgcHJvcG9zZWQgbW9kZSBmb3IgdGhpcyBicmlkZ2UKZGlmZiAtLWdpdCBh L2luY2x1ZGUvZHJtL2RybV9wbGFuZV9oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9wbGFuZV9o ZWxwZXIuaAppbmRleCAwZjIyMzAzMTFhYTguLjY4MGJlNjFlZjIwYSAxMDA2NDQKLS0tIGEvaW5j bHVkZS9kcm0vZHJtX3BsYW5lX2hlbHBlci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9wbGFuZV9o ZWxwZXIuaApAQCAtNTIsNiArNTIsNyBAQCBpbnQgZHJtX2NydGNfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAgKiBAY2xlYW51cF9mYjogY2xlYW51 cCBhIGZyYW1lYnVmZmVyIHdoZW4gaXQncyBubyBsb25nZXIgdXNlZCBieSB0aGUgcGxhbmUKICAq IEBhdG9taWNfY2hlY2s6IGNoZWNrIHRoYXQgYSBnaXZlbiBhdG9taWMgc3RhdGUgaXMgdmFsaWQg YW5kIGNhbiBiZSBhcHBsaWVkCiAgKiBAYXRvbWljX3VwZGF0ZTogYXBwbHkgYW4gYXRvbWljIHN0 YXRlIHRvIHRoZSBwbGFuZQorICogQGF0b21pY19kaXNhYmxlOiBkaXNhYmxlIHRoZSBwbGFuZQog ICoKICAqIFRoZSBoZWxwZXIgb3BlcmF0aW9ucyBhcmUgY2FsbGVkIGJ5IHRoZSBtaWQtbGF5ZXIg Q1JUQyBoZWxwZXIuCiAgKi8KQEAgLTY1LDYgKzY2LDggQEAgc3RydWN0IGRybV9wbGFuZV9oZWxw ZXJfZnVuY3MgewogCQkJICAgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlKTsKIAl2b2lk ICgqYXRvbWljX3VwZGF0ZSkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgICBzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUpOworCXZvaWQgKCphdG9taWNfZGlzYWJsZSko c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqb2xkX3N0YXRlKTsKIH07CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBkcm1fcGxhbmVfaGVscGVy X2FkZChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLS0gCjIuMS4zCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=