From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/3] drm/radeon: cleanup radeon_cs_get_ring Date: Mon, 13 Apr 2015 16:52:16 +0200 Message-ID: <1428936737-19103-3-git-send-email-deathsimple@vodafone.de> References: <1428936737-19103-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id 844C56E549 for ; Mon, 13 Apr 2015 07:52:30 -0700 (PDT) In-Reply-To: <1428936737-19103-1-git-send-email-deathsimple@vodafone.de> 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: Serguei.Sagalovitch@amd.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhhdCBt YWtlcyBpdCBwb3NzaWJsZSB0byBjYWxsIGl0IGZyb20gZWxzZXdoZXJlIGFzIHdlbGwuCgpTaWdu ZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCAgICB8ICAyICstCiBkcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jIHwgNTUgKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCBiL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggNmU2YjQ5YS4uNTdkNjNjNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0xMDkzLDcgKzEwOTMsNiBAQCBzdHJ1Y3QgcmFkZW9u X2NzX3BhcnNlciB7CiAJaW50CQkJcGFyc2VyX2Vycm9yOwogCXUzMgkJCWNzX2ZsYWdzOwogCXUz MgkJCXJpbmc7Ci0JczMyCQkJcHJpb3JpdHk7CiAJc3RydWN0IHd3X2FjcXVpcmVfY3R4CXRpY2tl dDsKIH07CiAKQEAgLTExMjIsNiArMTEyMSw3IEBAIHR5cGVkZWYgaW50ICgqcmFkZW9uX3BhY2tl dDBfY2hlY2tfdCkoc3RydWN0IHJhZGVvbl9jc19wYXJzZXIgKnAsCiB0eXBlZGVmIGludCAoKnJh ZGVvbl9wYWNrZXQzX2NoZWNrX3QpKHN0cnVjdCByYWRlb25fY3NfcGFyc2VyICpwLAogCQkJCSAg ICAgIHN0cnVjdCByYWRlb25fY3NfcGFja2V0ICpwa3QpOwogCitpbnQgcmFkZW9uX2NzX2dldF9y aW5nKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCB1MzIgcmluZywgczMyIHByaW9yaXR5KTsK IAogLyoKICAqIEFHUApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f Y3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMKaW5kZXggNGQwZjk2Yy4u NGI5Mjc2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jCkBAIC0xODcsNDcgKzE4Nyw0 NiBAQCBzdGF0aWMgaW50IHJhZGVvbl9jc19wYXJzZXJfcmVsb2NzKHN0cnVjdCByYWRlb25fY3Nf cGFyc2VyICpwKQogCXJldHVybiByOwogfQogCi1zdGF0aWMgaW50IHJhZGVvbl9jc19nZXRfcmlu ZyhzdHJ1Y3QgcmFkZW9uX2NzX3BhcnNlciAqcCwgdTMyIHJpbmcsIHMzMiBwcmlvcml0eSkKK2lu dCByYWRlb25fY3NfZ2V0X3Jpbmcoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIHUzMiByaW5n LCBzMzIgcHJpb3JpdHkpCiB7Ci0JcC0+cHJpb3JpdHkgPSBwcmlvcml0eTsKLQogCXN3aXRjaCAo cmluZykgewogCWRlZmF1bHQ6CiAJCURSTV9FUlJPUigidW5rbm93biByaW5nIGlkOiAlZFxuIiwg cmluZyk7Ci0JCXJldHVybiAtRUlOVkFMOwotCWNhc2UgUkFERU9OX0NTX1JJTkdfR0ZYOgotCQlw LT5yaW5nID0gUkFERU9OX1JJTkdfVFlQRV9HRlhfSU5ERVg7CiAJCWJyZWFrOworCisJY2FzZSBS QURFT05fQ1NfUklOR19HRlg6CisJCXJldHVybiBSQURFT05fUklOR19UWVBFX0dGWF9JTkRFWDsK KwogCWNhc2UgUkFERU9OX0NTX1JJTkdfQ09NUFVURToKLQkJaWYgKHAtPnJkZXYtPmZhbWlseSA+ PSBDSElQX1RBSElUSSkgewotCQkJaWYgKHAtPnByaW9yaXR5ID4gMCkKLQkJCQlwLT5yaW5nID0g Q0FZTUFOX1JJTkdfVFlQRV9DUDFfSU5ERVg7CisJCWlmIChyZGV2LT5mYW1pbHkgPj0gQ0hJUF9U QUhJVEkpIHsKKwkJCWlmIChwcmlvcml0eSA+IDApCisJCQkJcmV0dXJuIENBWU1BTl9SSU5HX1RZ UEVfQ1AxX0lOREVYOwogCQkJZWxzZQotCQkJCXAtPnJpbmcgPSBDQVlNQU5fUklOR19UWVBFX0NQ Ml9JTkRFWDsKKwkJCQlyZXR1cm4gQ0FZTUFOX1JJTkdfVFlQRV9DUDJfSU5ERVg7CiAJCX0gZWxz ZQotCQkJcC0+cmluZyA9IFJBREVPTl9SSU5HX1RZUEVfR0ZYX0lOREVYOwotCQlicmVhazsKKwkJ CXJldHVybiBSQURFT05fUklOR19UWVBFX0dGWF9JTkRFWDsKKwogCWNhc2UgUkFERU9OX0NTX1JJ TkdfRE1BOgotCQlpZiAocC0+cmRldi0+ZmFtaWx5ID49IENISVBfQ0FZTUFOKSB7Ci0JCQlpZiAo cC0+cHJpb3JpdHkgPiAwKQotCQkJCXAtPnJpbmcgPSBSNjAwX1JJTkdfVFlQRV9ETUFfSU5ERVg7 CisJCWlmIChyZGV2LT5mYW1pbHkgPj0gQ0hJUF9DQVlNQU4pIHsKKwkJCWlmIChwcmlvcml0eSA+ IDApCisJCQkJcmV0dXJuIFI2MDBfUklOR19UWVBFX0RNQV9JTkRFWDsKIAkJCWVsc2UKLQkJCQlw LT5yaW5nID0gQ0FZTUFOX1JJTkdfVFlQRV9ETUExX0lOREVYOwotCQl9IGVsc2UgaWYgKHAtPnJk ZXYtPmZhbWlseSA+PSBDSElQX1JWNzcwKSB7Ci0JCQlwLT5yaW5nID0gUjYwMF9SSU5HX1RZUEVf RE1BX0lOREVYOworCQkJCXJldHVybiBDQVlNQU5fUklOR19UWVBFX0RNQTFfSU5ERVg7CisJCX0g ZWxzZSBpZiAocmRldi0+ZmFtaWx5ID49IENISVBfUlY3NzApIHsKKwkJCXJldHVybiBSNjAwX1JJ TkdfVFlQRV9ETUFfSU5ERVg7CiAJCX0gZWxzZSB7CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQot CQlicmVhazsKKwogCWNhc2UgUkFERU9OX0NTX1JJTkdfVVZEOgotCQlwLT5yaW5nID0gUjYwMF9S SU5HX1RZUEVfVVZEX0lOREVYOwotCQlicmVhazsKKwkJcmV0dXJuIFI2MDBfUklOR19UWVBFX1VW RF9JTkRFWDsKKwogCWNhc2UgUkFERU9OX0NTX1JJTkdfVkNFOgogCQkvKiBUT0RPOiBvbmx5IHVz ZSB0aGUgbG93IHByaW9yaXR5IHJpbmcgZm9yIG5vdyAqLwotCQlwLT5yaW5nID0gVE5fUklOR19U WVBFX1ZDRTFfSU5ERVg7Ci0JCWJyZWFrOworCQlyZXR1cm4gVE5fUklOR19UWVBFX1ZDRTFfSU5E RVg7CisKIAl9Ci0JcmV0dXJuIDA7CisJcmV0dXJuIC1FSU5WQUw7CiB9CiAKIHN0YXRpYyBpbnQg cmFkZW9uX2NzX3N5bmNfcmluZ3Moc3RydWN0IHJhZGVvbl9jc19wYXJzZXIgKnApCkBAIC0zNDgs MTQgKzM0NywxOCBAQCBpbnQgcmFkZW9uX2NzX3BhcnNlcl9pbml0KHN0cnVjdCByYWRlb25fY3Nf cGFyc2VyICpwLCB2b2lkICpkYXRhKQogCiAJLyogdGhlc2UgYXJlIEtNUyBvbmx5ICovCiAJaWYg KHAtPnJkZXYpIHsKKwkJaW50IHI7CisKIAkJaWYgKChwLT5jc19mbGFncyAmIFJBREVPTl9DU19V U0VfVk0pICYmCiAJCSAgICAhcC0+cmRldi0+dm1fbWFuYWdlci5lbmFibGVkKSB7CiAJCQlEUk1f RVJST1IoIlZNIG5vdCBhY3RpdmUgb24gYXNpYyFcbiIpOwogCQkJcmV0dXJuIC1FSU5WQUw7CiAJ CX0KIAotCQlpZiAocmFkZW9uX2NzX2dldF9yaW5nKHAsIHJpbmcsIHByaW9yaXR5KSkKLQkJCXJl dHVybiAtRUlOVkFMOworCQlyID0gcmFkZW9uX2NzX2dldF9yaW5nKHAtPnJkZXYsIHJpbmcsIHBy aW9yaXR5KTsKKwkJaWYgKHIgPCAwKQorCQkJcmV0dXJuIHI7CisJCXAtPnJpbmcgPSByOwogCiAJ CS8qIHdlIG9ubHkgc3VwcG9ydCBWTSBvbiBzb21lIFNJKyByaW5ncyAqLwogCQlpZiAoKHAtPmNz X2ZsYWdzICYgUkFERU9OX0NTX1VTRV9WTSkgPT0gMCkgewotLSAKMS45LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==