From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Deucher <alexdeucher@gmail.com>
Subject: [PATCH] drm/radeon: don't init gpuvm if accel is disabled (v3)
Date: Fri, 30 Jan 2015 09:54:03 -0500
Message-ID: <1422629644-4766-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: <dri-devel-bounces@lists.freedesktop.org>
Received: from mail-qa0-f42.google.com (mail-qa0-f42.google.com
 [209.85.216.42])
 by gabe.freedesktop.org (Postfix) with ESMTP id 5F57D6E7A4
 for <dri-devel@lists.freedesktop.org>; Fri, 30 Jan 2015 06:54:10 -0800 (PST)
Received: by mail-qa0-f42.google.com with SMTP id dc16so20184079qab.1
 for <dri-devel@lists.freedesktop.org>; Fri, 30 Jan 2015 06:54:09 -0800 (PST)
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>, stable@vger.kernel.org
List-Id: dri-devel@lists.freedesktop.org

SWYgYWNjZWxlcmF0aW9uIGlzIGRpc2FibGVkLCBpdCBkb2VzIG5vdCBtYWtlIHNlbnNlCnRvIGlu
aXQgZ3B1dm0gc2luY2Ugbm90aGluZyB3aWxsIHVzZSBpdC4gIE1vcmVvdmVyLAppZiByYWRlb25f
dm1faW5pdCgpIGdldHMgY2FsbGVkIGl0IHVzZXMgYWNjZWwgdG8gdHJ5CmFuZCBjbGVhciB0aGUg
cGRlIHRhYmxlcywgZXRjLiB3aGljaCByZXN1bHRzIGluIGEgYnVnLgoKdjI6IGhhbmRsZSB2bV9m
aW5pIGFzIHdlbGwKdjM6IGhhbmRsZSBib19vcGVuL2Nsb3NlIGFzIHdlbGwKCkJ1ZzoKaHR0cHM6
Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg3ODYKClNpZ25lZC1vZmYt
Ynk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KQ2M6IHN0YWJsZUB2
Z2VyLmtlcm5lbC5vcmcKLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nZW0uYyB8
ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa21zLmMgfCAxNiArKysr
KysrKy0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEwIGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dlbS5j
IGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2VtLmMKaW5kZXggZDBiNGY3ZC4uYWMz
YzEzMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2VtLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2VtLmMKQEAgLTE0Niw3ICsxNDYsOCBA
QCBpbnQgcmFkZW9uX2dlbV9vYmplY3Rfb3BlbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwg
c3RydWN0IGRybV9maWxlICpmaWxlX3ByaQogCXN0cnVjdCByYWRlb25fYm9fdmEgKmJvX3ZhOwog
CWludCByOwogCi0JaWYgKHJkZXYtPmZhbWlseSA8IENISVBfQ0FZTUFOKSB7CisJaWYgKChyZGV2
LT5mYW1pbHkgPCBDSElQX0NBWU1BTikgfHwKKwkgICAgKCFyZGV2LT5hY2NlbF93b3JraW5nKSkg
ewogCQlyZXR1cm4gMDsKIAl9CiAKQEAgLTE3Niw3ICsxNzcsOCBAQCB2b2lkIHJhZGVvbl9nZW1f
b2JqZWN0X2Nsb3NlKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLAogCXN0cnVjdCByYWRlb25f
Ym9fdmEgKmJvX3ZhOwogCWludCByOwogCi0JaWYgKHJkZXYtPmZhbWlseSA8IENISVBfQ0FZTUFO
KSB7CisJaWYgKChyZGV2LT5mYW1pbHkgPCBDSElQX0NBWU1BTikgfHwKKwkgICAgKCFyZGV2LT5h
Y2NlbF93b3JraW5nKSkgewogCQlyZXR1cm47CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u
X2ttcy5jCmluZGV4IDNjZjljMWYuLjY4NjQxMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9yYWRlb24vcmFkZW9uX2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u
X2ttcy5jCkBAIC02MDUsMTQgKzYwNSwxNCBAQCBpbnQgcmFkZW9uX2RyaXZlcl9vcGVuX2ttcyhz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIAkJCXJl
dHVybiAtRU5PTUVNOwogCQl9CiAKLQkJdm0gPSAmZnByaXYtPnZtOwotCQlyID0gcmFkZW9uX3Zt
X2luaXQocmRldiwgdm0pOwotCQlpZiAocikgewotCQkJa2ZyZWUoZnByaXYpOwotCQkJcmV0dXJu
IHI7Ci0JCX0KLQogCQlpZiAocmRldi0+YWNjZWxfd29ya2luZykgeworCQkJdm0gPSAmZnByaXYt
PnZtOworCQkJciA9IHJhZGVvbl92bV9pbml0KHJkZXYsIHZtKTsKKwkJCWlmIChyKSB7CisJCQkJ
a2ZyZWUoZnByaXYpOworCQkJCXJldHVybiByOworCQkJfQorCiAJCQlyID0gcmFkZW9uX2JvX3Jl
c2VydmUocmRldi0+cmluZ190bXBfYm8uYm8sIGZhbHNlKTsKIAkJCWlmIChyKSB7CiAJCQkJcmFk
ZW9uX3ZtX2ZpbmkocmRldiwgdm0pOwpAQCAtNjY4LDkgKzY2OCw5IEBAIHZvaWQgcmFkZW9uX2Ry
aXZlcl9wb3N0Y2xvc2Vfa21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCXJhZGVvbl92
bV9ib19ybXYocmRldiwgdm0tPmliX2JvX3ZhKTsKIAkJCQlyYWRlb25fYm9fdW5yZXNlcnZlKHJk
ZXYtPnJpbmdfdG1wX2JvLmJvKTsKIAkJCX0KKwkJCXJhZGVvbl92bV9maW5pKHJkZXYsIHZtKTsK
IAkJfQogCi0JCXJhZGVvbl92bV9maW5pKHJkZXYsIHZtKTsKIAkJa2ZyZWUoZnByaXYpOwogCQlm
aWxlX3ByaXYtPmRyaXZlcl9wcml2ID0gTlVMTDsKIAl9Ci0tIAoxLjguMy4xCgpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs
aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=