From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 12/15] drm/radeon: remove vm_manager start/suspend Date: Thu, 12 Jul 2012 18:12:51 +0200 Message-ID: <1342109574-8107-13-git-send-email-deathsimple@vodafone.de> References: <1342109574-8107-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id BE1689E8AB for ; Thu, 12 Jul 2012 09:13:05 -0700 (PDT) In-Reply-To: <1342109574-8107-1-git-send-email-deathsimple@vodafone.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SnVzdCByZXN0b3JlIHRoZSBwYWdlIHRhYmxlIGluc3RlYWQuIEFkZHJlc3NpbmcgdGhyZWUKcHJv YmxlbSB3aXRoIHRoaXMgY2hhbmdlOgoKMS4gQ2FsbGluZyB2bV9tYW5hZ2VyX3N1c3BlbmQgaW4g dGhlIHN1c3BlbmQgcGF0aCBpcwogICBwcm9ibGVtYXRpYyBjYXVzZSBpdCB3YW50cyB0byB3YWl0 IGZvciB0aGUgVk0gdXNlCiAgIHRvIGVuZCwgd2hpY2ggaW4gY2FzZSBvZiBhIGxvY2t1cCBuZXZl ciBoYXBwZW5zLgoKMi4gSW4gY2FzZSBvZiBhIGxvY2tlZCB1cCBtZW1vcnkgY29udHJvbGxlcgog ICB1bmJpbmRpbmcgdGhlIFZNIHNlZW1zIHRvIG1ha2UgaXQgZXZlbiBtb3JlCiAgIHVuc3RhYmxl LCBjcmVhdGluZyBhbiB1bnJlY292ZXJhYmxlIGxvY2t1cAogICBpbiB0aGUgZW5kLgoKMy4gSWYg d2Ugd2FudCB0byBiYWNrdXAvcmVzdG9yZSB0aGUgbGVmdG92ZXIgcmluZwogICBjb250ZW50IHdl IG11c3Qgbm90IHVuYmluZCBWTXMgaW4gYmV0d2Vlbi4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlh biBLw7ZuaWcgPGRlYXRoc2ltcGxlQHZvZGFmb25lLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9y YWRlb24vbmkuYyAgICAgICAgICB8ICAgMTIgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uLmggICAgICB8ICAgIDIgLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2Fy dC5jIHwgICA4MyArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3NpLmMgICAgICAgICAgfCAgIDEyICsrLS0tCiA0IGZpbGVzIGNoYW5nZWQs IDU5IGluc2VydGlvbnMoKyksIDUwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vbmkuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vbmkuYwppbmRleCA0 MDA0Mzc2Li5lYzUzMDdjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL25pLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9uaS5jCkBAIC0xMjgwLDkgKzEyODAsMTEgQEAg c3RhdGljIGludCBjYXltYW5fc3RhcnR1cChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAlp ZiAocikKIAkJcmV0dXJuIHI7CiAKLQlyID0gcmFkZW9uX3ZtX21hbmFnZXJfc3RhcnQocmRldik7 Ci0JaWYgKHIpCisJciA9IHJhZGVvbl92bV9tYW5hZ2VyX2luaXQocmRldik7CisJaWYgKHIpIHsK KwkJZGV2X2VycihyZGV2LT5kZXYsICJ2bSBtYW5hZ2VyIGluaXRpYWxpemF0aW9uIGZhaWxlZCAo JWQpLlxuIiwgcik7CiAJCXJldHVybiByOworCX0KIAogCXIgPSByNjAwX2F1ZGlvX2luaXQocmRl dik7CiAJaWYgKHIpCkBAIC0xMzE1LDcgKzEzMTcsNiBAQCBpbnQgY2F5bWFuX3Jlc3VtZShzdHJ1 Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIGludCBjYXltYW5fc3VzcGVuZChzdHJ1Y3QgcmFkZW9u X2RldmljZSAqcmRldikKIHsKIAlyNjAwX2F1ZGlvX2ZpbmkocmRldik7Ci0JcmFkZW9uX3ZtX21h bmFnZXJfc3VzcGVuZChyZGV2KTsKIAljYXltYW5fY3BfZW5hYmxlKHJkZXYsIGZhbHNlKTsKIAly ZGV2LT5yaW5nW1JBREVPTl9SSU5HX1RZUEVfR0ZYX0lOREVYXS5yZWFkeSA9IGZhbHNlOwogCWV2 ZXJncmVlbl9pcnFfc3VzcGVuZChyZGV2KTsKQEAgLTEzOTIsMTEgKzEzOTMsNiBAQCBpbnQgY2F5 bWFuX2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJCXJldHVybiByOwogCiAJcmRl di0+YWNjZWxfd29ya2luZyA9IHRydWU7Ci0JciA9IHJhZGVvbl92bV9tYW5hZ2VyX2luaXQocmRl dik7Ci0JaWYgKHIpIHsKLQkJZGV2X2VycihyZGV2LT5kZXYsICJ2bSBtYW5hZ2VyIGluaXRpYWxp emF0aW9uIGZhaWxlZCAoJWQpLlxuIiwgcik7Ci0JfQotCiAJciA9IGNheW1hbl9zdGFydHVwKHJk ZXYpOwogCWlmIChyKSB7CiAJCWRldl9lcnIocmRldi0+ZGV2LCAiZGlzYWJsaW5nIEdQVSBhY2Nl bGVyYXRpb25cbiIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24u aCBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggOGE4YzNmOC4uODcyMjcw YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0xNzU5LDggKzE3NTksNiBAQCBleHRlcm4g dm9pZCByYWRlb25fdHRtX3NldF9hY3RpdmVfdnJhbV9zaXplKHN0cnVjdCByYWRlb25fZGV2aWNl ICpyZGV2LCB1NjQgc2l6ZQogICovCiBpbnQgcmFkZW9uX3ZtX21hbmFnZXJfaW5pdChzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldik7CiB2b2lkIHJhZGVvbl92bV9tYW5hZ2VyX2Zpbmkoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYpOwotaW50IHJhZGVvbl92bV9tYW5hZ2VyX3N0YXJ0KHN0cnVj dCByYWRlb25fZGV2aWNlICpyZGV2KTsKLWludCByYWRlb25fdm1fbWFuYWdlcl9zdXNwZW5kKHN0 cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KTsKIGludCByYWRlb25fdm1faW5pdChzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldiwgc3RydWN0IHJhZGVvbl92bSAqdm0pOwogdm9pZCByYWRlb25fdm1f ZmluaShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgc3RydWN0IHJhZGVvbl92bSAqdm0pOwog aW50IHJhZGVvbl92bV9iaW5kKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBzdHJ1Y3QgcmFk ZW9uX3ZtICp2bSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9n YXJ0LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nYXJ0LmMKaW5kZXggZWUxMWM1 MC4uNTY3NTJkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2Fy dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dhcnQuYwpAQCAtMjgyLDI3 ICsyODIsNTggQEAgdm9pZCByYWRlb25fZ2FydF9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpy ZGV2KQogICoKICAqIFRPRE8gYmluZCBhIGRlZmF1bHQgcGFnZSBhdCB2bSBpbml0aWFsaXphdGlv biBmb3IgZGVmYXVsdCBhZGRyZXNzCiAgKi8KKwogaW50IHJhZGVvbl92bV9tYW5hZ2VyX2luaXQo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiB7CisJc3RydWN0IHJhZGVvbl92bSAqdm07CisJ c3RydWN0IHJhZGVvbl9ib192YSAqYm9fdmE7CiAJaW50IHI7CiAKLQlyZGV2LT52bV9tYW5hZ2Vy LmVuYWJsZWQgPSBmYWxzZTsKKwlpZiAoIXJkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCkgeworCQkv KiBtYXJrIGZpcnN0IHZtIGFzIGFsd2F5cyBpbiB1c2UsIGl0J3MgdGhlIHN5c3RlbSBvbmUgKi8K KwkJciA9IHJhZGVvbl9zYV9ib19tYW5hZ2VyX2luaXQocmRldiwgJnJkZXYtPnZtX21hbmFnZXIu c2FfbWFuYWdlciwKKwkJCQkJICAgICAgcmRldi0+dm1fbWFuYWdlci5tYXhfcGZuICogOCwKKwkJ CQkJICAgICAgUkFERU9OX0dFTV9ET01BSU5fVlJBTSk7CisJCWlmIChyKSB7CisJCQlkZXZfZXJy KHJkZXYtPmRldiwgImZhaWxlZCB0byBhbGxvY2F0ZSB2bSBibyAoJWRLQilcbiIsCisJCQkJKHJk ZXYtPnZtX21hbmFnZXIubWF4X3BmbiAqIDgpID4+IDEwKTsKKwkJCXJldHVybiByOworCQl9CiAK LQkvKiBtYXJrIGZpcnN0IHZtIGFzIGFsd2F5cyBpbiB1c2UsIGl0J3MgdGhlIHN5c3RlbSBvbmUg Ki8KLQlyID0gcmFkZW9uX3NhX2JvX21hbmFnZXJfaW5pdChyZGV2LCAmcmRldi0+dm1fbWFuYWdl ci5zYV9tYW5hZ2VyLAotCQkJCSAgICAgIHJkZXYtPnZtX21hbmFnZXIubWF4X3BmbiAqIDgsCi0J CQkJICAgICAgUkFERU9OX0dFTV9ET01BSU5fVlJBTSk7Ci0JaWYgKHIpIHsKLQkJZGV2X2Vycihy ZGV2LT5kZXYsICJmYWlsZWQgdG8gYWxsb2NhdGUgdm0gYm8gKCVkS0IpXG4iLAotCQkJKHJkZXYt PnZtX21hbmFnZXIubWF4X3BmbiAqIDgpID4+IDEwKTsKLQkJcmV0dXJuIHI7CisJCXIgPSByZGV2 LT52bV9tYW5hZ2VyLmZ1bmNzLT5pbml0KHJkZXYpOworCQlpZiAocikKKwkJCXJldHVybiByOwor CQorCQlyZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQgPSB0cnVlOworCisJCXIgPSByYWRlb25fc2Ff Ym9fbWFuYWdlcl9zdGFydChyZGV2LCAmcmRldi0+dm1fbWFuYWdlci5zYV9tYW5hZ2VyKTsKKwkJ aWYgKHIpCisJCQlyZXR1cm4gcjsKIAl9CiAKLQlyID0gcmRldi0+dm1fbWFuYWdlci5mdW5jcy0+ aW5pdChyZGV2KTsKLQlpZiAociA9PSAwKQotCQlyZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQgPSB0 cnVlOworCS8qIHJlc3RvcmUgcGFnZSB0YWJsZSAqLworCWxpc3RfZm9yX2VhY2hfZW50cnkodm0s ICZyZGV2LT52bV9tYW5hZ2VyLmxydV92bSwgbGlzdCkgeworCQlpZiAodm0tPmlkID09IC0xKQor CQkJY29udGludWU7CiAKLQlyZXR1cm4gcjsKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShib192YSwg JnZtLT52YSwgdm1fbGlzdCkgeworCQkJc3RydWN0IHR0bV9tZW1fcmVnICptZW0gPSBOVUxMOwor CQkJaWYgKGJvX3ZhLT52YWxpZCkKKwkJCQltZW0gPSAmYm9fdmEtPmJvLT50Ym8ubWVtOworCisJ CQlib192YS0+dmFsaWQgPSBmYWxzZTsKKwkJCXIgPSByYWRlb25fdm1fYm9fdXBkYXRlX3B0ZShy ZGV2LCB2bSwgYm9fdmEtPmJvLCBtZW0pOworCQkJaWYgKHIpIHsKKwkJCQlEUk1fRVJST1IoIkZh aWxlZCB0byB1cGRhdGUgcHRlIGZvciB2bSAlZCFcbiIsIHZtLT5pZCk7CisJCQl9CisJCX0KKwor CQlyID0gcmRldi0+dm1fbWFuYWdlci5mdW5jcy0+YmluZChyZGV2LCB2bSwgdm0tPmlkKTsKKwkJ aWYgKHIpIHsKKwkJCURSTV9FUlJPUigiRmFpbGVkIHRvIGJpbmQgdm0gJWQhXG4iLCB2bS0+aWQp OworCQl9CisJfQorCXJldHVybiAwOwogfQogCiAvKiBnbG9iYWwgbXV0ZXggbXVzdCBiZSBsb2Nr ICovCkBAIC0zNDcsMjYgKzM3OCwxMSBAQCBzdGF0aWMgdm9pZCByYWRlb25fdm1fdW5iaW5kX2xv Y2tlZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAogdm9pZCByYWRlb25fdm1fbWFuYWdl cl9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogewotCWlmIChyZGV2LT52bV9tYW5h Z2VyLnNhX21hbmFnZXIuYm8gPT0gTlVMTCkKLQkJcmV0dXJuOwotCXJhZGVvbl92bV9tYW5hZ2Vy X3N1c3BlbmQocmRldik7Ci0JcmRldi0+dm1fbWFuYWdlci5mdW5jcy0+ZmluaShyZGV2KTsKLQly YWRlb25fc2FfYm9fbWFuYWdlcl9maW5pKHJkZXYsICZyZGV2LT52bV9tYW5hZ2VyLnNhX21hbmFn ZXIpOwotCXJkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCA9IGZhbHNlOwotfQotCi1pbnQgcmFkZW9u X3ZtX21hbmFnZXJfc3RhcnQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCi17Ci0JaWYgKHJk ZXYtPnZtX21hbmFnZXIuc2FfbWFuYWdlci5ibyA9PSBOVUxMKSB7Ci0JCXJldHVybiAtRUlOVkFM OwotCX0KLQlyZXR1cm4gcmFkZW9uX3NhX2JvX21hbmFnZXJfc3RhcnQocmRldiwgJnJkZXYtPnZt X21hbmFnZXIuc2FfbWFuYWdlcik7Ci19Ci0KLWludCByYWRlb25fdm1fbWFuYWdlcl9zdXNwZW5k KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQotewogCXN0cnVjdCByYWRlb25fdm0gKnZtLCAq dG1wOwogCisJaWYgKCFyZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQpCisJCXJldHVybjsKKwogCW11 dGV4X2xvY2soJnJkZXYtPnZtX21hbmFnZXIubG9jayk7CiAJLyogdW5iaW5kIGFsbCBhY3RpdmUg dm0gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUodm0sIHRtcCwgJnJkZXYtPnZtX21hbmFn ZXIubHJ1X3ZtLCBsaXN0KSB7CkBAIC0zNzQsNyArMzkwLDEwIEBAIGludCByYWRlb25fdm1fbWFu YWdlcl9zdXNwZW5kKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCX0KIAlyZGV2LT52bV9t YW5hZ2VyLmZ1bmNzLT5maW5pKHJkZXYpOwogCW11dGV4X3VubG9jaygmcmRldi0+dm1fbWFuYWdl ci5sb2NrKTsKLQlyZXR1cm4gcmFkZW9uX3NhX2JvX21hbmFnZXJfc3VzcGVuZChyZGV2LCAmcmRl di0+dm1fbWFuYWdlci5zYV9tYW5hZ2VyKTsKKworCXJhZGVvbl9zYV9ib19tYW5hZ2VyX3N1c3Bl bmQocmRldiwgJnJkZXYtPnZtX21hbmFnZXIuc2FfbWFuYWdlcik7CisJcmFkZW9uX3NhX2JvX21h bmFnZXJfZmluaShyZGV2LCAmcmRldi0+dm1fbWFuYWdlci5zYV9tYW5hZ2VyKTsKKwlyZGV2LT52 bV9tYW5hZ2VyLmVuYWJsZWQgPSBmYWxzZTsKIH0KIAogLyogZ2xvYmFsIG11dGV4IG11c3QgYmUg bG9ja2VkICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMKaW5kZXggN2MyNjE4Yi4uMmI2OTFhYiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9zaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vc2kuYwpAQCAtMzc3Nyw5ICszNzc3LDExIEBAIHN0YXRpYyBpbnQgc2lfc3RhcnR1cChzdHJ1 Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJcmV0dXJuIHI7CiAJfQogCi0JciA9IHJhZGVvbl92 bV9tYW5hZ2VyX3N0YXJ0KHJkZXYpOwotCWlmIChyKQorCXIgPSByYWRlb25fdm1fbWFuYWdlcl9p bml0KHJkZXYpOworCWlmIChyKSB7CisJCWRldl9lcnIocmRldi0+ZGV2LCAidm0gbWFuYWdlciBp bml0aWFsaXphdGlvbiBmYWlsZWQgKCVkKS5cbiIsIHIpOwogCQlyZXR1cm4gcjsKKwl9CiAKIAly ZXR1cm4gMDsKIH0KQEAgLTM4MDksNyArMzgxMSw2IEBAIGludCBzaV9yZXN1bWUoc3RydWN0IHJh ZGVvbl9kZXZpY2UgKnJkZXYpCiAKIGludCBzaV9zdXNwZW5kKHN0cnVjdCByYWRlb25fZGV2aWNl ICpyZGV2KQogewotCXJhZGVvbl92bV9tYW5hZ2VyX3N1c3BlbmQocmRldik7CiAJc2lfY3BfZW5h YmxlKHJkZXYsIGZhbHNlKTsKIAlyZGV2LT5yaW5nW1JBREVPTl9SSU5HX1RZUEVfR0ZYX0lOREVY XS5yZWFkeSA9IGZhbHNlOwogCXJkZXYtPnJpbmdbQ0FZTUFOX1JJTkdfVFlQRV9DUDFfSU5ERVhd LnJlYWR5ID0gZmFsc2U7CkBAIC0zODk5LDExICszOTAwLDYgQEAgaW50IHNpX2luaXQoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJCXJldHVybiByOwogCiAJcmRldi0+YWNjZWxfd29ya2lu ZyA9IHRydWU7Ci0JciA9IHJhZGVvbl92bV9tYW5hZ2VyX2luaXQocmRldik7Ci0JaWYgKHIpIHsK LQkJZGV2X2VycihyZGV2LT5kZXYsICJ2bSBtYW5hZ2VyIGluaXRpYWxpemF0aW9uIGZhaWxlZCAo JWQpLlxuIiwgcik7Ci0JfQotCiAJciA9IHNpX3N0YXJ0dXAocmRldik7CiAJaWYgKHIpIHsKIAkJ ZGV2X2VycihyZGV2LT5kZXYsICJkaXNhYmxpbmcgR1BVIGFjY2VsZXJhdGlvblxuIik7Ci0tIAox LjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=