From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oded Gabbay Subject: [PATCH 8/9] drm/radeon: Remove old radeon_sa usage from kfd-->kgd interface Date: Wed, 31 Dec 2014 15:39:26 +0200 Message-ID: <1420033167-15565-9-git-send-email-oded.gabbay@amd.com> References: <1420033167-15565-1-git-send-email-oded.gabbay@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0140.outbound.protection.outlook.com [207.46.100.140]) by gabe.freedesktop.org (Postfix) with ESMTP id BF17C6E245 for ; Wed, 31 Dec 2014 05:44:20 -0800 (PST) In-Reply-To: <1420033167-15565-1-git-send-email-oded.gabbay@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, Alexander.Deucher@amd.com Cc: Christian Koenig List-Id: dri-devel@lists.freedesktop.org UmV2aWV3ZWQtYnk6IEFsZXhleSBTa2lkYW5vdiA8QWxleGV5LnNraWRhbm92QGFtZC5jb20+ClNp Z25lZC1vZmYtYnk6IE9kZWQgR2FiYmF5IDxvZGVkLmdhYmJheUBhbWQuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jIHwgOTkgKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA5OCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rZmQu YyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jCmluZGV4IGRkZDJhZmQuLjU2 YmZhYjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jCkBAIC0zNCwyMCArMzQsMTEg QEAKICNkZWZpbmUgQ0lLX1BJUEVfUEVSX01FQwkoNCkKIAogc3RydWN0IGtnZF9tZW0gewotCXN0 cnVjdCByYWRlb25fc2FfYm8gKnNhX2JvOwotCXVpbnQ2NF90IGdwdV9hZGRyOwotCXZvaWQgKnB0 cjsKIAlzdHJ1Y3QgcmFkZW9uX2JvICpibzsKKwl1aW50NjRfdCBncHVfYWRkcjsKIAl2b2lkICpj cHVfcHRyOwogfTsKIAotc3RhdGljIGludCBpbml0X3NhX21hbmFnZXIoc3RydWN0IGtnZF9kZXYg KmtnZCwgdW5zaWduZWQgaW50IHNpemUpOwotc3RhdGljIHZvaWQgZmluaV9zYV9tYW5hZ2VyKHN0 cnVjdCBrZ2RfZGV2ICprZ2QpOwotCi1zdGF0aWMgaW50IGFsbG9jYXRlX21lbShzdHJ1Y3Qga2dk X2RldiAqa2dkLCBzaXplX3Qgc2l6ZSwgc2l6ZV90IGFsaWdubWVudCwKLQkJZW51bSBrZ2RfbWVt b3J5X3Bvb2wgcG9vbCwgc3RydWN0IGtnZF9tZW0gKiptZW0pOwotCi1zdGF0aWMgdm9pZCBmcmVl X21lbShzdHJ1Y3Qga2dkX2RldiAqa2dkLCBzdHJ1Y3Qga2dkX21lbSAqbWVtKTsKIAogc3RhdGlj IGludCBhbGxvY19ndHRfbWVtKHN0cnVjdCBrZ2RfZGV2ICprZ2QsIHNpemVfdCBzaXplLAogCQkJ dm9pZCAqKm1lbV9vYmosIHVpbnQ2NF90ICpncHVfYWRkciwKQEAgLTg4LDEwICs3OSw2IEBAIHN0 YXRpYyBpbnQga2dkX2hxZF9kZXN0cm95KHN0cnVjdCBrZ2RfZGV2ICprZ2QsIHVpbnQzMl90IHJl c2V0X3R5cGUsCiAJCQkJdWludDMyX3QgcXVldWVfaWQpOwogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGtmZDJrZ2RfY2FsbHMga2ZkMmtnZCA9IHsKLQkuaW5pdF9zYV9tYW5hZ2VyID0gaW5pdF9zYV9t YW5hZ2VyLAotCS5maW5pX3NhX21hbmFnZXIgPSBmaW5pX3NhX21hbmFnZXIsCi0JLmFsbG9jYXRl X21lbSA9IGFsbG9jYXRlX21lbSwKLQkuZnJlZV9tZW0gPSBmcmVlX21lbSwKIAkuaW5pdF9ndHRf bWVtX2FsbG9jYXRpb24gPSBhbGxvY19ndHRfbWVtLAogCS5mcmVlX2d0dF9tZW0gPSBmcmVlX2d0 dF9tZW0sCiAJLmdldF92bWVtX3NpemUgPSBnZXRfdm1lbV9zaXplLApAQCAtMjA0LDkwICsxOTEs NiBAQCBpbnQgcmFkZW9uX2tmZF9yZXN1bWUoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJ cmV0dXJuIHI7CiB9CiAKLXN0YXRpYyB1MzIgcG9vbF90b19kb21haW4oZW51bSBrZ2RfbWVtb3J5 X3Bvb2wgcCkKLXsKLQlzd2l0Y2ggKHApIHsKLQljYXNlIEtHRF9QT09MX0ZSQU1FQlVGRkVSOiBy ZXR1cm4gUkFERU9OX0dFTV9ET01BSU5fVlJBTTsKLQlkZWZhdWx0OiByZXR1cm4gUkFERU9OX0dF TV9ET01BSU5fR1RUOwotCX0KLX0KLQotc3RhdGljIGludCBpbml0X3NhX21hbmFnZXIoc3RydWN0 IGtnZF9kZXYgKmtnZCwgdW5zaWduZWQgaW50IHNpemUpCi17Ci0Jc3RydWN0IHJhZGVvbl9kZXZp Y2UgKnJkZXYgPSAoc3RydWN0IHJhZGVvbl9kZXZpY2UgKilrZ2Q7Ci0JaW50IHI7Ci0KLQlCVUdf T04oa2dkID09IE5VTEwpOwotCi0JciA9IHJhZGVvbl9zYV9ib19tYW5hZ2VyX2luaXQocmRldiwg JnJkZXYtPmtmZF9ibywKLQkJCQkgICAgICBzaXplLAotCQkJCSAgICAgIFJBREVPTl9HUFVfUEFH RV9TSVpFLAotCQkJCSAgICAgIFJBREVPTl9HRU1fRE9NQUlOX0dUVCwKLQkJCQkgICAgICBSQURF T05fR0VNX0dUVF9XQyk7Ci0KLQlpZiAocikKLQkJcmV0dXJuIHI7Ci0KLQlyID0gcmFkZW9uX3Nh X2JvX21hbmFnZXJfc3RhcnQocmRldiwgJnJkZXYtPmtmZF9ibyk7Ci0JaWYgKHIpCi0JCXJhZGVv bl9zYV9ib19tYW5hZ2VyX2ZpbmkocmRldiwgJnJkZXYtPmtmZF9ibyk7Ci0KLQlyZXR1cm4gcjsK LX0KLQotc3RhdGljIHZvaWQgZmluaV9zYV9tYW5hZ2VyKHN0cnVjdCBrZ2RfZGV2ICprZ2QpCi17 Ci0Jc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYgPSAoc3RydWN0IHJhZGVvbl9kZXZpY2UgKilr Z2Q7Ci0KLQlCVUdfT04oa2dkID09IE5VTEwpOwotCi0JcmFkZW9uX3NhX2JvX21hbmFnZXJfc3Vz cGVuZChyZGV2LCAmcmRldi0+a2ZkX2JvKTsKLQlyYWRlb25fc2FfYm9fbWFuYWdlcl9maW5pKHJk ZXYsICZyZGV2LT5rZmRfYm8pOwotfQotCi1zdGF0aWMgaW50IGFsbG9jYXRlX21lbShzdHJ1Y3Qg a2dkX2RldiAqa2dkLCBzaXplX3Qgc2l6ZSwgc2l6ZV90IGFsaWdubWVudCwKLQkJZW51bSBrZ2Rf bWVtb3J5X3Bvb2wgcG9vbCwgc3RydWN0IGtnZF9tZW0gKiptZW0pCi17Ci0Jc3RydWN0IHJhZGVv bl9kZXZpY2UgKnJkZXYgPSAoc3RydWN0IHJhZGVvbl9kZXZpY2UgKilrZ2Q7Ci0JdTMyIGRvbWFp bjsKLQlpbnQgcjsKLQotCUJVR19PTihrZ2QgPT0gTlVMTCk7Ci0KLQlkb21haW4gPSBwb29sX3Rv X2RvbWFpbihwb29sKTsKLQlpZiAoZG9tYWluICE9IFJBREVPTl9HRU1fRE9NQUlOX0dUVCkgewot CQlkZXZfZXJyKHJkZXYtPmRldiwKLQkJCSJPbmx5IGFsbG93ZWQgdG8gYWxsb2NhdGUgZ2FydCBt ZW1vcnkgZm9yIGtmZFxuIik7Ci0JCXJldHVybiAtRUlOVkFMOwotCX0KLQotCSptZW0gPSBrbWFs bG9jKHNpemVvZihzdHJ1Y3Qga2dkX21lbSksIEdGUF9LRVJORUwpOwotCWlmICgoKm1lbSkgPT0g TlVMTCkKLQkJcmV0dXJuIC1FTk9NRU07Ci0KLQlyID0gcmFkZW9uX3NhX2JvX25ldyhyZGV2LCAm cmRldi0+a2ZkX2JvLCAmKCptZW0pLT5zYV9ibywgc2l6ZSwKLQkJCQlhbGlnbm1lbnQpOwotCWlm IChyKSB7Ci0JCWRldl9lcnIocmRldi0+ZGV2LCAiZmFpbGVkIHRvIGdldCBtZW1vcnkgZm9yIGtm ZCAoJWQpXG4iLCByKTsKLQkJcmV0dXJuIHI7Ci0JfQotCi0JKCptZW0pLT5wdHIgPSByYWRlb25f c2FfYm9fY3B1X2FkZHIoKCptZW0pLT5zYV9ibyk7Ci0JKCptZW0pLT5ncHVfYWRkciA9IHJhZGVv bl9zYV9ib19ncHVfYWRkcigoKm1lbSktPnNhX2JvKTsKLQotCXJldHVybiAwOwotfQotCi1zdGF0 aWMgdm9pZCBmcmVlX21lbShzdHJ1Y3Qga2dkX2RldiAqa2dkLCBzdHJ1Y3Qga2dkX21lbSAqbWVt KQotewotCXN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2ID0gKHN0cnVjdCByYWRlb25fZGV2aWNl ICopa2dkOwotCi0JQlVHX09OKGtnZCA9PSBOVUxMKTsKLQotCXJhZGVvbl9zYV9ib19mcmVlKHJk ZXYsICZtZW0tPnNhX2JvLCBOVUxMKTsKLQlrZnJlZShtZW0pOwotfQotCiBzdGF0aWMgaW50IGFs bG9jX2d0dF9tZW0oc3RydWN0IGtnZF9kZXYgKmtnZCwgc2l6ZV90IHNpemUsCiAJCQl2b2lkICoq bWVtX29iaiwgdWludDY0X3QgKmdwdV9hZGRyLAogCQkJdm9pZCAqKmNwdV9wdHIpCi0tIAoyLjEu MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK