From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/core: Do not preserve framebuffer on rmfb, v4. Date: Wed, 4 May 2016 14:38:26 +0200 Message-ID: <6c63ca37-0e7e-ac7f-a6d2-c7822e3d611f@linux.intel.com> References: <1458640720-2526-1-git-send-email-maarten.lankhorst@linux.intel.com> <1459423563-27558-1-git-send-email-maarten.lankhorst@linux.intel.com> <5728932D.90003@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <5728932D.90003@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Thomas Hellstrom , dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SXQgdHVybnMgb3V0IHRoYXQgcHJlc2VydmluZyBmcmFtZWJ1ZmZlcnMgYWZ0ZXIgdGhlIHJtZmIg Y2FsbCBicmVha3MKdm13Z2Z4IHVzZXJzcGFjZS4gVGhpcyB3YXMgb3JpZ2luYWxseSBpbnRyb2R1 Y2VkIGJlY2F1c2UgaXQgd2FzIHRob3VnaHQKbm9ib2R5IHJlbGllZCBvbiB0aGUgYmVoYXZpb3Is IGJ1dCB1bmZvcnR1bmF0ZWx5IGl0IHNlZW1zIHRoZXJlIGFyZQpleGNlcHRpb25zLgoKZHJtX2Zy YW1lYnVmZmVyX3JlbW92ZSBtYXkgZmFpbCB3aXRoIC1FSU5UUiBub3csIHNvIGEgc3RyYWlnaHQg cmV2ZXJ0CmlzIGltcG9zc2libGUuIFRoZXJlIGlzIG5vIHdheSB0byByZW1vdmUgdGhlIGZyYW1l YnVmZmVyIGZyb20gdGhlIGxpc3RzCmFuZCBhY3RpdmUgcGxhbmVzIHdpdGhvdXQgaW50cm9kdWNp bmcgYSByYWNlIGJlY2F1c2Ugb2YgdGhlIGRpZmZlcmVudApsb2NraW5nIHJlcXVpcmVtZW50cy4g SW5zdGVhZCBjYWxsIGRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUgZnJvbSBhCndvcmtxdWV1ZSwgd2hp Y2ggaXMgdW5hZmZlY3RlZCBieSBzaWduYWxzLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBBZGQgY29t bWVudC4KQ2hhbmdlcyBzaW5jZSB2MjoKLSBBZGQgZmFzdHBhdGggZm9yIHJlZmNvdW50ID0gMS4g KGRhbnZldCkKQ2hhbmdlcyBzaW5jZSB2MzoKLSBSZWJhc2VkLgotIFJlc3RvcmUgbGFzdGNsb3Nl IGZyYW1lYnVmZmVyIHJlbW92YWwgdG9vLgoKQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcgI3Y0 LjQrCkZpeGVzOiAxMzgwMzEzMjgxOGMgKCJkcm0vY29yZTogUHJlc2VydmUgdGhlIGZyYW1lYnVm ZmVyIGFmdGVyIHJlbW92aW5nIGl0LiIpClRlc3RjYXNlOiBrbXNfcm1mYl9iYXNpYwpSZWZlcmVu Y2VzOiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZlcy9kcmktZGV2ZWwvMjAx Ni1NYXJjaC8xMDI4NzYuaHRtbApDYzogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdh cmUuY29tPgpDYzogRGF2aWQgSGVycm1hbm4gPGRoLmhlcnJtYW5uQGdtYWlsLmNvbT4KUmV2aWV3 ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClRlc3RlZC1ieTog VGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPiAjdjMKLS0tCiBkcml2ZXJz L2dwdS9kcm0vZHJtX2NydGMuYyB8IDYzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCA3IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9jcnRjLmMKaW5kZXggOTYyNmEwY2MwNTBhLi45YTNkMTdiNzAwOTEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fY3J0Yy5jCkBAIC0zNDQwLDYgKzM0NDAsMjQgQEAgaW50IGRybV9tb2RlX2FkZGZiMihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogfQogCitzdHJ1Y3QgZHJtX21vZGVf cm1mYl93b3JrIHsKKwlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKKwlzdHJ1Y3QgbGlzdF9oZWFk IGZiczsKK307CisKK3N0YXRpYyB2b2lkIGRybV9tb2RlX3JtZmJfd29ya19mbihzdHJ1Y3Qgd29y a19zdHJ1Y3QgKncpCit7CisJc3RydWN0IGRybV9tb2RlX3JtZmJfd29yayAqYXJnID0gY29udGFp bmVyX29mKHcsIHR5cGVvZigqYXJnKSwgd29yayk7CisKKwl3aGlsZSAoIWxpc3RfZW1wdHkoJmFy Zy0+ZmJzKSkgeworCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9CisJCQlsaXN0X2ZpcnN0 X2VudHJ5KCZhcmctPmZicywgdHlwZW9mKCpmYiksIGZpbHBfaGVhZCk7CisKKwkJbGlzdF9kZWxf aW5pdCgmZmItPmZpbHBfaGVhZCk7CisJCWRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoZmIpOworCX0K K30KKwogLyoqCiAgKiBkcm1fbW9kZV9ybWZiIC0gcmVtb3ZlIGFuIEZCIGZyb20gdGhlIGNvbmZp Z3VyYXRpb24KICAqIEBkZXY6IGRybSBkZXZpY2UgZm9yIHRoZSBpb2N0bApAQCAtMzQ4MCwxMiAr MzQ5OCwyOSBAQCBpbnQgZHJtX21vZGVfcm1mYihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWxp c3RfZGVsX2luaXQoJmZiLT5maWxwX2hlYWQpOwogCW11dGV4X3VubG9jaygmZmlsZV9wcml2LT5m YnNfbG9jayk7CiAKLQkvKiB3ZSBub3cgb3duIHRoZSByZWZlcmVuY2UgdGhhdCB3YXMgc3RvcmVk IGluIHRoZSBmYnMgbGlzdCAqLwotCWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShmYik7Ci0K IAkvKiBkcm9wIHRoZSByZWZlcmVuY2Ugd2UgcGlja2VkIHVwIGluIGZyYW1lYnVmZmVyIGxvb2t1 cCAqLwogCWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShmYik7CiAKKwkvKgorCSAqIHdlIG5v dyBvd24gdGhlIHJlZmVyZW5jZSB0aGF0IHdhcyBzdG9yZWQgaW4gdGhlIGZicyBsaXN0CisJICoK KwkgKiBkcm1fZnJhbWVidWZmZXJfcmVtb3ZlIG1heSBmYWlsIHdpdGggLUVJTlRSIG9uIHBlbmRp bmcgc2lnbmFscywKKwkgKiBzbyBydW4gdGhpcyBpbiBhIHNlcGFyYXRlIHN0YWNrIGFzIHRoZXJl J3Mgbm8gd2F5IHRvIGNvcnJlY3RseQorCSAqIGhhbmRsZSB0aGlzIGFmdGVyIHRoZSBmYiBpcyBh bHJlYWR5IHJlbW92ZWQgZnJvbSB0aGUgbG9va3VwIHRhYmxlLgorCSAqLworCWlmIChkcm1fZnJh bWVidWZmZXJfcmVhZF9yZWZjb3VudChmYikgPiAxKSB7CisJCXN0cnVjdCBkcm1fbW9kZV9ybWZi X3dvcmsgYXJnOworCisJCUlOSVRfV09SS19PTlNUQUNLKCZhcmcud29yaywgZHJtX21vZGVfcm1m Yl93b3JrX2ZuKTsKKwkJSU5JVF9MSVNUX0hFQUQoJmFyZy5mYnMpOworCQlsaXN0X2FkZF90YWls KCZmYi0+ZmlscF9oZWFkLCAmYXJnLmZicyk7CisKKwkJc2NoZWR1bGVfd29yaygmYXJnLndvcmsp OworCQlmbHVzaF93b3JrKCZhcmcud29yayk7CisJCWRlc3Ryb3lfd29ya19vbl9zdGFjaygmYXJn LndvcmspOworCX0gZWxzZQorCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoZmIpOworCiAJ cmV0dXJuIDA7CiAKIGZhaWxfdW5yZWY6CkBAIC0zNjM1LDcgKzM2NzAsNiBAQCBvdXRfZXJyMToK IAlyZXR1cm4gcmV0OwogfQogCi0KIC8qKgogICogZHJtX2ZiX3JlbGVhc2UgLSByZW1vdmUgYW5k IGZyZWUgdGhlIEZCcyBvbiB0aGlzIGZpbGUKICAqIEBwcml2OiBkcm0gZmlsZSBmb3IgdGhlIGlv Y3RsCkBAIC0zNjUwLDYgKzM2ODQsOSBAQCBvdXRfZXJyMToKIHZvaWQgZHJtX2ZiX3JlbGVhc2Uo c3RydWN0IGRybV9maWxlICpwcml2KQogewogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLCAq dGZiOworCXN0cnVjdCBkcm1fbW9kZV9ybWZiX3dvcmsgYXJnOworCisJSU5JVF9MSVNUX0hFQUQo JmFyZy5mYnMpOwogCiAJLyoKIAkgKiBXaGVuIHRoZSBmaWxlIGdldHMgcmVsZWFzZWQgdGhhdCBt ZWFucyBubyBvbmUgZWxzZSBjYW4gYWNjZXNzIHRoZSBmYgpAQCAtMzY2MiwxMCArMzY5OSwyMiBA QCB2b2lkIGRybV9mYl9yZWxlYXNlKHN0cnVjdCBkcm1fZmlsZSAqcHJpdikKIAkgKiBhdCBpdCBh bnkgbW9yZS4KIAkgKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZmIsIHRmYiwgJnByaXYt PmZicywgZmlscF9oZWFkKSB7Ci0JCWxpc3RfZGVsX2luaXQoJmZiLT5maWxwX2hlYWQpOworCQlp ZiAoZHJtX2ZyYW1lYnVmZmVyX3JlYWRfcmVmY291bnQoZmIpID4gMSkgeworCQkJbGlzdF9tb3Zl X3RhaWwoJmZiLT5maWxwX2hlYWQsICZhcmcuZmJzKTsKKwkJfSBlbHNlIHsKKwkJCWxpc3RfZGVs X2luaXQoJmZiLT5maWxwX2hlYWQpOwogCi0JCS8qIFRoaXMgZHJvcHMgdGhlIGZwcml2LT5mYnMg cmVmZXJlbmNlLiAqLwotCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoZmIpOworCQkJLyog VGhpcyBkcm9wcyB0aGUgZnByaXYtPmZicyByZWZlcmVuY2UuICovCisJCQlkcm1fZnJhbWVidWZm ZXJfdW5yZWZlcmVuY2UoZmIpOworCQl9CisJfQorCisJaWYgKCFsaXN0X2VtcHR5KCZhcmcuZmJz KSkgeworCQlJTklUX1dPUktfT05TVEFDSygmYXJnLndvcmssIGRybV9tb2RlX3JtZmJfd29ya19m bik7CisKKwkJc2NoZWR1bGVfd29yaygmYXJnLndvcmspOworCQlmbHVzaF93b3JrKCZhcmcud29y ayk7CisJCWRlc3Ryb3lfd29ya19vbl9zdGFjaygmYXJnLndvcmspOwogCX0KIH0KIAotLSAKMi41 LjUKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK