From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 3/3] drm/i915: Update primary planes after a GPU reset Date: Fri, 15 Feb 2013 17:07:46 +0200 Message-ID: <1360940866-22435-4-git-send-email-ville.syrjala@linux.intel.com> References: <1360940866-22435-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 249C7E6B94 for ; Fri, 15 Feb 2013 07:08:07 -0800 (PST) In-Reply-To: <1360940866-22435-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkdQ VSByZXNldCB3aWxsIGRyb3AgYWxsIGZsaXBzIHRoYXQgYXJlIHN0aWxsIGluIHRoZSByaW5nLiBT byBhZnRlciB0aGUKcmVzZXQsIGNhbGwgdXBkYXRlX3BsYW5lKCkgZm9yIGFsbCBDUlRDcyB0byBt YWtlIHN1cmUgdGhlIHByaW1hcnkKcGxhbmVzIGFyZSBzY2FubmluZyBvdXQgZnJvbSB0aGUgY29y cmVjdCBidWZmZXIuCgpUaGUgYmFzZSBhZGRyZXNzIHVwZGF0ZSB3aWxsIGFsc28gZ2VuZXJhdGUg YSBGTElQX0RPTkUgaW50ZXJydXB0LCB3aGljaAp3aWxsIGNvbXBsZXRlIGFueSBwZW5kaW5nIGZs aXBzLiBUaGF0IG1lYW5zIHVzZXIgc3BhY2Ugd2lsbCBnZXQgaXRzCnBhZ2UgZmxpcCBldmVudHMg YW5kIHdvbid0IGdldCBzdHVjayB3YWl0aW5nIGZvciB0aGVtLgoKU2lnbmVkLW9mZi1ieTogVmls bGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIHwgMjYgKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICsrCiAzIGZpbGVzIGNoYW5nZWQs IDMwIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA2NzI4MTZhLi44 NzM1NTJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTkxNyw2ICs5MTcsOCBAQCBzdGF0 aWMgdm9pZCBpOTE1X2Vycm9yX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAK IAkJd2FrZV91cF9hbGwoJmRldl9wcml2LT5wZW5kaW5nX2ZsaXBfcXVldWUpOwogCisJCWludGVs X2Rpc3BsYXlfaGFuZGxlX3Jlc2V0KGRldik7CisKIAkJd2FrZV91cF9hbGwoJmRldl9wcml2LT5n cHVfZXJyb3IucmVzZXRfcXVldWUpOwogCX0KIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBmMGM2NDE2Li45ODM4ZGExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0yMjE4LDYgKzIyMTgsMzIgQEAgaW50ZWxfcGlwZV9zZXRfYmFzZV9hdG9taWMo c3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAlyZXR1 cm4gZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3BsYW5lKGNydGMsIGZiLCB4LCB5KTsKIH0KIAor dm9pZCBpbnRlbF9kaXNwbGF5X2hhbmRsZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQor eworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 CisJc3RydWN0IGRybV9jcnRjICpjcnRjOworCisJLyoKKwkgKiBGbGlwcyBpbiB0aGUgcmluZ3Mg aGF2ZSBiZWVuIG51a2VkIGJ5IHRoZSByZXNldCwKKwkgKiBzbyBqdXN0IHVwZGF0ZSB0aGUgYmFz ZSBhZGRyZXNzIG9mIGFsbCBwcmltYXJ5CisJICogcGxhbmVzIHRvIHRoZSB0aGUgbGFzdCBmYiB0 byBtYWtlIHN1cmUgd2UncmUKKwkgKiBzaG93aW5nIHRoZSBjb3JyZWN0IGZiIGFmdGVyIGEgcmVz ZXQuCisJICoKKwkgKiBBcyBhIG5pY2Ugc2lkZSBlZmZlY3QgdGhpcyBhbHNvIGdlbmVyYXRlcyBh IEZMSVBfRE9ORQorCSAqIGludGVycnVwdCB3aGljaCB3aWxsIGNvbXBsZXRlIHBlbmRpbmcgcGFn ZSBmbGlwcywgYW5kCisJICogdGh1cyB1c2VyIHNwYWNlIHdpbGwgZ2V0IGl0cyBldmVudHMgYW5k IG5vdCBnZXQgc3R1Y2suCisJICovCisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYt Pm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgeworCQltdXRleF9sb2NrKCZjcnRjLT5tdXRl eCk7CisKKwkJaWYgKHRvX2ludGVsX2NydGMoY3J0YyktPmFjdGl2ZSkKKwkJCWRldl9wcml2LT5k aXNwbGF5LnVwZGF0ZV9wbGFuZShjcnRjLCBjcnRjLT5mYiwgY3J0Yy0+eCwgY3J0Yy0+eSk7CisK KwkJbXV0ZXhfdW5sb2NrKCZjcnRjLT5tdXRleCk7CisJfQorfQorCiBzdGF0aWMgaW50CiBpbnRl bF9maW5pc2hfZmIoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2ZiKQogewpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAppbmRleCBkMjgyMDUyLi4wZGMxNGMyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtNjk0LDQgKzY5NCw2IEBAIGV4dGVybiBib29sCiBpbnRlbF9kZGlfY29ubmVj dG9yX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3Ip OwogZXh0ZXJuIHZvaWQgaW50ZWxfZGRpX2ZkaV9kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0 Yyk7CiAKK2V4dGVybiB2b2lkIGludGVsX2Rpc3BsYXlfaGFuZGxlX3Jlc2V0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpOworCiAjZW5kaWYgLyogX19JTlRFTF9EUlZfSF9fICovCi0tIAoxLjcuMTIu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK