From: Maarten Lankhorst Subject: [PATCH 1/2] drm/atomic: Unconditionally call prepare_fb. Date: Tue, 31 Jan 2017 10:21:30 +0100 Message-ID: <1485854491-27389-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1485854491-27389-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: <1485854491-27389-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, Linus Torvalds , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org QXRvbWljIGRyaXZlcnMgbWF5IHNldCBwcm9wZXJ0aWVzIGxpa2Ugcm90YXRpb24gb24gdGhlIHNh bWUgZmIsIHdoaWNoCm1heSByZXF1aXJlIGEgY2FsbCB0byBwcmVwYXJlX2ZiIGV2ZW4gd2hlbiBm cmFtZWJ1ZmZlciBzdGF5cyBpZGVudGljYWwuCgpJbnN0ZWFkIG9mIGhhbmRsaW5nIGFsbCB0aGUg c3BlY2lhbCBjYXNlcyBpbiB0aGUgY29yZSwgbGV0IHRoZSBkcml2ZXIKZGVjaWRlIHdoZW4gcHJl cGFyZV9mYiBhbmQgY2xlYW51cF9mYiBhcmUgbm9vcHMuCgpUaGlzIGlzIGEgcmV2ZXJ0IG9mOgoK Y29tbWl0IGZjYzYwYjQxM2QxNGRkMDZkZGJkNzllYzUwZTgzYzRmYjJhMDk3YmEKQXV0aG9yOiBL ZWl0aCBQYWNrYXJkIDxrZWl0aHBAa2VpdGhwLmNvbT4KRGF0ZTogICBTYXQgSnVuIDQgMDE6MTY6 MjIgMjAxNiAtMDcwMAoKICAgIGRybTogRG9uJ3QgcHJlcGFyZSBvciBjbGVhbnVwIHVuY2hhbmdp bmcgZnJhbWUgYnVmZmVycyBbdjNdCgpUaGUgb3JpZ2luYWwgY29tbWl0IG1lbnRpb25zIHRoYXQg dGhpcyBwcmV2ZW50cyB3YWl0aW5nIGluIGk5MTUgb24gYWxsCnByZXZpb3VzIHJlbmRlcmluZyBk dXJpbmcgY3Vyc29yIHVwZGF0ZXMsIGJ1dCB0aGVyZSBhcmUgYmV0dGVyIHdheXMgdG8KZml4IHRo aXMuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA bGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5j aGFydEBpZGVhc29uYm9hcmQuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5p ZWwudmV0dGVyQGZmd2xsLmNoPgpMaW5rOiBodHRwOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9y Zy9wYXRjaC9tc2dpZC82ZDgyZjliNi05ZDE2LTkxZDEtZDE3Ni00YTM3YjA5YWZjNDRAbGludXgu aW50ZWwuY29tCihjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IDA1MzJiZTA3OGEyMDdkN2RkNmFk MjZlYmQwODM0ZTI1OGFjYzRlZTcpCi0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMgfCA5IC0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCAzNGY3NTdiY2FiYWUuLjQ1OTQ0NzdkZWUw MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTE2NjYsOSArMTY2Niw2IEBA IGludCBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCiAJCWZ1bmNzID0gcGxhbmUtPmhlbHBlcl9wcml2YXRlOwogCi0JCWlmICghZHJtX2F0 b21pY19oZWxwZXJfZnJhbWVidWZmZXJfY2hhbmdlZChkZXYsIHN0YXRlLCBwbGFuZV9zdGF0ZS0+ Y3J0YykpCi0JCQljb250aW51ZTsKLQogCQlpZiAoZnVuY3MtPnByZXBhcmVfZmIpIHsKIAkJCXJl dCA9IGZ1bmNzLT5wcmVwYXJlX2ZiKHBsYW5lLCBwbGFuZV9zdGF0ZSk7CiAJCQlpZiAocmV0KQpA QCAtMTY4NSw5ICsxNjgyLDYgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX3ByZXBhcmVfcGxhbmVz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmIChqID49IGkpCiAJCQljb250aW51ZTsKIAot CQlpZiAoIWRybV9hdG9taWNfaGVscGVyX2ZyYW1lYnVmZmVyX2NoYW5nZWQoZGV2LCBzdGF0ZSwg cGxhbmVfc3RhdGUtPmNydGMpKQotCQkJY29udGludWU7Ci0KIAkJZnVuY3MgPSBwbGFuZS0+aGVs cGVyX3ByaXZhdGU7CiAKIAkJaWYgKGZ1bmNzLT5jbGVhbnVwX2ZiKQpAQCAtMTk1NCw5ICsxOTQ4 LDYgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKG9sZF9zdGF0ZSwgcGxhbmUsIHBs YW5lX3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzICpm dW5jczsKIAotCQlpZiAoIWRybV9hdG9taWNfaGVscGVyX2ZyYW1lYnVmZmVyX2NoYW5nZWQoZGV2 LCBvbGRfc3RhdGUsIHBsYW5lX3N0YXRlLT5jcnRjKSkKLQkJCWNvbnRpbnVlOwotCiAJCWZ1bmNz ID0gcGxhbmUtPmhlbHBlcl9wcml2YXRlOwogCiAJCWlmIChmdW5jcy0+Y2xlYW51cF9mYikKLS0g CjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK