From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH 3/3] drm/msm/adreno: deal with linux-firmware fw paths Date: Mon, 16 Oct 2017 11:27:49 -0400 Message-ID: <20171016152749.23104-3-robdclark@gmail.com> References: <20171016152749.23104-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171016152749.23104-1-robdclark@gmail.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: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org List-Id: linux-arm-msm@vger.kernel.org V2hlbiBmaXJtd2FyZSB3YXMgYWRkZWQgdG8gbGludXgtZmlybXdhcmUsIGl0IHdhcyBwdXQgaW4g YSBxY29tIHN1Yi0KZGlyZWN0b3J5LCB1bmxpa2Ugd2hhdCB3ZSdkIGJlZW4gdXNpbmcgYmVmb3Jl LiAgRm9yIGEzMDBfcGZwLmZ3IGFuZAphMzAwX3BtNC5mdyBzeW1saW5rcyB3ZXJlIGNyZWF0ZWQs IGJ1dCB3ZSdkIHByZWZlciBub3QgdG8gaGF2ZSB0byBkbwp0aGlzIGluIHRoZSBmdXR1cmUuICBT byBhZGQgc3VwcG9ydCB0byBsb29rIGluIGJvdGggcGxhY2VzIHdoZW4KbG9hZGluZyBmaXJtd2Fy ZS4KClNpZ25lZC1vZmYtYnk6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZ3B1LmMgfCA2NCArKysrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVub19n cHUuaCB8IDIxICsrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDgxIGluc2VydGlvbnMoKyks IDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8v YWRyZW5vX2dwdS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYWRyZW5vX2dwdS5jCmlu ZGV4IDE5ZTEyMzgwMjk3ZS4uZGMwZGI2NjBjNjE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vbXNtL2FkcmVuby9hZHJlbm9fZ3B1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJl bm8vYWRyZW5vX2dwdS5jCkBAIC02OSwxMiArNjksNjggQEAgYWRyZW5vX3JlcXVlc3RfZncoc3Ry dWN0IGFkcmVub19ncHUgKmFkcmVub19ncHUsIGNvbnN0IGNoYXIgKmZ3bmFtZSkKIHsKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZHJtID0gYWRyZW5vX2dwdS0+YmFzZS5kZXY7CiAJY29uc3Qgc3RydWN0 IGZpcm13YXJlICpmdyA9IE5VTEw7CisJY2hhciBuZXduYW1lW3N0cmxlbigicWNvbS8iKSArIHN0 cmxlbihmd25hbWUpICsgMV07CiAJaW50IHJldDsKIAotCXJldCA9IHJlcXVlc3RfZmlybXdhcmUo JmZ3LCBmd25hbWUsIGRybS0+ZGV2KTsKLQlpZiAocmV0KSB7Ci0JCWRldl9lcnIoZHJtLT5kZXYs ICJmYWlsZWQgdG8gbG9hZCAlczogJWRcbiIsIGZ3bmFtZSwgcmV0KTsKLQkJcmV0dXJuIEVSUl9Q VFIocmV0KTsKKwlzcHJpbnRmKG5ld25hbWUsICJxY29tLyVzIiwgZnduYW1lKTsKKworCS8qCisJ ICogVHJ5IGZpcnN0IHRvIGxvYWQgZnJvbSBxY29tLyRmd2ZpbGUgdXNpbmcgYSBkaXJlY3QgbG9h ZCAodG8gYXZvaWQKKwkgKiBhIHBvdGVudGlhbCB0aW1lb3V0IHdhaXRpbmcgZm9yIHVzZXJtb2Rl IGhlbHBlcikKKwkgKi8KKwlpZiAoKGFkcmVub19ncHUtPmZ3bG9jID09IEZXX0xPQ0FUSU9OX1VO S05PV04pIHx8CisJICAgIChhZHJlbm9fZ3B1LT5md2xvYyA9PSBGV19MT0NBVElPTl9ORVcpKSB7 CisKKwkJcmV0ID0gcmVxdWVzdF9maXJtd2FyZV9kaXJlY3QoJmZ3LCBuZXduYW1lLCBkcm0tPmRl dik7CisJCWlmICghcmV0KSB7CisJCQlkZXZfaW5mbyhkcm0tPmRldiwgImxvYWRlZCAlcyBmcm9t IG5ldyBsb2NhdGlvblxuIiwKKwkJCQluZXduYW1lKTsKKwkJCWFkcmVub19ncHUtPmZ3bG9jID0g RldfTE9DQVRJT05fTkVXOworCQkJcmV0dXJuIGZ3OworCQl9IGVsc2UgaWYgKGFkcmVub19ncHUt PmZ3bG9jICE9IEZXX0xPQ0FUSU9OX1VOS05PV04pIHsKKwkJCWRldl9lcnIoZHJtLT5kZXYsICJm YWlsZWQgdG8gbG9hZCAlczogJWRcbiIsCisJCQkJbmV3bmFtZSwgcmV0KTsKKwkJCXJldHVybiBF UlJfUFRSKHJldCk7CisJCX0KKwl9CisKKwkvKgorCSAqIFRoZW4gdHJ5IHRoZSBsZWdhY3kgbG9j YXRpb24gd2l0aG91dCBxY29tLyBwcmVmaXgKKwkgKi8KKwlpZiAoKGFkcmVub19ncHUtPmZ3bG9j ID09IEZXX0xPQ0FUSU9OX1VOS05PV04pIHx8CisJICAgIChhZHJlbm9fZ3B1LT5md2xvYyA9PSBG V19MT0NBVElPTl9MRUdBQ1kpKSB7CisKKwkJcmV0ID0gcmVxdWVzdF9maXJtd2FyZV9kaXJlY3Qo JmZ3LCBmd25hbWUsIGRybS0+ZGV2KTsKKwkJaWYgKCFyZXQpIHsKKwkJCWRldl9pbmZvKGRybS0+ ZGV2LCAibG9hZGVkICVzIGZyb20gbGVnYWN5IGxvY2F0aW9uXG4iLAorCQkJCW5ld25hbWUpOwor CQkJYWRyZW5vX2dwdS0+Zndsb2MgPSBGV19MT0NBVElPTl9MRUdBQ1k7CisJCQlyZXR1cm4gZnc7 CisJCX0gZWxzZSBpZiAoYWRyZW5vX2dwdS0+Zndsb2MgIT0gRldfTE9DQVRJT05fVU5LTk9XTikg eworCQkJZGV2X2Vycihkcm0tPmRldiwgImZhaWxlZCB0byBsb2FkICVzOiAlZFxuIiwKKwkJCQlm d25hbWUsIHJldCk7CisJCQlyZXR1cm4gRVJSX1BUUihyZXQpOworCQl9CisJfQorCisJLyoKKwkg KiBGaW5hbGx5IGZhbGwgYmFjayB0byByZXF1ZXN0X2Zpcm13YXJlKCkgZm9yIGNhc2VzIHdoZXJl IHRoZQorCSAqIHVzZXJtb2RlIGhlbHBlciBpcyBuZWVkZWQgKEkgdGhpbmsgbWFpbmx5IGFuZHJv aWQpCisJICovCisJaWYgKChhZHJlbm9fZ3B1LT5md2xvYyA9PSBGV19MT0NBVElPTl9VTktOT1dO KSB8fAorCSAgICAoYWRyZW5vX2dwdS0+Zndsb2MgPT0gRldfTE9DQVRJT05fSEVMUEVSKSkgewor CisJCXJldCA9IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCBuZXduYW1lLCBkcm0tPmRldik7CisJCWlm ICghcmV0KSB7CisJCQlkZXZfaW5mbyhkcm0tPmRldiwgImxvYWRlZCAlcyB3aXRoIGhlbHBlclxu IiwKKwkJCQluZXduYW1lKTsKKwkJCWFkcmVub19ncHUtPmZ3bG9jID0gRldfTE9DQVRJT05fSEVM UEVSOworCQkJcmV0dXJuIGZ3OworCQl9IGVsc2UgaWYgKGFkcmVub19ncHUtPmZ3bG9jICE9IEZX X0xPQ0FUSU9OX1VOS05PV04pIHsKKwkJCWRldl9lcnIoZHJtLT5kZXYsICJmYWlsZWQgdG8gbG9h ZCAlczogJWRcbiIsCisJCQkJbmV3bmFtZSwgcmV0KTsKKwkJCXJldHVybiBFUlJfUFRSKHJldCk7 CisJCX0KIAl9CiAKIAlyZXR1cm4gZnc7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNt L2FkcmVuby9hZHJlbm9fZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9f Z3B1LmgKaW5kZXggM2VkYTk4YWY1NDZlLi5iOGMyMjY1ODkyOWQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVub19ncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v bXNtL2FkcmVuby9hZHJlbm9fZ3B1LmgKQEAgLTEwMSw2ICsxMDEsMjcgQEAgc3RydWN0IGFkcmVu b19ncHUgewogCS8qIGludGVyZXN0aW5nIHJlZ2lzdGVyIG9mZnNldHMgdG8gZHVtcDogKi8KIAlj b25zdCB1bnNpZ25lZCBpbnQgKnJlZ2lzdGVyczsKIAorCS8qCisJICogQXJlIHdlIGxvYWRpbmcg ZncgZnJvbSBsZWdhY3kgcGF0aD8gIFByaW9yIHRvIGFkZGl0aW9uCisJICogb2YgZ3B1IGZpcm13 YXJlIHRvIGxpbnV4LWZpcm13YXJlLCB0aGUgZncgZmlsZXMgd2VyZQorCSAqIHBsYWNlZCBpbiB0 b3BsZXZlbCBmaXJtd2FyZSBkaXJlY3RvcnksIGZvbGxvd2luZyBxY29tJ3MKKwkgKiBhbmRyb2lk IGtlcm5lbC4gIEJ1dCBsaW51eC1maXJtd2FyZSBwcmVmZXJyZWQgdGhleSBiZQorCSAqIHBsYWNl ZCBpbiBhICdxY29tJyBzdWJkaXJlY3RvcnkuCisJICoKKwkgKiBGb3IgYmFja3dhcmRzIGNvbXBh dGliaWxpdHksIHdlIHRyeSBmaXJzdCB0byBsb2FkIGZyb20KKwkgKiB0aGUgbmV3IHBhdGgsIHVz aW5nIHJlcXVlc3RfZmlybXdhcmVfZGlyZWN0KCkgdG8gYXZvaWQKKwkgKiBhbnkgcG90ZW50aWFs IHRpbWVvdXQgd2FpdGluZyBmb3IgdXNlcm1vZGUgaGVscGVyLCB0aGVuCisJICogZmFsbCBiYWNr IHRvIHRoZSBvbGQgcGF0aCAod2l0aCBkaXJlY3QgbG9hZCkuICBBbmQKKwkgKiBmaW5hbGx5IGZh bGwgYmFjayB0byByZXF1ZXN0X2Zpcm13YXJlKCkgd2l0aCB0aGUgbmV3CisJICogcGF0aCB0byBh bGxvdyB0aGUgdXNlcm1vZGUgaGVscGVyLgorCSAqLworCWVudW0geworCQlGV19MT0NBVElPTl9V TktOT1dOID0gMCwKKwkJRldfTE9DQVRJT05fTkVXLCAgICAgICAvKiAvbGliL2Zpcm13YXJlL3Fj b20vJGZ3ZmlsZSAqLworCQlGV19MT0NBVElPTl9MRUdBQ1ksICAgIC8qIC9saWIvZmlybXdhcmUv JGZ3ZmlsZSAqLworCQlGV19MT0NBVElPTl9IRUxQRVIsCisJfSBmd2xvYzsKKwogCS8qIGZpcm13 YXJlOiAqLwogCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqcG00LCAqcGZwOwogCi0tIAoyLjEzLjYK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=