From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/2] drm/radeon: allow UVD to use a second 256MB segment Date: Fri, 22 Aug 2014 10:13:58 +0200 Message-ID: <1408695238-1992-2-git-send-email-deathsimple@vodafone.de> References: <1408695238-1992-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 79AE16E861 for ; Fri, 22 Aug 2014 01:14:34 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 2CBD1260091 for ; Fri, 22 Aug 2014 10:14:33 +0200 (CEST) Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix1.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5GhEvB7xH8bo for ; Fri, 22 Aug 2014 10:14:11 +0200 (CEST) Received: from smtp-03.vodafone.de (xsmail-dmz9.prod.vfnet.de [10.215.254.40]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 96B162613EE for ; Fri, 22 Aug 2014 10:14:11 +0200 (CEST) Received: from smtp-03.vodafone.de ([127.0.0.1]) by localhost (xsmail-dmz9.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3ElRcxo9A29t for ; Fri, 22 Aug 2014 10:14:00 +0200 (CEST) In-Reply-To: <1408695238-1992-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 List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhpcyBp bXByb3ZlcyBjb25jdXJyZW50IHN0cmVhbSBkZWNvZGluZy4KClNpZ25lZC1vZmYtYnk6IENocmlz dGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbi5oICAgICAgICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fb2JqZWN0LmMgfCAgNSArKystLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRl b25fdXZkLmMgICAgfCAyMCArKysrKysrKysrKysrKysrKystLQogMyBmaWxlcyBjaGFuZ2VkLCAy MyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uLmggYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCmlu ZGV4IGNhZTNhZGMuLmYyZGJhNTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaApAQCAtMTY0MCw3 ICsxNjQwLDggQEAgaW50IHJhZGVvbl91dmRfZ2V0X2NyZWF0ZV9tc2coc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYsIGludCByaW5nLAogCQkJICAgICAgdWludDMyX3QgaGFuZGxlLCBzdHJ1Y3Qg cmFkZW9uX2ZlbmNlICoqZmVuY2UpOwogaW50IHJhZGVvbl91dmRfZ2V0X2Rlc3Ryb3lfbXNnKHN0 cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZywKIAkJCSAgICAgICB1aW50MzJfdCBo YW5kbGUsIHN0cnVjdCByYWRlb25fZmVuY2UgKipmZW5jZSk7Ci12b2lkIHJhZGVvbl91dmRfZm9y Y2VfaW50b191dmRfc2VnbWVudChzdHJ1Y3QgcmFkZW9uX2JvICpyYm8pOwordm9pZCByYWRlb25f dXZkX2ZvcmNlX2ludG9fdXZkX3NlZ21lbnQoc3RydWN0IHJhZGVvbl9ibyAqcmJvLAorCQkJCSAg ICAgICB1aW50MzJfdCBhbGxvd2VkX2RvbWFpbnMpOwogdm9pZCByYWRlb25fdXZkX2ZyZWVfaGFu ZGxlcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAkJCSAgICAgc3RydWN0IGRybV9maWxl ICpmaWxwKTsKIGludCByYWRlb25fdXZkX2NzX3BhcnNlKHN0cnVjdCByYWRlb25fY3NfcGFyc2Vy ICpwYXJzZXIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fb2Jq ZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9vYmplY3QuYwppbmRleCAwMTI5 YzdlLi5jOTdhNDI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9v YmplY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9vYmplY3QuYwpAQCAt NDkxLDYgKzQ5MSw3IEBAIGludCByYWRlb25fYm9fbGlzdF92YWxpZGF0ZShzdHJ1Y3QgcmFkZW9u X2RldmljZSAqcmRldiwKIAkJYm8gPSBsb2JqLT5yb2JqOwogCQlpZiAoIWJvLT5waW5fY291bnQp IHsKIAkJCXUzMiBkb21haW4gPSBsb2JqLT5wcmVmZXJlZF9kb21haW5zOworCQkJdTMyIGFsbG93 ZWQgPSBsb2JqLT5hbGxvd2VkX2RvbWFpbnM7CiAJCQl1MzIgY3VycmVudF9kb21haW4gPQogCQkJ CXJhZGVvbl9tZW1fdHlwZV90b19kb21haW4oYm8tPnRiby5tZW0ubWVtX3R5cGUpOwogCkBAIC01 MDIsNyArNTAzLDcgQEAgaW50IHJhZGVvbl9ib19saXN0X3ZhbGlkYXRlKHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAogCQkJICogaW50byBhY2NvdW50LiBXZSBkb24ndCB3YW50IHRvIGRpc2Fs bG93IGJ1ZmZlciBtb3ZlcwogCQkJICogY29tcGxldGVseS4KIAkJCSAqLwotCQkJaWYgKChsb2Jq LT5hbGxvd2VkX2RvbWFpbnMgJiBjdXJyZW50X2RvbWFpbikgIT0gMCAmJgorCQkJaWYgKChhbGxv d2VkICYgY3VycmVudF9kb21haW4pICE9IDAgJiYKIAkJCSAgICAoZG9tYWluICYgY3VycmVudF9k b21haW4pID09IDAgJiYgLyogd2lsbCBiZSBtb3ZlZCAqLwogCQkJICAgIGJ5dGVzX21vdmVkID4g Ynl0ZXNfbW92ZWRfdGhyZXNob2xkKSB7CiAJCQkJLyogZG9uJ3QgbW92ZSBpdCAqLwpAQCAtNTEy LDcgKzUxMyw3IEBAIGludCByYWRlb25fYm9fbGlzdF92YWxpZGF0ZShzdHJ1Y3QgcmFkZW9uX2Rl dmljZSAqcmRldiwKIAkJcmV0cnk6CiAJCQlyYWRlb25fdHRtX3BsYWNlbWVudF9mcm9tX2RvbWFp bihibywgZG9tYWluKTsKIAkJCWlmIChyaW5nID09IFI2MDBfUklOR19UWVBFX1VWRF9JTkRFWCkK LQkJCQlyYWRlb25fdXZkX2ZvcmNlX2ludG9fdXZkX3NlZ21lbnQoYm8pOworCQkJCXJhZGVvbl91 dmRfZm9yY2VfaW50b191dmRfc2VnbWVudChibywgYWxsb3dlZCk7CiAKIAkJCWluaXRpYWxfYnl0 ZXNfbW92ZWQgPSBhdG9taWM2NF9yZWFkKCZyZGV2LT5udW1fYnl0ZXNfbW92ZWQpOwogCQkJciA9 IHR0bV9ib192YWxpZGF0ZSgmYm8tPnRibywgJmJvLT5wbGFjZW1lbnQsIHRydWUsIGZhbHNlKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3V2ZC5jIGIvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdXZkLmMKaW5kZXggMTE2OGRlNy4uZDMzZGFjYyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdXZkLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdXZkLmMKQEAgLTIzMSw3ICsyMzEsOCBAQCBpbnQgcmFk ZW9uX3V2ZF9yZXN1bWUoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJcmV0dXJuIDA7CiB9 CiAKLXZvaWQgcmFkZW9uX3V2ZF9mb3JjZV9pbnRvX3V2ZF9zZWdtZW50KHN0cnVjdCByYWRlb25f Ym8gKnJibykKK3ZvaWQgcmFkZW9uX3V2ZF9mb3JjZV9pbnRvX3V2ZF9zZWdtZW50KHN0cnVjdCBy YWRlb25fYm8gKnJibywKKwkJCQkgICAgICAgdWludDMyX3QgYWxsb3dlZF9kb21haW5zKQogewog CWludCBpOwogCkBAIC0yMzksNiArMjQwLDIxIEBAIHZvaWQgcmFkZW9uX3V2ZF9mb3JjZV9pbnRv X3V2ZF9zZWdtZW50KHN0cnVjdCByYWRlb25fYm8gKnJibykKIAkJcmJvLT5wbGFjZW1lbnRzW2ld LmZwZm4gPSAwID4+IFBBR0VfU0hJRlQ7CiAJCXJiby0+cGxhY2VtZW50c1tpXS5scGZuID0gKDI1 NiAqIDEwMjQgKiAxMDI0KSA+PiBQQUdFX1NISUZUOwogCX0KKworCS8qIElmIGl0IG11c3QgYmUg aW4gVlJBTSBpdCBtdXN0IGJlIGluIHRoZSBmaXJzdCBzZWdtZW50IGFzIHdlbGwgKi8KKwlpZiAo YWxsb3dlZF9kb21haW5zID09IFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pCisJCXJldHVybjsKKwor CS8qIGFib3J0IGlmIHdlIGFscmVhZHkgaGF2ZSBtb3JlIHRoYW4gb25lIHBsYWNlbWVudCAqLwor CWlmIChyYm8tPnBsYWNlbWVudC5udW1fcGxhY2VtZW50ID4gMSkKKwkJcmV0dXJuOworCisJLyog YWRkIGFub3RoZXIgMjU2TUIgc2VnbWVudCAqLworCXJiby0+cGxhY2VtZW50c1sxXSA9IHJiby0+ cGxhY2VtZW50c1swXTsKKwlyYm8tPnBsYWNlbWVudHNbMV0uZnBmbiArPSAoMjU2ICogMTAyNCAq IDEwMjQpID4+IFBBR0VfU0hJRlQ7CisJcmJvLT5wbGFjZW1lbnRzWzFdLmxwZm4gKz0gKDI1NiAq IDEwMjQgKiAxMDI0KSA+PiBQQUdFX1NISUZUOworCXJiby0+cGxhY2VtZW50Lm51bV9wbGFjZW1l bnQrKzsKKwlyYm8tPnBsYWNlbWVudC5udW1fYnVzeV9wbGFjZW1lbnQrKzsKIH0KIAogdm9pZCBy YWRlb25fdXZkX2ZyZWVfaGFuZGxlcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgc3RydWN0 IGRybV9maWxlICpmaWxwKQpAQCAtNjI5LDcgKzY0NSw3IEBAIHN0YXRpYyBpbnQgcmFkZW9uX3V2 ZF9zZW5kX21zZyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAkJcmV0dXJuIHI7CiAKIAly YWRlb25fdHRtX3BsYWNlbWVudF9mcm9tX2RvbWFpbihibywgUkFERU9OX0dFTV9ET01BSU5fVlJB TSk7Ci0JcmFkZW9uX3V2ZF9mb3JjZV9pbnRvX3V2ZF9zZWdtZW50KGJvKTsKKwlyYWRlb25fdXZk X2ZvcmNlX2ludG9fdXZkX3NlZ21lbnQoYm8sIFJBREVPTl9HRU1fRE9NQUlOX1ZSQU0pOwogCiAJ ciA9IHR0bV9ib192YWxpZGF0ZSgmYm8tPnRibywgJmJvLT5wbGFjZW1lbnQsIHRydWUsIGZhbHNl KTsKIAlpZiAocikgCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK