From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/atomic: Try to preserve the crtc enabled state in drm_atomic_remove_fb, v2. Date: Wed, 1 Nov 2017 16:04:33 +0100 Message-ID: <20171101150433.10777-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhpcyBpbnRyb2R1Y2VzIGEgc2xpZ2h0IGJlaGF2aW9yYWwgY2hhbmdlIHRvIHJtZmIuIEluc3Rl YWQgb2YKZGlzYWJsaW5nIGEgY3J0YyB3aGVuIHRoZSBwcmltYXJ5IHBsYW5lIGlzIGRpc2FibGVk LCB3ZSB0cnkgdG8KcHJlc2VydmUgaXQuCgpBcGFydCBmcm9tIG9sZCB2ZXJzaW9ucyBvZiB0aGUg dm13Z2Z4IHhvcmcgZHJpdmVyLCB0aGVyZSBpcwpub3RoaW5nIGRlcGVuZGluZyBvbiBybWZiIGRp c2FibGluZyBhIGNydGMuCgpWbXdnZngnIGFuZCBzaW1wbGUga21zIGhlbHBlciBhdG9taWMgaW1w bGVtZW50YXRpb24gcmVqZWN0cyBDUlRDCmVuYWJsZWQgd2l0aG91dCBwbGFuZSwgc28gd2UgY2Fu IGRvIHRoaXMgc2FmZWx5LgoKSWYgdGhlIGF0b21pYyBjb21taXQgaXMgcmVqZWN0ZWQgYnkgdGhl IGRyaXZlciB0aGVuIHdlIHdpbGwgc3RpbGwKZmFsbCBiYWNrIHRvIHRoZSBvbGQgYmVoYXZpb3Ig YW5kIHR1cm4gb2ZmIHRoZSBjcnRjLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBSZXN0YXJ0IGNvbXBs ZXRlbHkgd2hlbiBybWZiIHdpdGggY3J0YyBvbiBmYWlscyAoU2VhbiBQYXVsKS4KClNpZ25lZC1v ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j b20+CkNjOiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KQ2M6IERhbmllbCBWZXR0 ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9mcmFt ZWJ1ZmZlci5jIHwgMjMgKysrKysrKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NyBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZnJhbWVidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZnJhbWVidWZmZXIu YwppbmRleCAyYWZmZTUzZjNmZGEuLmYwNjc5NDY4ZjQyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9mcmFtZWJ1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZnJhbWVi dWZmZXIuYwpAQCAtNzY1LDE0ICs3NjUsMTggQEAgc3RhdGljIGludCBhdG9taWNfcmVtb3ZlX2Zi KHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwog CXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICpjb25uX3N0YXRlOwotCWludCBpLCByZXQgPSAwOworCWludCBpLCByZXQ7CiAJdW5zaWduZWQg cGxhbmVfbWFzazsKKwlib29sIGRpc2FibGVfY3J0Y3MgPSBmYWxzZTsKIAotCXN0YXRlID0gZHJt X2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwotCWlmICghc3RhdGUpCi0JCXJldHVybiAtRU5PTUVN OwotCityZXRyeV9kaXNhYmxlOgogCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsK KworCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOworCWlmICghc3RhdGUpIHsK KwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byBvdXQ7CisJfQogCXN0YXRlLT5hY3F1aXJlX2N0eCA9 ICZjdHg7CiAKIHJldHJ5OgpAQCAtNzkzLDcgKzc5Nyw3IEBAIHN0YXRpYyBpbnQgYXRvbWljX3Jl bW92ZV9mYihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIAkJCWdvdG8gdW5sb2NrOwogCQl9 CiAKLQkJaWYgKHBsYW5lX3N0YXRlLT5jcnRjLT5wcmltYXJ5ID09IHBsYW5lKSB7CisJCWlmIChk aXNhYmxlX2NydGNzICYmIHBsYW5lX3N0YXRlLT5jcnRjLT5wcmltYXJ5ID09IHBsYW5lKSB7CiAJ CQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAKIAkJCWNydGNfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBwbGFuZV9zdGF0ZS0+Y3J0 Yyk7CkBAIC04MTgsNiArODIyLDcgQEAgc3RhdGljIGludCBhdG9taWNfcmVtb3ZlX2ZiKHN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKmZiKQogCQlwbGFuZS0+b2xkX2ZiID0gcGxhbmUtPmZiOwogCX0K IAorCS8qIFRoaXMgbGlzdCBpcyBvbmx5IGZpbGxlZCB3aGVuIGRpc2FibGVfY3J0Y3MgaXMgc2V0 LiAqLwogCWZvcl9lYWNoX25ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm4sIGNvbm5f c3RhdGUsIGkpIHsKIAkJcmV0ID0gZHJtX2F0b21pY19zZXRfY3J0Y19mb3JfY29ubmVjdG9yKGNv bm5fc3RhdGUsIE5VTEwpOwogCkBAIC04NDAsOSArODQ1LDE1IEBAIHN0YXRpYyBpbnQgYXRvbWlj X3JlbW92ZV9mYihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIAogCWRybV9hdG9taWNfc3Rh dGVfcHV0KHN0YXRlKTsKIAorb3V0OgogCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7CiAJ ZHJtX21vZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOwogCisJaWYgKHJldCA9PSAtRUlOVkFMICYm ICFkaXNhYmxlX2NydGNzKSB7CisJCWRpc2FibGVfY3J0Y3MgPSB0cnVlOworCQlnb3RvIHJldHJ5 X2Rpc2FibGU7CisJfQorCiAJcmV0dXJuIHJldDsKIH0KIAotLSAKMi4xNC4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK