From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 3/3] drm/atomic: Try to preserve the crtc enabled state in drm_atomic_remove_fb. Date: Tue, 21 Feb 2017 14:51:42 +0100 Message-ID: <1487685102-31991-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1487685102-31991-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1487685102-31991-1-git-send-email-maarten.lankhorst@linux.intel.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 Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBpbnRyb2R1Y2VzIGEgc2xpZ2h0IGJlaGF2aW9yYWwgY2hhbmdlIHRvIHJtZmIuIEluc3Rl YWQgb2YKZGlzYWJsaW5nIGEgY3J0YyB3aGVuIHRoZSBwcmltYXJ5IHBsYW5lIGlzIGRpc2FibGVk LCB3ZSB0cnkgdG8KcHJlc2VydmUgaXQuCgpBcGFydCBmcm9tIG9sZCB2ZXJzaW9ucyBvZiB0aGUg dm13Z2Z4IHhvcmcgZHJpdmVyLCB0aGVyZSBpcwpub3RoaW5nIGRlcGVuZGluZyBvbiBybWZiIGRp c2FibGluZyBhIGNydGMuIFNpbmNlIHZtd2dmeCBpcwphIGxlZ2FjeSBkcml2ZXIgd2UgY2FuIHNh ZmVseSBvbmx5IGRpc2FibGUgdGhlIHBsYW5lIHdpdGggYXRvbWljLgpJbiB0aGUgY29udmVyc2lv biB0byBhdG9taWMgdGhlIGRyaXZlciB3aWxsIHJlamVjdCB0aGUgY29uZmlnCndpdGhvdXQgcHJp bWFyeSBwbGFuZS4KCklmIHRoaXMgY29tbWl0IGlzIHJlamVjdGVkIGJ5IHRoZSBkcml2ZXIgdGhl biB3ZSB3aWxsIHN0aWxsIGZhbGwKYmFjayB0byB0aGUgb2xkIGJlaGF2aW9yIGFuZCB0dXJuIG9m ZiB0aGUgY3J0Yy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMu YyB8IDIyICsrKysrKysrKysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f YXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCmluZGV4IDI4NWUxYzIzZThj OS4uMGQ1YjAwNjUyMDhlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKQEAgLTIwNzAsNyArMjA3MCw3IEBA IGludCBkcm1fYXRvbWljX3JlbW92ZV9mYihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIAlz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq Y29ubl9zdGF0ZTsKIAlpbnQgaSwgcmV0ID0gMDsKLQl1bnNpZ25lZCBwbGFuZV9tYXNrOworCXVu c2lnbmVkIHBsYW5lX21hc2ssIGRpc2FibGVfY3J0Y3MgPSBmYWxzZTsKIAogCXN0YXRlID0gZHJt X2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwogCWlmICghc3RhdGUpCkBAIC0yMDk3LDcgKzIwOTcs MTMgQEAgaW50IGRybV9hdG9taWNfcmVtb3ZlX2ZiKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi KQogCQkJZ290byB1bmxvY2s7CiAJCX0KIAotCQlpZiAocGxhbmVfc3RhdGUtPmNydGMtPnByaW1h cnkgPT0gcGxhbmUpIHsKKwkJLyoKKwkJICogU29tZSBkcml2ZXJzIGRvIG5vdCBzdXBwb3J0IGtl ZXBpbmcgY3J0YyBhY3RpdmUgd2l0aCB0aGUKKwkJICogcHJpbWFyeSBwbGFuZSBkaXNhYmxlZC4g SWYgd2UgZmFpbCB0byBjb21taXQgd2l0aCAtRUlOVkFMCisJCSAqIHRoZW4gd2Ugd2lsbCB0cnkg dG8gcGVyZm9ybSB0aGUgc2FtZSBjb21taXQgYnV0IHdpdGggYWxsCisJCSAqIGNydGMncyBkaXNh YmxlZCBmb3IgcHJpbWFyeSBwbGFuZXMgYXMgd2VsbC4KKwkJICovCisJCWlmIChkaXNhYmxlX2Ny dGNzICYmIHBsYW5lX3N0YXRlLT5jcnRjLT5wcmltYXJ5ID09IHBsYW5lKSB7CiAJCQlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAKIAkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWlj X2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBwbGFuZV9zdGF0ZS0+Y3J0Yyk7CkBAIC0y MTIyLDYgKzIxMjgsNyBAQCBpbnQgZHJtX2F0b21pY19yZW1vdmVfZmIoc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIpCiAJCXBsYW5lLT5vbGRfZmIgPSBwbGFuZS0+ZmI7CiAJfQogCisJLyogVGhp cyBsaXN0IGlzIG9ubHkgbm90IGVtcHR5IHdoZW4gZGlzYWJsZV9jcnRjcyBpcyBzZXQuICovCiAJ Zm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBjb25uLCBjb25uX3N0YXRlLCBpKSB7 CiAJCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9yX2Nvbm5lY3Rvcihjb25uX3N0YXRlLCBO VUxMKTsKIApAQCAtMjE0Myw2ICsyMTUwLDE3IEBAIGludCBkcm1fYXRvbWljX3JlbW92ZV9mYihz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIAogCWRybV9hdG9taWNfc3RhdGVfcHV0KHN0YXRl KTsKIAorCWlmIChyZXQgPT0gLUVJTlZBTCAmJiAhZGlzYWJsZV9jcnRjcykgeworCQlkaXNhYmxl X2NydGNzID0gdHJ1ZTsKKworCQlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsK KwkJaWYgKHN0YXRlKSB7CisJCQlzdGF0ZS0+YWNxdWlyZV9jdHggPSAmY3R4OworCQkJZ290byBy ZXRyeTsKKwkJfQorCQlyZXQgPSAtRU5PTUVNOworCX0KKwogCWRybV9tb2Rlc2V0X2Ryb3BfbG9j a3MoJmN0eCk7CiAJZHJtX21vZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOwogCi0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==