From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v1.1 02/13] drm/atomic: Update legacy DPMS state during modesets, v2. Date: Mon, 27 Jul 2015 13:04:20 +0200 Message-ID: <55B61034.8000909@linux.intel.com> References: <1437037166-9339-1-git-send-email-maarten.lankhorst@linux.intel.com> <1437037166-9339-3-git-send-email-maarten.lankhorst@linux.intel.com> <20150716091956.GE6223@phenom.ffwll.local> <55A77832.3050908@linux.intel.com> <20150716093123.GH6223@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150716093123.GH6223@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBpcyByZXF1aXJlZCBmb3IgRFBNUyB0byB3b3JrIGNvcnJlY3RseSwgZHVyaW5nIGEgbW9k ZXNldAp0aGUgRFBNUyBwcm9wZXJ0eSBzaG91bGQgYmUgdHVybmVkIG9mZiwgdW5sZXNzIHRoZSBz dGF0ZSBpcwpjcnRjIGlzIG1hZGUgYWN0aXZlIGluIHdoaWNoIGNhc2UgaXQgc2hvdWxkIGJlIHNl dCB0byBEUE1TIG9uLgoKVGhlIGxlZ2FjeSBkcG1zIGhhbmRsaW5nIHBlcmZvcm1zIGl0cyBvd24g ZHBtcyB1cGRhdGVzLCBzbyBhZGQgYQpwcm9wZXJ0eSB0byBwcmV2ZW50IHVwZGF0aW5nIHRoZSBs ZWdhY3kgZHBtcyBzdGF0ZSBhbmQgdXNlIGl0CmluIHRoZSBhdG9taWMgZHBtcyBoZWxwZXJzIGFu ZCBpOTE1IHN1c3BlbmQvcmVzdW1lLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBTZXQgRFBNUyB0byBv ZmYgd2hlbiBhIGNvbm5lY3RvciBpcyByZW1vdmVkIGZyb20gYSBjcnRjIHRvby4KLSBVcGRhdGUg dGhlIGxlZ2FjeSBkcG1zIHByb3BlcnR5IHRvby4KLSBBZGQgYW4gZXhjZXB0aW9uIGZvciB0aGUg bGVnYWN5IGRwbXMgcGF0aHMsIGl0IHVwZGF0ZXMgaXRzIG93biBzdGF0ZS4KLSBBZGQgYW4gZXhj ZXB0aW9uIGZvciBpOTE1IHN1c3BlbmQvcmVzdW1lLCBpdCBzaG91bGQgcHJlc2VydmUgZHBtcyBz dGF0ZS4KCkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6 IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0t LQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCA1ZWMxM2M3Y2M4MzIuLmY0NjNm OGNlOGY0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTY2MCwxNSArNjYw LDMzIEBAIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGU7CiAJaW50IGk7CiAKLQkvKiBjbGVhciBvdXQgZXhpc3RpbmcgbGlua3MgKi8KKwkvKiBjbGVh ciBvdXQgZXhpc3RpbmcgbGlua3MgYW5kIHVwZGF0ZSBkcG1zICovCiAJZm9yX2VhY2hfY29ubmVj dG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgaSkgewot CQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2RlcikKKwkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rlcikgewor CQkJV0FSTl9PTighY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKTsKKworCQkJY29ubmVjdG9yLT5l bmNvZGVyLT5jcnRjID0gTlVMTDsKKwkJCWNvbm5lY3Rvci0+ZW5jb2RlciA9IE5VTEw7CisJCX0K KworCQlpZiAob2xkX3N0YXRlLT5wcmVzZXJ2ZV9kcG1zKQogCQkJY29udGludWU7CiAKLQkJV0FS Tl9PTighY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKTsKKwkJY3J0YyA9IGNvbm5lY3Rvci0+c3Rh dGUtPmNydGM7CiAKLQkJY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjID0gTlVMTDsKLQkJY29ubmVj dG9yLT5lbmNvZGVyID0gTlVMTDsKKwkJaWYgKCghY3J0YyAmJiBvbGRfY29ubl9zdGF0ZS0+Y3J0 YykgfHwKKwkJICAgIChjcnRjICYmIGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KGNydGMt PnN0YXRlKSkpIHsKKwkJCXN0cnVjdCBkcm1fcHJvcGVydHkgKmRwbXNfcHJvcCA9CisJCQkJZGV2 LT5tb2RlX2NvbmZpZy5kcG1zX3Byb3BlcnR5OworCQkJaW50IG1vZGUgPSBEUk1fTU9ERV9EUE1T X09GRjsKKworCQkJaWYgKGNydGMgJiYgY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKKwkJCQltb2RlID0g RFJNX01PREVfRFBNU19PTjsKKworCQkJY29ubmVjdG9yLT5kcG1zID0gbW9kZTsKKwkJCWRybV9v YmplY3RfcHJvcGVydHlfc2V0X3ZhbHVlKCZjb25uZWN0b3ItPmJhc2UsCisJCQkJCQkgICAgICBk cG1zX3Byb3AsIG1vZGUpOworCQl9CiAJfQogCiAJLyogc2V0IG5ldyBsaW5rcyAqLwpAQCAtMjAw MSw2ICsyMDE5LDcgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHBtcyhzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQlyZXR1cm47CiAKIAlzdGF0ZS0+YWNxdWly ZV9jdHggPSBkcm1fbW9kZXNldF9sZWdhY3lfYWNxdWlyZV9jdHgoY3J0Yyk7CisJc3RhdGUtPnBy ZXNlcnZlX2RwbXMgPSB0cnVlOwogcmV0cnk6CiAJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0 X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwogCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMjhmZjc1YmM5ZTA0Li40ZTQ5YjY2Njdm ZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTYyNDYsNyArNjI0Niw3 IEBAIGludCBpbnRlbF9kaXNwbGF5X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ cmV0dXJuIC1FTk9NRU07CiAKIAlzdGF0ZS0+YWNxdWlyZV9jdHggPSBjdHg7Ci0Jc3RhdGUtPmFs bG93X21vZGVzZXQgPSB0cnVlOworCXN0YXRlLT5wcmVzZXJ2ZV9kcG1zID0gdHJ1ZTsKIAogCWZv cl9lYWNoX2NydGMoZGV2LCBjcnRjKSB7CiAJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSA9CkBAIC02MzA5LDcgKzYzMDksNyBAQCBpbnQgaW50ZWxfY3J0Y19jb250cm9sKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywgYm9vbCBlbmFibGUpCiAJCXJldHVybiAtRU5PTUVNOwogCiAJc3Rh dGUtPmFjcXVpcmVfY3R4ID0gY3R4OwotCXN0YXRlLT5hbGxvd19tb2Rlc2V0ID0gdHJ1ZTsKKwlz dGF0ZS0+cHJlc2VydmVfZHBtcyA9IHRydWU7CiAKIAlwaXBlX2NvbmZpZyA9IGludGVsX2F0b21p Y19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgaW50ZWxfY3J0Yyk7CiAJaWYgKElTX0VSUihwaXBlX2Nv bmZpZykpIHsKQEAgLTEyMzU4LDE2ICsxMjM1OCw5IEBAIGludGVsX21vZGVzZXRfdXBkYXRlX3N0 YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCWNvbnRpbnVlOwogCiAJCWlm IChjcnRjLT5zdGF0ZS0+YWN0aXZlKSB7Ci0JCQlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpkcG1zX3By b3BlcnR5ID0KLQkJCQlkZXYtPm1vZGVfY29uZmlnLmRwbXNfcHJvcGVydHk7Ci0KLQkJCWNvbm5l Y3Rvci0+ZHBtcyA9IERSTV9NT0RFX0RQTVNfT047Ci0JCQlkcm1fb2JqZWN0X3Byb3BlcnR5X3Nl dF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLCBkcG1zX3Byb3BlcnR5LCBEUk1fTU9ERV9EUE1TX09O KTsKLQogCQkJaW50ZWxfZW5jb2RlciA9IHRvX2ludGVsX2VuY29kZXIoY29ubmVjdG9yLT5lbmNv ZGVyKTsKIAkJCWludGVsX2VuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gdHJ1ZTsKLQkJfSBl bHNlCi0JCQljb25uZWN0b3ItPmRwbXMgPSBEUk1fTU9ERV9EUE1TX09GRjsKKwkJfQogCX0KIH0K IApAQCAtMTU0MTcsNiArMTU0MTAsNyBAQCB2b2lkIGludGVsX2Rpc3BsYXlfcmVzdW1lKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVybjsKIAogCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGRl di0+bW9kZV9jb25maWcuYWNxdWlyZV9jdHg7CisJc3RhdGUtPnByZXNlcnZlX2RwbXMgPSB0cnVl OwogCiAJLyogcHJlc2VydmUgY29tcGxldGUgb2xkIHN0YXRlLCBpbmNsdWRpbmcgZHBsbCAqLwog CWludGVsX2F0b21pY19nZXRfc2hhcmVkX2RwbGxfc3RhdGUoc3RhdGUpOwpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9kcm0vZHJtX2NydGMuaCBiL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKaW5kZXggOTBh MGZmNzAzODRhLi42NGQ0OTMwN2M3NmQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9jcnRj LmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaApAQCAtOTM3LDYgKzkzNyw3IEBAIHN0cnVj dCBkcm1fYnJpZGdlIHsKICAqIEBkZXY6IHBhcmVudCBEUk0gZGV2aWNlCiAgKiBAYWxsb3dfbW9k ZXNldDogYWxsb3cgZnVsbCBtb2Rlc2V0CiAgKiBAbGVnYWN5X2N1cnNvcl91cGRhdGU6IGhpbnQg dG8gZW5mb3JjZSBsZWdhY3kgY3Vyc29yIGlvY3RsIHNlbWFudGljcworICogQHByZXNlcnZlX2Rw bXM6IHRoZSBjYWxsZXIgd2FudHMgdG8gcHJlc2VydmUgY29ubmVjdG9yLT5kcG1zIHN0YXRlLgog ICogQHBsYW5lczogcG9pbnRlciB0byBhcnJheSBvZiBwbGFuZSBwb2ludGVycwogICogQHBsYW5l X3N0YXRlczogcG9pbnRlciB0byBhcnJheSBvZiBwbGFuZSBzdGF0ZXMgcG9pbnRlcnMKICAqIEBj cnRjczogcG9pbnRlciB0byBhcnJheSBvZiBDUlRDIHBvaW50ZXJzCkBAIC05NTAsNiArOTUxLDcg QEAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CiAJ Ym9vbCBhbGxvd19tb2Rlc2V0IDogMTsKIAlib29sIGxlZ2FjeV9jdXJzb3JfdXBkYXRlIDogMTsK Kwlib29sIHByZXNlcnZlX2RwbXMgOiAxOwogCXN0cnVjdCBkcm1fcGxhbmUgKipwbGFuZXM7CiAJ c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqKnBsYW5lX3N0YXRlczsKIAlzdHJ1Y3QgZHJtX2NydGMg KipjcnRjczsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==