From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 7/8] drm/amdgpu: move locking into the functions who need it Date: Wed, 25 May 2016 17:04:21 -0400 Message-ID: <1464210262-2912-8-git-send-email-alexander.deucher@amd.com> References: <1464210262-2912-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-ig0-x243.google.com (mail-ig0-x243.google.com [IPv6:2607:f8b0:4001:c05::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70B9D6E2A9 for ; Wed, 25 May 2016 21:04:37 +0000 (UTC) Received: by mail-ig0-x243.google.com with SMTP id ct2so2435761igb.3 for ; Wed, 25 May 2016 14:04:37 -0700 (PDT) In-Reply-To: <1464210262-2912-1-git-send-email-alexander.deucher@amd.com> 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 , =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKT3RoZXJ3 aXNlIHRoZSBsb2NraW5nIGJlY29tZXMgcmF0aGVyIGNvbmZ1c2luZy4KClNpZ25lZC1vZmYtYnk6 IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6 IE1vbmsuTGl1IDxtb25rLmxpdUBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIg PGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hl ZHVsZXIvZ3B1X3NjaGVkdWxlci5jIHwgMTggKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuYwppbmRleCBmMmVkOGM1Li5jYjU2ZDkwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1X3NjaGVkdWxlci5jCkBAIC0z MzMsNyArMzMzLDExIEBAIHN0YXRpYyB2b2lkIGFtZF9zY2hlZF9qb2JfZmluaXNoKHN0cnVjdCBh bWRfc2NoZWRfam9iICpzX2pvYikKIHsKIAlzdHJ1Y3QgYW1kX3NjaGVkX2pvYiAqbmV4dDsKIAlz dHJ1Y3QgYW1kX2dwdV9zY2hlZHVsZXIgKnNjaGVkID0gc19qb2ItPnNjaGVkOworCXVuc2lnbmVk IGxvbmcgZmxhZ3M7CiAKKwkvKiByZW1vdmUgam9iIGZyb20gcmluZ19taXJyb3JfbGlzdCAqLwor CXNwaW5fbG9ja19pcnFzYXZlKCZzY2hlZC0+am9iX2xpc3RfbG9jaywgZmxhZ3MpOworCWxpc3Rf ZGVsX2luaXQoJnNfam9iLT5ub2RlKTsKIAlpZiAoc2NoZWQtPnRpbWVvdXQgIT0gTUFYX1NDSEVE VUxFX1RJTUVPVVQpIHsKIAkJaWYgKGNhbmNlbF9kZWxheWVkX3dvcmsoJnNfam9iLT53b3JrX3Rk cikpCiAJCQlhbWRfc2NoZWRfam9iX3B1dChzX2pvYik7CkBAIC0zNDcsMTIgKzM1MSwxNiBAQCBz dGF0aWMgdm9pZCBhbWRfc2NoZWRfam9iX2ZpbmlzaChzdHJ1Y3QgYW1kX3NjaGVkX2pvYiAqc19q b2IpCiAJCQlzY2hlZHVsZV9kZWxheWVkX3dvcmsoJm5leHQtPndvcmtfdGRyLCBzY2hlZC0+dGlt ZW91dCk7CiAJCX0KIAl9CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmc2NoZWQtPmpvYl9saXN0 X2xvY2ssIGZsYWdzKTsKIH0KIAogc3RhdGljIHZvaWQgYW1kX3NjaGVkX2pvYl9iZWdpbihzdHJ1 Y3QgYW1kX3NjaGVkX2pvYiAqc19qb2IpCiB7CiAJc3RydWN0IGFtZF9ncHVfc2NoZWR1bGVyICpz Y2hlZCA9IHNfam9iLT5zY2hlZDsKKwl1bnNpZ25lZCBsb25nIGZsYWdzOwogCisJc3Bpbl9sb2Nr X2lycXNhdmUoJnNjaGVkLT5qb2JfbGlzdF9sb2NrLCBmbGFncyk7CisJbGlzdF9hZGRfdGFpbCgm c19qb2ItPm5vZGUsICZzY2hlZC0+cmluZ19taXJyb3JfbGlzdCk7CiAJaWYgKHNjaGVkLT50aW1l b3V0ICE9IE1BWF9TQ0hFRFVMRV9USU1FT1VUICYmCiAJICAgIGxpc3RfZmlyc3RfZW50cnlfb3Jf bnVsbCgmc2NoZWQtPnJpbmdfbWlycm9yX2xpc3QsCiAJCQkJICAgICBzdHJ1Y3QgYW1kX3NjaGVk X2pvYiwgbm9kZSkgPT0gc19qb2IpCkBAIC0zNjAsNiArMzY4LDcgQEAgc3RhdGljIHZvaWQgYW1k X3NjaGVkX2pvYl9iZWdpbihzdHJ1Y3QgYW1kX3NjaGVkX2pvYiAqc19qb2IpCiAJCWFtZF9zY2hl ZF9qb2JfZ2V0KHNfam9iKTsKIAkJc2NoZWR1bGVfZGVsYXllZF93b3JrKCZzX2pvYi0+d29ya190 ZHIsIHNjaGVkLT50aW1lb3V0KTsKIAl9CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmc2NoZWQt PmpvYl9saXN0X2xvY2ssIGZsYWdzKTsKIH0KIAogc3RhdGljIHZvaWQgYW1kX3NjaGVkX2pvYl90 aW1lZG91dChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCkBAIC00NTcsMTUgKzQ2NiwxMCBAQCBz dGF0aWMgdm9pZCBhbWRfc2NoZWRfcHJvY2Vzc19qb2Ioc3RydWN0IGZlbmNlICpmLCBzdHJ1Y3Qg ZmVuY2VfY2IgKmNiKQogCXN0cnVjdCBhbWRfc2NoZWRfZmVuY2UgKnNfZmVuY2UgPQogCQljb250 YWluZXJfb2YoY2IsIHN0cnVjdCBhbWRfc2NoZWRfZmVuY2UsIGNiKTsKIAlzdHJ1Y3QgYW1kX2dw dV9zY2hlZHVsZXIgKnNjaGVkID0gc19mZW5jZS0+c2NoZWQ7Ci0JdW5zaWduZWQgbG9uZyBmbGFn czsKIAogCWF0b21pY19kZWMoJnNjaGVkLT5od19ycV9jb3VudCk7CiAKLQkvKiByZW1vdmUgam9i IGZyb20gcmluZ19taXJyb3JfbGlzdCAqLwotCXNwaW5fbG9ja19pcnFzYXZlKCZzY2hlZC0+am9i X2xpc3RfbG9jaywgZmxhZ3MpOwotCWxpc3RfZGVsX2luaXQoJnNfZmVuY2UtPnNfam9iLT5ub2Rl KTsKIAlhbWRfc2NoZWRfam9iX2ZpbmlzaChzX2ZlbmNlLT5zX2pvYik7Ci0Jc3Bpbl91bmxvY2tf aXJxcmVzdG9yZSgmc2NoZWQtPmpvYl9saXN0X2xvY2ssIGZsYWdzKTsKIAogCWFtZF9zY2hlZF9m ZW5jZV9zaWduYWwoc19mZW5jZSk7CiAKQEAgLTQ3OCw3ICs0ODIsNiBAQCBzdGF0aWMgaW50IGFt ZF9zY2hlZF9tYWluKHZvaWQgKnBhcmFtKQogewogCXN0cnVjdCBzY2hlZF9wYXJhbSBzcGFyYW0g PSB7LnNjaGVkX3ByaW9yaXR5ID0gMX07CiAJc3RydWN0IGFtZF9ncHVfc2NoZWR1bGVyICpzY2hl ZCA9IChzdHJ1Y3QgYW1kX2dwdV9zY2hlZHVsZXIgKilwYXJhbTsKLQl1bnNpZ25lZCBsb25nIGZs YWdzOwogCWludCByLCBjb3VudDsKIAogCXNjaGVkX3NldHNjaGVkdWxlcihjdXJyZW50LCBTQ0hF RF9GSUZPLCAmc3BhcmFtKTsKQEAgLTUwMywxMCArNTA2LDcgQEAgc3RhdGljIGludCBhbWRfc2No ZWRfbWFpbih2b2lkICpwYXJhbSkKIAkJc19mZW5jZSA9IHNjaGVkX2pvYi0+c19mZW5jZTsKIAog CQlhdG9taWNfaW5jKCZzY2hlZC0+aHdfcnFfY291bnQpOwotCQlzcGluX2xvY2tfaXJxc2F2ZSgm c2NoZWQtPmpvYl9saXN0X2xvY2ssIGZsYWdzKTsKLQkJbGlzdF9hZGRfdGFpbCgmc2NoZWRfam9i LT5ub2RlLCAmc2NoZWQtPnJpbmdfbWlycm9yX2xpc3QpOwogCQlhbWRfc2NoZWRfam9iX2JlZ2lu KHNjaGVkX2pvYik7Ci0JCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnNjaGVkLT5qb2JfbGlzdF9s b2NrLCBmbGFncyk7CiAKIAkJZmVuY2UgPSBzY2hlZC0+b3BzLT5ydW5fam9iKHNjaGVkX2pvYik7 CiAJCWFtZF9zY2hlZF9mZW5jZV9zY2hlZHVsZWQoc19mZW5jZSk7Ci0tIAoyLjUuNQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==