From: Daniel Vetter Subject: [PATCH 5/7] drm/i915: adjust has_pending_fb_unpin to atomic Date: Thu, 20 Jul 2017 19:57:52 +0200 Message-ID: <20170720175754.30751-6-daniel.vetter@ffwll.ch> References: <20170720175754.30751-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A36096E6FC for ; Thu, 20 Jul 2017 17:58:08 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 143so4398897wmu.5 for ; Thu, 20 Jul 2017 10:58:08 -0700 (PDT) In-Reply-To: <20170720175754.30751-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org QSBiaXQgYW4gb3ZlcnNpZ2h0IC0gdGhlIGN1cnJlbnQgY29kZSBkaWQgbm90aGluZywgc2luY2Ug b25seQpsZWdhY3kgZmxpcHMgdXNlZCB0aGUgdW5waW5fd29ya19jb3VudCBhbmQgYXNzb3J0ZWQg bG9naWMuCgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+ClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI3 ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlv bnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpp bmRleCBmY2JkNGI3ZmE5NmMuLmJkMDQ4OGE3MjUwMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtNDE0OSwyMSArNDE0OSwyMiBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9m ZGlfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIGJvb2wgaW50ZWxfaGFzX3BlbmRp bmdfZmJfdW5waW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVj dCBpbnRlbF9jcnRjICpjcnRjOwotCi0JLyogTm90ZSB0aGF0IHdlIGRvbid0IG5lZWQgdG8gYmUg Y2FsbGVkIHdpdGggbW9kZV9jb25maWcubG9jayBoZXJlCi0JICogYXMgb3VyIGxpc3Qgb2YgQ1JU QyBvYmplY3RzIGlzIHN0YXRpYyBmb3IgdGhlIGxpZmV0aW1lIG9mIHRoZQotCSAqIGRldmljZSBh bmQgc28gY2Fubm90IGRpc2FwcGVhciBhcyB3ZSBpdGVyYXRlLiBTaW1pbGFybHksIHdlIGNhbgot CSAqIGhhcHBpbHkgdHJlYXQgdGhlIHByZWRpY2F0ZXMgYXMgcmFjeSwgYXRvbWljIGNoZWNrcyBh cyB1c2Vyc3BhY2UKLQkgKiBjYW5ub3QgY2xhaW0gYW5kIHBpbiBhIG5ldyBmYiB3aXRob3V0IGF0 IGxlYXN0IGFjcXVyaW5nIHRoZQotCSAqIHN0cnVjdF9tdXRleCBhbmQgc28gc2VyaWFsaXNpbmcg d2l0aCB1cy4KLQkgKi8KLQlmb3JfZWFjaF9pbnRlbF9jcnRjKCZkZXZfcHJpdi0+ZHJtLCBjcnRj KSB7Ci0JCWlmIChhdG9taWNfcmVhZCgmY3J0Yy0+dW5waW5fd29ya19jb3VudCkgPT0gMCkKKwlz dHJ1Y3QgZHJtX2NydGMgKmNydGM7CisJYm9vbCBjbGVhbnVwX2RvbmU7CisKKwlkcm1fZm9yX2Vh Y2hfY3J0YyhjcnRjLCAmZGV2X3ByaXYtPmRybSkgeworCQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0 ICpjb21taXQ7CisJCXNwaW5fbG9jaygmY3J0Yy0+Y29tbWl0X2xvY2spOworCQljb21taXQgPSBs aXN0X2ZpcnN0X2VudHJ5X29yX251bGwoJmNydGMtPmNvbW1pdF9saXN0LAorCQkJCQkJICBzdHJ1 Y3QgZHJtX2NydGNfY29tbWl0LCBjb21taXRfZW50cnkpOworCQljbGVhbnVwX2RvbmUgPSBjb21t aXQgPworCQkJdHJ5X3dhaXRfZm9yX2NvbXBsZXRpb24oJmNvbW1pdC0+Y2xlYW51cF9kb25lKSA6 IHRydWU7CisJCXNwaW5fdW5sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7CisKKwkJaWYgKGNsZWFu dXBfZG9uZSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChjcnRjLT5mbGlwX3dvcmspCi0JCQlpbnRl bF93YWl0X2Zvcl92YmxhbmsoZGV2X3ByaXYsIGNydGMtPnBpcGUpOworCQlkcm1fY3J0Y193YWl0 X29uZV92YmxhbmsoY3J0Yyk7CiAKIAkJcmV0dXJuIHRydWU7CiAJfQotLSAKMi4xMy4yCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK