From: Thierry Reding Subject: [PATCH 2/3] drm/atomic-helper: Implement subsystem-level suspend/resume Date: Tue, 11 Aug 2015 13:37:44 +0200 Message-ID: <1439293065-15941-2-git-send-email-thierry.reding@gmail.com> References: <1439293065-15941-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-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01D186E4C1 for ; Tue, 11 Aug 2015 04:38:40 -0700 (PDT) Received: by wicne3 with SMTP id ne3so56926137wic.0 for ; Tue, 11 Aug 2015 04:38:38 -0700 (PDT) In-Reply-To: <1439293065-15941-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: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClByb3ZpZGUgc3Vic3lz dGVtLWxldmVsIHN1c3BlbmQgYW5kIHJlc3VtZSBoZWxwZXJzIHRoYXQgY2FuIGJlIHVzZWQgdG8K aW1wbGVtZW50IHN1c3BlbmQvcmVzdW1lIG9uIGF0b21pYyBtb2RlLXNldHRpbmcgZW5hYmxlZCBk cml2ZXJzLgoKU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDE5MSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGluY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmggICAgIHwgICA1ICsKIDIgZmlsZXMgY2hhbmdlZCwgMTk2IGluc2VydGlvbnMoKykKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IGY4NDI0OTljYTc5ZS4uYWZhY2UyMWI3 MTNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMTc1MSw2ICsxNzUxLDE5 NyBAQCBiYWNrb2ZmOgogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9zZXRfY29uZmln KTsKIAogLyoqCisgKiBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbCAtIGRpc2FibGUgYWxs IGN1cnJlbnRseSBhY3RpdmUgb3V0cHV0cworICogQGRldjogRFJNIGRldmljZQorICoKKyAqIExv b3BzIHRocm91Z2ggYWxsIGNvbm5lY3RvcnMsIGZpbmRpbmcgdGhvc2UgdGhhdCBhcmVuJ3QgdHVy bmVkIG9mZiBhbmQgdGhlbgorICogdHVybnMgdGhlbSBvZmYgYnkgc2V0dGluZyB0aGVpciBEUE1T IG1vZGUgdG8gT0ZGIGFuZCBkZWFjdGl2YXRpbmcgdGhlIENSVEMKKyAqIHRoYXQgdGhleSBhcmUg Y29ubmVjdGVkIHRvLgorICoKKyAqIFJldHVybnM6IDAgb24gc3VjY2VzcyBvciBhIG5lZ2F0aXZl IGVycm9yIGNvZGUgb24gZmFpbHVyZS4KKyAqLworaW50IGRybV9hdG9taWNfaGVscGVyX2Rpc2Fi bGVfYWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9tb2RlX2NvbmZp ZyAqY29uZmlnID0gJmRldi0+bW9kZV9jb25maWc7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh dGUgKmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKKwlz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNv bm47CisJdW5zaWduZWQgaW50IGk7CisJaW50IGVycjsKKworCXN0YXRlID0gZHJtX2F0b21pY19z dGF0ZV9hbGxvYyhkZXYpOworCWlmICghc3RhdGUpCisJCXJldHVybiAtRU5PTUVNOworCisJZHJt X21vZGVzZXRfYWNxdWlyZV9pbml0KCZjdHgsIDApOworCisJc3RhdGUtPmFsbG93X21vZGVzZXQg PSB0cnVlOworCXN0YXRlLT5hY3F1aXJlX2N0eCA9ICZjdHg7CisKK3JldHJ5OgorCWVyciA9IGRy bV9tb2Rlc2V0X2xvY2soJmNvbmZpZy0+Y29ubmVjdGlvbl9tdXRleCwgJmN0eCk7CisJaWYgKGVy ciA8IDApCisJCWdvdG8gZnJlZTsKKworCWRybV9mb3JfZWFjaF9jb25uZWN0b3IoY29ubiwgZGV2 KSB7CisJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNvbm4tPnN0YXRlLT5jcnRjOworCQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisKKwkJaWYgKCFjcnRjIHx8IGNvbm4tPmRw bXMgIT0gRFJNX01PREVfRFBNU19PTikKKwkJCWNvbnRpbnVlOworCisJCWNydGNfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwkJaWYgKElTX0VSUihjcnRj X3N0YXRlKSkgeworCQkJZXJyID0gUFRSX0VSUihjcnRjX3N0YXRlKTsKKwkJCWdvdG8gdW5sb2Nr OworCQl9CisKKwkJZXJyID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfY29ubmVjdG9ycyhzdGF0 ZSwgY3J0Yyk7CisJCWlmIChlcnIgPCAwKQorCQkJZ290byB1bmxvY2s7CisKKwkJY29ubi0+ZHBt cyA9IERSTV9NT0RFX0RQTVNfT0ZGOworCQljcnRjX3N0YXRlLT5hY3RpdmUgPSBmYWxzZTsKKwl9 CisKKwllcnIgPSBkcm1fYXRvbWljX2NvbW1pdChzdGF0ZSk7CisJaWYgKGVyciA8IDApIHsKKwkJ LyogcmVzdG9yZSBEUE1TIG1vZGUgKi8KKwkJZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKHN0 YXRlLCBjb25uLCBjb25uX3N0YXRlLCBpKQorCQkJY29ubi0+ZHBtcyA9IERSTV9NT0RFX0RQTVNf T047CisKKwkJaWYgKGVyciA9PSAtRURFQURMSykgeworCQkJZHJtX2F0b21pY19zdGF0ZV9jbGVh cihzdGF0ZSk7CisJCQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOworCQkJZ290byByZXRyeTsK KwkJfQorCX0KKwordW5sb2NrOgorCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7CitmcmVl OgorCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKKworCWlmIChlcnIgPCAwKQorCQlk cm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOworCisJcmV0dXJuIGVycjsKK30KK0VYUE9SVF9T WU1CT0woZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9hbGwpOworCisvKioKKyAqIGRybV9hdG9t aWNfaGVscGVyX3Jlc3RvcmVfY29tbWl0IC0gcmVzdG9yZXMgYW4gYXRvbWljIHN0YXRlIG9iamVj dAorICogQHN0YXRlOiBhdG9taWMgc3RhdGUgb2JqZWN0CisgKgorICogVGFrZXMgYW4gYXRvbWlj IHN0YXRlIG9iamVjdCBmb3Igd2hpY2ggbm8gbG9ja3MgaGF2ZSBiZWVuIHRha2VuIChzdWNoIGFz CisgKiBhdG9taWMgc3RhdGUgb2JqZWN0cyBvYnRhaW5lZCBmcm9tIGRybV9hdG9taWNfaGVscGVy X2R1cGxpY2F0ZV9zdGF0ZSgpKSwKKyAqIGdyYWJzIGFsbCB0aGUgbmVjZXNzYXJ5IGxvY2tzLCBj b21taXRzIHRoZSBzdGF0ZSBhbmQgcmVsZWFzZXMgdGhlIGxvY2tzCisgKiB3aGlsZSBncmFjZWZ1 bGx5IGhhbmRsaW5nIGRlYWRsb2Nrcy4KKyAqCisgKiBSZXR1cm5zOiAwIG9uIHN1Y2Nlc3Mgb3Ig YSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUuCisgKi8KK3N0YXRpYyBpbnQgZHJtX2F0 b21pY19oZWxwZXJfcmVzdG9yZV9jb21taXQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl KQoreworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZzdGF0ZS0+ZGV2LT5tb2Rl X2NvbmZpZzsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKKwlzdHJ1Y3Qg ZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4OworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNy dGM7CisJdW5zaWduZWQgaW50IGk7CisJaW50IGVycjsKKworCWRybV9tb2Rlc2V0X2FjcXVpcmVf aW5pdCgmY3R4LCAwKTsKKwlzdGF0ZS0+YWxsb3dfbW9kZXNldCA9IHRydWU7CisJc3RhdGUtPmFj cXVpcmVfY3R4ID0gJmN0eDsKKworcmV0cnk6CisJZXJyID0gZHJtX21vZGVzZXRfbG9jaygmY29u ZmlnLT5jb25uZWN0aW9uX211dGV4LCAmY3R4KTsKKwlpZiAoZXJyIDwgMCkKKwkJZ290byBmaW5p OworCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkg eworCQllcnIgPSBkcm1fbW9kZXNldF9sb2NrKCZjcnRjLT5tdXRleCwgJmN0eCk7CisJCWlmIChl cnIgPCAwKQorCQkJZ290byB1bmxvY2s7CisJfQorCisJZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUo c3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0ZSwgaSkgeworCQllcnIgPSBkcm1fbW9kZXNldF9sb2Nr KCZwbGFuZS0+bXV0ZXgsICZjdHgpOworCQlpZiAoZXJyIDwgMCkKKwkJCWdvdG8gdW5sb2NrOwor CX0KKworCWVyciA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKKwlpZiAoZXJyID09IC1FREVB RExLKSB7CisJCWRybV9tb2Rlc2V0X2JhY2tvZmYoJmN0eCk7CisJCWdvdG8gcmV0cnk7CisJfQor Cit1bmxvY2s6CisJZHJtX21vZGVzZXRfZHJvcF9sb2NrcygmY3R4KTsKK2Zpbmk6CisJZHJtX21v ZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOworCisJcmV0dXJuIGVycjsKK30KKworLyoqCisgKiBk cm1fYXRvbWljX2hlbHBlcl9zdXNwZW5kIC0gc3Vic3lzdGVtLWxldmVsIHN1c3BlbmQgaGVscGVy CisgKiBAZGV2OiBEUk0gZGV2aWNlCisgKgorICogRHVwbGljYXRlcyB0aGUgY3VycmVudCBhdG9t aWMgc3RhdGUsIGRpc2FibGVzIGFsbCBhY3RpdmUgb3V0cHV0cyBhbmQgdGhlbgorICogcmV0dXJu cyBhIHBvaW50ZXIgdG8gdGhlIG9yaWdpbmFsIGF0b21pYyBzdGF0ZSB0byB0aGUgY2FsbGVyLiBE cml2ZXJzIGNhbgorICogcGFzcyB0aGlzIHBvaW50ZXIgdG8gdGhlIGRybV9hdG9taWNfaGVscGVy X3Jlc3VtZSgpIGhlbHBlciB1cG9uIHJlc3VtZSB0bworICogcmVzdG9yZSB0aGUgb3V0cHV0IGNv bmZpZ3VyYXRpb24gdGhhdCB3YXMgYWN0aXZlIGF0IHRoZSB0aW1lIHRoZSBzeXN0ZW0KKyAqIGVu dGVyZWQgc3VzcGVuZC4KKyAqCisgKiBSZXR1cm5zOiBBIHBvaW50ZXIgdG8gYSBjb3B5IG9mIHRo ZSBzdGF0ZSBiZWZvcmUgc3VzcGVuZCBvbiBzdWNjZXNzIG9yIGFuCisgKiBFUlJfUFRSKCktZW5j b2RlZCBlcnJvciBjb2RlIG9uIGZhaWx1cmUuIERyaXZlcnMgc2hvdWxkIHN0b3JlIHRoZSByZXR1 cm5lZAorICogYXRvbWljIHN0YXRlIG9iamVjdCBhbmQgcGFzcyBpdCB0byB0aGUgZHJtX2F0b21p Y19oZWxwZXJfcmVzdW1lKCkgaGVscGVyCisgKiB1cG9uIHJlc3VtZS4KKyAqLworc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKmRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CisJaW50IGVycjsK KworCXN0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0YXRlKGRldik7CisJaWYg KElTX0VSUihzdGF0ZSkpCisJCXJldHVybiBzdGF0ZTsKKworCWVyciA9IGRybV9hdG9taWNfaGVs cGVyX2Rpc2FibGVfYWxsKGRldik7CisJaWYgKGVyciA8IDApIHsKKwkJZHJtX2F0b21pY19zdGF0 ZV9mcmVlKHN0YXRlKTsKKwkJcmV0dXJuIEVSUl9QVFIoZXJyKTsKKwl9CisKKwlyZXR1cm4gc3Rh dGU7Cit9CitFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQpOworCisvKioK KyAqIGRybV9hdG9taWNfaGVscGVyX3Jlc3VtZSAtIHN1YnN5c3RlbS1sZXZlbCByZXN1bWUgaGVs cGVyCisgKiBAZGV2OiBEUk0gZGV2aWNlCisgKiBAc3RhdGU6IGF0b21pYyBzdGF0ZSB0byByZXN1 bWUgdG8KKyAqCisgKiBUYWtlcyBhbiBhdG9taWMgc3RhdGUgb2JqZWN0LCBncmFicyBhbGwgdGhl IG5lY2Vzc2FyeSBsb2NrcyBhbmQgY29tbWl0cyBpdC4KKyAqIFRoaXMgY2FuIGJlIHVzZWQgaW4g Y29uanVuY3Rpb24gd2l0aCB0aGUgZHJtX2F0b21pY19oZWxwZXJfc3VzcGVuZCgpIGhlbHBlcgor ICogdG8gaW1wbGVtZW50IHN1c3BlbmQvcmVzdW1lIGZvciBhdG9taWMgbW9kZS1zZXR0aW5nIGVu YWJsZWQgZHJpdmVycy4KKyAqCisgKiBSZXR1cm5zOiAwIG9uIHN1Y2Nlc3Mgb3IgYSBuZWdhdGl2 ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUuCisgKi8KK2ludCBkcm1fYXRvbWljX2hlbHBlcl9yZXN1 bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgICAgc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlKQoreworCWRybV9tb2RlX2NvbmZpZ19yZXNldChkZXYpOworCisJcmV0dXJuIGRy bV9hdG9taWNfaGVscGVyX3Jlc3RvcmVfY29tbWl0KHN0YXRlKTsKK30KK0VYUE9SVF9TWU1CT0wo ZHJtX2F0b21pY19oZWxwZXJfcmVzdW1lKTsKKworLyoqCiAgKiBkcm1fYXRvbWljX2hlbHBlcl9j cnRjX3NldF9wcm9wZXJ0eSAtIGhlbHBlciBmb3IgY3J0YyBwcm9wZXJ0aWVzCiAgKiBAY3J0Yzog RFJNIGNydGMKICAqIEBwcm9wZXJ0eTogRFJNIHByb3BlcnR5CmRpZmYgLS1naXQgYS9pbmNsdWRl L2RybS9kcm1fYXRvbWljX2hlbHBlci5oIGIvaW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIu aAppbmRleCA1ZDI3NjEyOTk3Y2UuLjA4MGYxMzFjOWYyZSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9k cm0vZHJtX2F0b21pY19oZWxwZXIuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBl ci5oCkBAIC03NSw2ICs3NSwxMSBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogaW50IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpOwogaW50IGRybV9hdG9taWNfaGVscGVyX3Nl dF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KTsKIAoraW50IGRybV9hdG9taWNfaGVs cGVyX2Rpc2FibGVfYWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKmRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CitpbnQgZHJtX2F0b21pY19oZWxwZXJfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CisJCQkgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CisKIGludCBkcm1fYXRv bWljX2hlbHBlcl9jcnRjX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJ CXN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAogCQkJCQl1aW50NjRfdCB2YWwpOwotLSAK Mi40LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==