From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH] drm/radeon: don't init gpuvm if accel is disabled (v2) Date: Thu, 29 Jan 2015 10:35:20 -0500 Message-ID: <1422545720-19456-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f52.google.com (mail-qg0-f52.google.com [209.85.192.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E05589DBC for ; Thu, 29 Jan 2015 07:35:26 -0800 (PST) Received: by mail-qg0-f52.google.com with SMTP id z107so29655778qgd.11 for ; Thu, 29 Jan 2015 07:35:26 -0800 (PST) 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: Alex Deucher , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org SWYgYWNjZWxlcmF0aW9uIGlzIGRpc2FibGVkLCBpdCBkb2VzIG5vdCBtYWtlIHNlbnNlCnRvIGlu aXQgZ3B1dm0gc2luY2Ugbm90aGluZyB3aWxsIHVzZSBpdC4gIE1vcmVvdmVyLAppZiByYWRlb25f dm1faW5pdCgpIGdldHMgY2FsbGVkIGl0IHVzZXMgYWNjZWwgdG8gdHJ5CmFuZCBjbGVhciB0aGUg cGRlIHRhYmxlcywgZXRjLiB3aGljaCByZXN1bHRzIGluIGEgYnVnLgoKdjI6IGhhbmRsZSB2bV9m aW5pIGFzIHdlbGwKCkJ1ZzoKaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODg3ODYKClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNo ZXJAYW1kLmNvbT4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKLS0tCiBkcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbl9rbXMuYyB8IDE2ICsrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA4IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9rbXMuYwppbmRleCAzY2Y5YzFmLi42ODY0MTFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9rbXMuYwpAQCAtNjA1LDE0ICs2MDUsMTQgQEAgaW50IHJhZGVvbl9kcml2ZXJfb3Blbl9r bXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiAJ CQlyZXR1cm4gLUVOT01FTTsKIAkJfQogCi0JCXZtID0gJmZwcml2LT52bTsKLQkJciA9IHJhZGVv bl92bV9pbml0KHJkZXYsIHZtKTsKLQkJaWYgKHIpIHsKLQkJCWtmcmVlKGZwcml2KTsKLQkJCXJl dHVybiByOwotCQl9Ci0KIAkJaWYgKHJkZXYtPmFjY2VsX3dvcmtpbmcpIHsKKwkJCXZtID0gJmZw cml2LT52bTsKKwkJCXIgPSByYWRlb25fdm1faW5pdChyZGV2LCB2bSk7CisJCQlpZiAocikgewor CQkJCWtmcmVlKGZwcml2KTsKKwkJCQlyZXR1cm4gcjsKKwkJCX0KKwogCQkJciA9IHJhZGVvbl9i b19yZXNlcnZlKHJkZXYtPnJpbmdfdG1wX2JvLmJvLCBmYWxzZSk7CiAJCQlpZiAocikgewogCQkJ CXJhZGVvbl92bV9maW5pKHJkZXYsIHZtKTsKQEAgLTY2OCw5ICs2NjgsOSBAQCB2b2lkIHJhZGVv bl9kcml2ZXJfcG9zdGNsb3NlX2ttcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQlyYWRl b25fdm1fYm9fcm12KHJkZXYsIHZtLT5pYl9ib192YSk7CiAJCQkJcmFkZW9uX2JvX3VucmVzZXJ2 ZShyZGV2LT5yaW5nX3RtcF9iby5ibyk7CiAJCQl9CisJCQlyYWRlb25fdm1fZmluaShyZGV2LCB2 bSk7CiAJCX0KIAotCQlyYWRlb25fdm1fZmluaShyZGV2LCB2bSk7CiAJCWtmcmVlKGZwcml2KTsK IAkJZmlsZV9wcml2LT5kcml2ZXJfcHJpdiA9IE5VTEw7CiAJfQotLSAKMS44LjMuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK