From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 09/18] drm/radeon: make sa bo a stand alone object Date: Fri, 4 May 2012 18:43:50 -0400 Message-ID: <1336171439-7672-10-git-send-email-j.glisse@gmail.com> References: <1336171439-7672-1-git-send-email-j.glisse@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qa0-f48.google.com (mail-qa0-f48.google.com [209.85.216.48]) by gabe.freedesktop.org (Postfix) with ESMTP id B7FD69EB03 for ; Fri, 4 May 2012 15:44:27 -0700 (PDT) Received: by mail-qa0-f48.google.com with SMTP id y23so1751834qad.14 for ; Fri, 04 May 2012 15:44:27 -0700 (PDT) In-Reply-To: <1336171439-7672-1-git-send-email-j.glisse@gmail.com> 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 Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVhdGhzaW1wbGVAdm9kYWZvbmUuZGU+CgpBbGxvY2F0 aW5nIGFuZCBmcmVlaW5nIGl0IHNlcGVyYXRlbHkuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4g S8O2bmlnIDxkZWF0aHNpbXBsZUB2b2RhZm9uZS5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL3JhZGVvbi5oICAgICAgICAgICB8ICAgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fY3MuYyAgICAgICAgfCAgICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX2dhcnQuYyAgICAgIHwgICAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9vYmplY3QuaCAgICB8ICAgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRl b25fcmluZy5jICAgICAgfCAgICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRl b25fc2EuYyAgICAgICAgfCAgIDI4ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3NlbWFwaG9yZS5jIHwgICAgNCArKy0tCiA3IGZpbGVz IGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmggYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbi5oCmluZGV4IGE5MGNhYmYuLjM1MTlhNTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24u aApAQCAtNjI5LDcgKzYyOSw3IEBAIHZvaWQgcmFkZW9uX2lycV9rbXNfcGZsaXBfaXJxX3B1dChz dHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50IGNydGMpOwogICovCiAKIHN0cnVjdCByYWRl b25faWIgewotCXN0cnVjdCByYWRlb25fc2FfYm8Jc2FfYm87CisJc3RydWN0IHJhZGVvbl9zYV9i bwkqc2FfYm87CiAJdW5zaWduZWQJCWlkeDsKIAl1aW50MzJfdAkJbGVuZ3RoX2R3OwogCXVpbnQ2 NF90CQlncHVfYWRkcjsKQEAgLTY4NCw3ICs2ODQsNyBAQCBzdHJ1Y3QgcmFkZW9uX3ZtIHsKIAl1 bnNpZ25lZAkJCWxhc3RfcGZuOwogCXU2NAkJCQlwdF9ncHVfYWRkcjsKIAl1NjQJCQkJKnB0Owot CXN0cnVjdCByYWRlb25fc2FfYm8JCXNhX2JvOworCXN0cnVjdCByYWRlb25fc2FfYm8JCSpzYV9i bzsKIAlzdHJ1Y3QgbXV0ZXgJCQltdXRleDsKIAkvKiBsYXN0IGZlbmNlIGZvciBjcyB1c2luZyB0 aGlzIHZtICovCiAJc3RydWN0IHJhZGVvbl9mZW5jZQkJKmZlbmNlOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX2NzLmMKaW5kZXggYWM2YzllMy4uMmFhM2Y4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9jcy5jCkBAIC00NzAsNyArNDcwLDcgQEAgc3RhdGljIGludCByYWRlb25fY3NfaWJfdm1f Y2h1bmsoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJCS8qIGliIHBvb2wgaXMgYmluZCBh dCAwIGluIHZpcnR1YWwgYWRkcmVzcyBzcGFjZSB0byBncHVfYWRkciBpcyB0aGUKIAkJICogb2Zm c2V0IGluc2lkZSB0aGUgcG9vbCBibwogCQkgKi8KLQkJcGFyc2VyLT5jb25zdF9pYi0+Z3B1X2Fk ZHIgPSBwYXJzZXItPmNvbnN0X2liLT5zYV9iby5zb2Zmc2V0OworCQlwYXJzZXItPmNvbnN0X2li LT5ncHVfYWRkciA9IHBhcnNlci0+Y29uc3RfaWItPnNhX2JvLT5zb2Zmc2V0OwogCQlyID0gcmFk ZW9uX2liX3NjaGVkdWxlKHJkZXYsIHBhcnNlci0+Y29uc3RfaWIpOwogCQlpZiAocikKIAkJCWdv dG8gb3V0OwpAQCAtNDgwLDcgKzQ4MCw3IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2NzX2liX3ZtX2No dW5rKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCS8qIGliIHBvb2wgaXMgYmluZCBhdCAw IGluIHZpcnR1YWwgYWRkcmVzcyBzcGFjZSB0byBncHVfYWRkciBpcyB0aGUKIAkgKiBvZmZzZXQg aW5zaWRlIHRoZSBwb29sIGJvCiAJICovCi0JcGFyc2VyLT5pYi0+Z3B1X2FkZHIgPSBwYXJzZXIt PmliLT5zYV9iby5zb2Zmc2V0OworCXBhcnNlci0+aWItPmdwdV9hZGRyID0gcGFyc2VyLT5pYi0+ c2FfYm8tPnNvZmZzZXQ7CiAJcGFyc2VyLT5pYi0+aXNfY29uc3RfaWIgPSBmYWxzZTsKIAlyID0g cmFkZW9uX2liX3NjaGVkdWxlKHJkZXYsIHBhcnNlci0+aWIpOwogb3V0OgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2FydC5jIGIvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fZ2FydC5jCmluZGV4IDRhNWQ5ZDQuLmM1Nzg5ZWYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dhcnQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbl9nYXJ0LmMKQEAgLTQwNCw4ICs0MDQsOCBAQCByZXRyeToKIAkJcmFkZW9u X3ZtX3VuYmluZChyZGV2LCB2bV9ldmljdCk7CiAJCWdvdG8gcmV0cnk7CiAJfQotCXZtLT5wdCA9 IHJhZGVvbl9zYV9ib19jcHVfYWRkcigmdm0tPnNhX2JvKTsKLQl2bS0+cHRfZ3B1X2FkZHIgPSBy YWRlb25fc2FfYm9fZ3B1X2FkZHIoJnZtLT5zYV9ibyk7CisJdm0tPnB0ID0gcmFkZW9uX3NhX2Jv X2NwdV9hZGRyKHZtLT5zYV9ibyk7CisJdm0tPnB0X2dwdV9hZGRyID0gcmFkZW9uX3NhX2JvX2dw dV9hZGRyKHZtLT5zYV9ibyk7CiAJbWVtc2V0KHZtLT5wdCwgMCwgUkFERU9OX0dQVV9QQUdFX0FM SUdOKHZtLT5sYXN0X3BmbiAqIDgpKTsKIAogcmV0cnlfaWQ6CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9vYmplY3QuaCBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX29iamVjdC5oCmluZGV4IDk5YWI0NmEuLjRmYzdmMDcgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX29iamVjdC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX29iamVjdC5oCkBAIC0xNjgsMTAgKzE2OCwxMCBAQCBleHRlcm4gaW50IHJh ZGVvbl9zYV9ib19tYW5hZ2VyX3N1c3BlbmQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJ CQkJCXN0cnVjdCByYWRlb25fc2FfbWFuYWdlciAqc2FfbWFuYWdlcik7CiBleHRlcm4gaW50IHJh ZGVvbl9zYV9ib19uZXcoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJCQkgICAgc3RydWN0 IHJhZGVvbl9zYV9tYW5hZ2VyICpzYV9tYW5hZ2VyLAotCQkJICAgIHN0cnVjdCByYWRlb25fc2Ff Ym8gKnNhX2JvLAorCQkJICAgIHN0cnVjdCByYWRlb25fc2FfYm8gKipzYV9ibywKIAkJCSAgICB1 bnNpZ25lZCBzaXplLCB1bnNpZ25lZCBhbGlnbik7CiBleHRlcm4gdm9pZCByYWRlb25fc2FfYm9f ZnJlZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKLQkJCSAgICAgIHN0cnVjdCByYWRlb25f c2FfYm8gKnNhX2JvKTsKKwkJCSAgICAgIHN0cnVjdCByYWRlb25fc2FfYm8gKipzYV9ibyk7CiAj aWYgZGVmaW5lZChDT05GSUdfREVCVUdfRlMpCiBleHRlcm4gdm9pZCByYWRlb25fc2FfYm9fZHVt cF9kZWJ1Z19pbmZvKHN0cnVjdCByYWRlb25fc2FfbWFuYWdlciAqc2FfbWFuYWdlciwKIAkJCQkJ IHN0cnVjdCBzZXFfZmlsZSAqbSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9yaW5nLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9yaW5nLmMKaW5k ZXggNDBhODUyOC4uNzM5NTU0YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fcmluZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3JpbmcuYwpA QCAtMTI3LDggKzEyNyw4IEBAIHJldHJ5OgogCQkJCQkgICAgIHNpemUsIDI1Nik7CiAJCQlpZiAo IXIpIHsKIAkJCQkqaWIgPSAmcmRldi0+aWJfcG9vbC5pYnNbaWR4XTsKLQkJCQkoKmliKS0+cHRy ID0gcmFkZW9uX3NhX2JvX2NwdV9hZGRyKCYoKmliKS0+c2FfYm8pOwotCQkJCSgqaWIpLT5ncHVf YWRkciA9IHJhZGVvbl9zYV9ib19ncHVfYWRkcigmKCppYiktPnNhX2JvKTsKKwkJCQkoKmliKS0+ cHRyID0gcmFkZW9uX3NhX2JvX2NwdV9hZGRyKCgqaWIpLT5zYV9ibyk7CisJCQkJKCppYiktPmdw dV9hZGRyID0gcmFkZW9uX3NhX2JvX2dwdV9hZGRyKCgqaWIpLT5zYV9ibyk7CiAJCQkJKCppYikt PmZlbmNlID0gZmVuY2U7CiAJCQkJKCppYiktPnZtX2lkID0gMDsKIAkJCQkoKmliKS0+aXNfY29u c3RfaWIgPSBmYWxzZTsKQEAgLTIyNyw3ICsyMjcsNyBAQCBpbnQgcmFkZW9uX2liX3Bvb2xfaW5p dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJcmRldi0+aWJfcG9vbC5pYnNbaV0uZmVu Y2UgPSBOVUxMOwogCQlyZGV2LT5pYl9wb29sLmlic1tpXS5pZHggPSBpOwogCQlyZGV2LT5pYl9w b29sLmlic1tpXS5sZW5ndGhfZHcgPSAwOwotCQlJTklUX0xJU1RfSEVBRCgmcmRldi0+aWJfcG9v bC5pYnNbaV0uc2FfYm8ubGlzdCk7CisJCXJkZXYtPmliX3Bvb2wuaWJzW2ldLnNhX2JvID0gTlVM TDsKIAl9CiAJcmRldi0+aWJfcG9vbC5oZWFkX2lkID0gMDsKIAlyZGV2LT5pYl9wb29sLnJlYWR5 ID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3NhLmMg Yi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9zYS5jCmluZGV4IDNiZWE3YmEuLjYyNWYy ZDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3NhLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fc2EuYwpAQCAtMTMxLDcgKzEzMSw3IEBAIGlu dCByYWRlb25fc2FfYm9fbWFuYWdlcl9zdXNwZW5kKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2 LAogICovCiBpbnQgcmFkZW9uX3NhX2JvX25ldyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwK IAkJICAgICBzdHJ1Y3QgcmFkZW9uX3NhX21hbmFnZXIgKnNhX21hbmFnZXIsCi0JCSAgICAgc3Ry dWN0IHJhZGVvbl9zYV9ibyAqc2FfYm8sCisJCSAgICAgc3RydWN0IHJhZGVvbl9zYV9ibyAqKnNh X2JvLAogCQkgICAgIHVuc2lnbmVkIHNpemUsIHVuc2lnbmVkIGFsaWduKQogewogCXN0cnVjdCBy YWRlb25fc2FfYm8gKnRtcDsKQEAgLTE0MCw2ICsxNDAsOSBAQCBpbnQgcmFkZW9uX3NhX2JvX25l dyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAogCUJVR19PTihhbGlnbiA+IFJBREVPTl9H UFVfUEFHRV9TSVpFKTsKIAlCVUdfT04oc2l6ZSA+IHNhX21hbmFnZXItPnNpemUpOworCisJKnNh X2JvID0ga21hbGxvYyhzaXplb2Yoc3RydWN0IHJhZGVvbl9zYV9ibyksIEdGUF9LRVJORUwpOwor CiAJc3Bpbl9sb2NrKCZzYV9tYW5hZ2VyLT5sb2NrKTsKIAogCS8qIG5vIG9uZSA/ICovCkBAIC0x NzUsMjMgKzE3OCwzMCBAQCBpbnQgcmFkZW9uX3NhX2JvX25ldyhzdHJ1Y3QgcmFkZW9uX2Rldmlj ZSAqcmRldiwKIAlpZiAoKHNhX21hbmFnZXItPnNpemUgLSBvZmZzZXQpIDwgc2l6ZSkgewogCQkv KiBmYWlsZWQgdG8gZmluZCBzb21ldGhpbmdzIGJpZyBlbm91Z2ggKi8KIAkJc3Bpbl91bmxvY2so JnNhX21hbmFnZXItPmxvY2spOworCQlrZnJlZSgqc2FfYm8pOworCQkqc2FfYm8gPSBOVUxMOwog CQlyZXR1cm4gLUVOT01FTTsKIAl9CiAKIG91dDoKLQlzYV9iby0+bWFuYWdlciA9IHNhX21hbmFn ZXI7Ci0Jc2FfYm8tPnNvZmZzZXQgPSBvZmZzZXQ7Ci0Jc2FfYm8tPmVvZmZzZXQgPSBvZmZzZXQg KyBzaXplOwotCWxpc3RfYWRkKCZzYV9iby0+bGlzdCwgaGVhZCk7CisJKCpzYV9ibyktPm1hbmFn ZXIgPSBzYV9tYW5hZ2VyOworCSgqc2FfYm8pLT5zb2Zmc2V0ID0gb2Zmc2V0OworCSgqc2FfYm8p LT5lb2Zmc2V0ID0gb2Zmc2V0ICsgc2l6ZTsKKwlsaXN0X2FkZCgmKCpzYV9ibyktPmxpc3QsIGhl YWQpOwogCXNwaW5fdW5sb2NrKCZzYV9tYW5hZ2VyLT5sb2NrKTsKIAlyZXR1cm4gMDsKIH0KIAot dm9pZCByYWRlb25fc2FfYm9fZnJlZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgc3RydWN0 IHJhZGVvbl9zYV9ibyAqc2FfYm8pCit2b2lkIHJhZGVvbl9zYV9ib19mcmVlKHN0cnVjdCByYWRl b25fZGV2aWNlICpyZGV2LCBzdHJ1Y3QgcmFkZW9uX3NhX2JvICoqc2FfYm8pCiB7Ci0Jc3Bpbl9s b2NrKCZzYV9iby0+bWFuYWdlci0+bG9jayk7Ci0JbGlzdF9kZWxfaW5pdCgmc2FfYm8tPmxpc3Qp OwotCXNwaW5fdW5sb2NrKCZzYV9iby0+bWFuYWdlci0+bG9jayk7CisJaWYgKCFzYV9ibyB8fCAh KnNhX2JvKQorCQlyZXR1cm47CisKKwlzcGluX2xvY2soJigqc2FfYm8pLT5tYW5hZ2VyLT5sb2Nr KTsKKwlsaXN0X2RlbF9pbml0KCYoKnNhX2JvKS0+bGlzdCk7CisJc3Bpbl91bmxvY2soJigqc2Ff Ym8pLT5tYW5hZ2VyLT5sb2NrKTsKKwlrZnJlZSgqc2FfYm8pOworCSpzYV9ibyA9IE5VTEw7CiB9 CiAKICNpZiBkZWZpbmVkKENPTkZJR19ERUJVR19GUykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uX3NlbWFwaG9yZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fc2VtYXBob3JlLmMKaW5kZXggZjMxMmJhNS4uZDUxOGQzMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fc2VtYXBob3JlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL3JhZGVvbi9yYWRlb25fc2VtYXBob3JlLmMKQEAgLTUzLDggKzUzLDggQEAgc3RhdGljIGlu dCByYWRlb25fc2VtYXBob3JlX2FkZF9ibyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJ a2ZyZWUoYm8pOwogCQlyZXR1cm4gcjsKIAl9Ci0JZ3B1X2FkZHIgPSByYWRlb25fc2FfYm9fZ3B1 X2FkZHIoJmJvLT5pYi0+c2FfYm8pOwotCWNwdV9wdHIgPSByYWRlb25fc2FfYm9fY3B1X2FkZHIo JmJvLT5pYi0+c2FfYm8pOworCWdwdV9hZGRyID0gcmFkZW9uX3NhX2JvX2dwdV9hZGRyKGJvLT5p Yi0+c2FfYm8pOworCWNwdV9wdHIgPSByYWRlb25fc2FfYm9fY3B1X2FkZHIoYm8tPmliLT5zYV9i byk7CiAJZm9yIChpID0gMDsgaSA8IChSQURFT05fU0VNQVBIT1JFX0JPX1NJWkUvOCk7IGkrKykg ewogCQliby0+c2VtYXBob3Jlc1tpXS5ncHVfYWRkciA9IGdwdV9hZGRyOwogCQliby0+c2VtYXBo b3Jlc1tpXS5jcHVfcHRyID0gY3B1X3B0cjsKLS0gCjEuNy43LjYKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==