From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Track old framebuffer instead of object Date: Mon, 2 Feb 2015 15:44:15 +0000 Message-ID: <1422891855-6293-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id A31A56E4CD for ; Mon, 2 Feb 2015 07:44:24 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkRhbmllbCBW ZXR0ZXIgc3BvdHRlZCBhIGJ1ZyB3aGlsZSByZXZpZXdpbmcgc29tZSBvZiBteSByZWZhY3Rvcmlu ZyBpbiB0aGlzCmFyZSBvZiB0aGUgY29kZS4gSSdsbCBxdW90ZToKCiIiIgo+IEBAIC05NzY0LDYg Kzk3NjgsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKPiAgCXdvcmstPmV2ZW50ID0gZXZlbnQ7Cj4gIAl3b3JrLT5jcnRjID0gY3J0YzsK PiAgCXdvcmstPm9sZF9mYl9vYmogPSBpbnRlbF9mYl9vYmoob2xkX2ZiKTsKPiArCXdvcmstPm9s ZF90aWxpbmdfbW9kZSA9IHRvX2ludGVsX2ZyYW1lYnVmZmVyKG9sZF9mYiktPnRpbGluZ19tb2Rl OwoKSG0sIHRoYXQncyBhY3R1YWxseSBhbiBpbnRlcmVzdGluZyBidWdmaXggLSBjdXJyZW50bHkg dXNlcnNwYWNlIGNvdWxkIGJlCnNuZWFreSBhbmQgZGVzdHJveSB0aGUgb2xkIGZiIGltbWVkaWF0 ZWx5IGFmdGVyIHRoZSBmbGlwIGNvbXBsZXRlcyBhbmQgdGhlCmNoYW5nZSB0aGUgdGlsaW5nIG9m IHRoZSB1bmRlcmx5aW5nIG9iamVjdCBiZWZvcmUgdGhlIHVucGluIHdvcmsgaGFkIGEKY2hhbmNl IHRvIHJ1biAobmVlZHMgc29tZSBmdWRnaW4gd2l0aCBydCBwcmlvcyB0byBzdGFydmUgd29ya2Vy cyB0byBtYWtlCnRoaXMgd29yayB0aG91Z2gpLgoKSW1vIHRoZSByaWdodCBmaXggaXMgdG8gaG9s ZCBhIHJlZmVyZW5jZSBvbnRvIHRoZSBmYiBhbmQgbm90IHRoZQp1bmRlcmx5aW5nIGdlbSBvYmpl Y3QuIFdpdGggdGhhdCB0aWxpbmcgaXMgZ3VhcmFudGVlZCBub3QgdG8gY2hhbmdlLgoiIiIKClRo aXMgcGF0Y2ggdHJpZXMgdG8gaW1wbGVtZW50IHRoZSBhYm92ZSBwcm9wb3NlZCBjaGFuZ2UuCgpT aWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpD YzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxNCArKysrKysrLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgOCBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCAxYTY4OWIzLi4yNDkwNGNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC05MTExLDkgKzkxMTEsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl93b3Jr X2ZuKHN0cnVjdCB3b3JrX3N0cnVjdCAqX193b3JrKQogCWVudW0gcGlwZSBwaXBlID0gdG9faW50 ZWxfY3J0Yyh3b3JrLT5jcnRjKS0+cGlwZTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211 dGV4KTsKLQlpbnRlbF91bnBpbl9mYl9vYmood29yay0+b2xkX2ZiX29iaik7CisJaW50ZWxfdW5w aW5fZmJfb2JqKGludGVsX2ZiX29iaih3b3JrLT5vbGRfZmIpKTsKIAlkcm1fZ2VtX29iamVjdF91 bnJlZmVyZW5jZSgmd29yay0+cGVuZGluZ19mbGlwX29iai0+YmFzZSk7Ci0JZHJtX2dlbV9vYmpl Y3RfdW5yZWZlcmVuY2UoJndvcmstPm9sZF9mYl9vYmotPmJhc2UpOworCWRybV9mcmFtZWJ1ZmZl cl91bnJlZmVyZW5jZSh3b3JrLT5vbGRfZmIpOwogCiAJaW50ZWxfZmJjX3VwZGF0ZShkZXYpOwog CkBAIC05ODE2LDcgKzk4MTYsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCXdvcmstPmV2ZW50ID0gZXZlbnQ7CiAJd29yay0+Y3J0 YyA9IGNydGM7Ci0Jd29yay0+b2xkX2ZiX29iaiA9IGludGVsX2ZiX29iaihvbGRfZmIpOworCXdv cmstPm9sZF9mYiA9IG9sZF9mYjsKIAlJTklUX1dPUksoJndvcmstPndvcmssIGludGVsX3VucGlu X3dvcmtfZm4pOwogCiAJcmV0ID0gZHJtX2NydGNfdmJsYW5rX2dldChjcnRjKTsKQEAgLTk4NTIs NyArOTg1Miw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9j cnRjICpjcnRjLAogCQlnb3RvIGNsZWFudXA7CiAKIAkvKiBSZWZlcmVuY2UgdGhlIG9iamVjdHMg Zm9yIHRoZSBzY2hlZHVsZWQgd29yay4gKi8KLQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJndv cmstPm9sZF9mYl9vYmotPmJhc2UpOworCWRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2Uod29yay0+ b2xkX2ZiKTsKIAlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CiAKIAljcnRj LT5wcmltYXJ5LT5mYiA9IGZiOwpAQCAtOTg2Nyw3ICs5ODY3LDcgQEAgc3RhdGljIGludCBpbnRl bF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlpZiAoSVNfVkFMTEVZ VklFVyhkZXYpKSB7CiAJCXJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbQkNTXTsKLQkJaWYgKG9iai0+ dGlsaW5nX21vZGUgIT0gd29yay0+b2xkX2ZiX29iai0+dGlsaW5nX21vZGUpCisJCWlmIChvYmot PnRpbGluZ19tb2RlICE9IGludGVsX2ZiX29iaih3b3JrLT5vbGRfZmIpLT50aWxpbmdfbW9kZSkK IAkJCS8qIHZsdjogRElTUExBWV9GTElQIGZhaWxzIHRvIGNoYW5nZSB0aWxpbmcgKi8KIAkJCXJp bmcgPSBOVUxMOwogCX0gZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldikgfHwgSVNfSEFTV0VMTChk ZXYpKSB7CkBAIC05OTA4LDcgKzk5MDgsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9m bGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAl3b3JrLT5mbGlwX3F1ZXVlZF92YmxhbmsgPSBk cm1fdmJsYW5rX2NvdW50KGRldiwgaW50ZWxfY3J0Yy0+cGlwZSk7CiAJd29yay0+ZW5hYmxlX3N0 YWxsX2NoZWNrID0gdHJ1ZTsKIAotCWk5MTVfZ2VtX3RyYWNrX2ZiKHdvcmstPm9sZF9mYl9vYmos IG9iaiwKKwlpOTE1X2dlbV90cmFja19mYihpbnRlbF9mYl9vYmood29yay0+b2xkX2ZiKSwgb2Jq LAogCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUpKTsKIAogCWludGVsX2ZiY19k aXNhYmxlKGRldik7CkBAIC05OTI0LDcgKzk5MjQsNyBAQCBjbGVhbnVwX3VucGluOgogY2xlYW51 cF9wZW5kaW5nOgogCWF0b21pY19kZWMoJmludGVsX2NydGMtPnVucGluX3dvcmtfY291bnQpOwog CWNydGMtPnByaW1hcnktPmZiID0gb2xkX2ZiOwotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNl KCZ3b3JrLT5vbGRfZmJfb2JqLT5iYXNlKTsKKwlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uo d29yay0+b2xkX2ZiKTsKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmb2JqLT5iYXNlKTsK IAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAppbmRleCBkZTUxM2VjLi5hOGY4OTVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApA QCAtNzEyLDcgKzcxMiw3IEBAIGludGVsX2dldF9jcnRjX2Zvcl9wbGFuZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBpbnQgcGxhbmUpCiBzdHJ1Y3QgaW50ZWxfdW5waW5fd29yayB7CiAJc3RydWN0 IHdvcmtfc3RydWN0IHdvcms7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvbGRfZmJfb2JqOworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9s ZF9mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqcGVuZGluZ19mbGlwX29iajsKIAlz dHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpldmVudDsKIAlhdG9taWNfdCBwZW5kaW5n OwotLSAKMi4yLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==