From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 1/2] gpu: host1x: Rename "parent" to "host" Date: Tue, 3 Dec 2019 17:27:32 +0100 Message-ID: <20191203162733.1436800-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Thierry Reding Cc: linux-tegra@vger.kernel.org, "Rafael J. Wysocki" , dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org List-Id: linux-tegra@vger.kernel.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClJlbmFtZSB0aGUgaG9z dDF4IGNsaWVudHMnIHBhcmVudCB0byAiaG9zdCIgYmVjYXVzZSB0aGF0IG1vcmUgY2xvc2VseQpk ZXNjcmliZXMgd2hhdCBpdCBpcy4gVGhlIHBhcmVudCBjYW4gYmUgY29uZnVzZWQgd2l0aCB0aGUg cGFyZW50IGRldmljZQppbiB0ZXJtcyBvZiB0aGUgZGV2aWNlIGhpZXJhcmNoeS4gU3Vic2VxdWVu dCBwYXRjaGVzIHdpbGwgYWRkIGEgbmV3Cm1lbWJlciB0aGF0IHJlZmVycyB0byB0aGUgcGFyZW50 IGluIHRoYXQgaGllcmFyY2h5LgoKU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBSZWRpbmcgPHRyZWRp bmdAbnZpZGlhLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYyAgIHwgNiArKyst LS0KIGRyaXZlcnMvZ3B1L2RybS90ZWdyYS9kcm0uYyAgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS90ZWdyYS9kc2kuYyAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vdGVncmEvZ3IyZC5jIHwgNCAr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vdGVncmEvZ3IzZC5jIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9k cm0vdGVncmEvaGRtaS5jIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2h1Yi5jICB8IDQg KystLQogZHJpdmVycy9ncHUvZHJtL3RlZ3JhL3Nvci5jICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS90ZWdyYS92aWMuYyAgfCA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9ob3N0MXgvYnVzLmMgICAg IHwgNCArKy0tCiBkcml2ZXJzL2dwdS9ob3N0MXgvc3luY3B0LmMgIHwgMiArLQogaW5jbHVkZS9s aW51eC9ob3N0MXguaCAgICAgICB8IDIgKy0KIDEyIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlv bnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90ZWdy YS9kYy5jIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMKaW5kZXggMmI5YTI1Yzk3N2MwLi4y OTgzZWIzM2YyYmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kYy5jCkBAIC0yMDA2LDcgKzIwMDYsNyBAQCBzdGF0aWMg Ym9vbCB0ZWdyYV9kY19oYXNfd2luZG93X2dyb3VwcyhzdHJ1Y3QgdGVncmFfZGMgKmRjKQogCiBz dGF0aWMgaW50IHRlZ3JhX2RjX2luaXQoc3RydWN0IGhvc3QxeF9jbGllbnQgKmNsaWVudCkKIHsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+cGFyZW50 KTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+aG9z dCk7CiAJdW5zaWduZWQgbG9uZyBmbGFncyA9IEhPU1QxWF9TWU5DUFRfQ0xJRU5UX01BTkFHRUQ7 CiAJc3RydWN0IHRlZ3JhX2RjICpkYyA9IGhvc3QxeF9jbGllbnRfdG9fZGMoY2xpZW50KTsKIAlz dHJ1Y3QgdGVncmFfZHJtICp0ZWdyYSA9IGRybS0+ZGV2X3ByaXZhdGU7CkBAIC0yMDg3LDkgKzIw ODcsOSBAQCBzdGF0aWMgaW50IHRlZ3JhX2RjX2luaXQoc3RydWN0IGhvc3QxeF9jbGllbnQgKmNs aWVudCkKIAogCS8qCiAJICogSW5oZXJpdCB0aGUgRE1BIHBhcmFtZXRlcnMgKHN1Y2ggYXMgbWF4 aW11bSBzZWdtZW50IHNpemUpIGZyb20gdGhlCi0JICogcGFyZW50IGRldmljZS4KKwkgKiBwYXJl bnQgaG9zdDF4IGRldmljZS4KIAkgKi8KLQljbGllbnQtPmRldi0+ZG1hX3Bhcm1zID0gY2xpZW50 LT5wYXJlbnQtPmRtYV9wYXJtczsKKwljbGllbnQtPmRldi0+ZG1hX3Bhcm1zID0gY2xpZW50LT5o b3N0LT5kbWFfcGFybXM7CiAKIAlyZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL3RlZ3JhL2RybS5jIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RybS5jCmluZGV4IGY0NTVj ZTcxZTg1ZC4uYWE5ZTQ5ZjA0OTg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEv ZHJtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RybS5jCkBAIC05MDUsNyArOTA1LDcg QEAgaW50IHRlZ3JhX2RybV91bnJlZ2lzdGVyX2NsaWVudChzdHJ1Y3QgdGVncmFfZHJtICp0ZWdy YSwKIGludCBob3N0MXhfY2xpZW50X2lvbW11X2F0dGFjaChzdHJ1Y3QgaG9zdDF4X2NsaWVudCAq Y2xpZW50KQogewogCXN0cnVjdCBpb21tdV9kb21haW4gKmRvbWFpbiA9IGlvbW11X2dldF9kb21h aW5fZm9yX2RldihjbGllbnQtPmRldik7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9n ZXRfZHJ2ZGF0YShjbGllbnQtPnBhcmVudCk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRl dl9nZXRfZHJ2ZGF0YShjbGllbnQtPmhvc3QpOwogCXN0cnVjdCB0ZWdyYV9kcm0gKnRlZ3JhID0g ZHJtLT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW9tbXVfZ3JvdXAgKmdyb3VwID0gTlVMTDsKIAlp bnQgZXJyOwpAQCAtOTQxLDcgKzk0MSw3IEBAIGludCBob3N0MXhfY2xpZW50X2lvbW11X2F0dGFj aChzdHJ1Y3QgaG9zdDF4X2NsaWVudCAqY2xpZW50KQogCiB2b2lkIGhvc3QxeF9jbGllbnRfaW9t bXVfZGV0YWNoKHN0cnVjdCBob3N0MXhfY2xpZW50ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPnBhcmVudCk7CisJc3RydWN0IGRy bV9kZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPmhvc3QpOwogCXN0cnVjdCB0 ZWdyYV9kcm0gKnRlZ3JhID0gZHJtLT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW9tbXVfZG9tYWlu ICpkb21haW47CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kc2kuYyBiL2Ry aXZlcnMvZ3B1L2RybS90ZWdyYS9kc2kuYwppbmRleCBhNWQ0N2UzMDFjNWYuLmVjNDc1ZDAyMmZh MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RzaS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS90ZWdyYS9kc2kuYwpAQCAtMTAzMCw3ICsxMDMwLDcgQEAgc3RhdGljIGNvbnN0IHN0 cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3MgdGVncmFfZHNpX2VuY29kZXJfaGVscGVyX2Z1 bmNzID0gewogCiBzdGF0aWMgaW50IHRlZ3JhX2RzaV9pbml0KHN0cnVjdCBob3N0MXhfY2xpZW50 ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0YShj bGllbnQtPnBhcmVudCk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0 YShjbGllbnQtPmhvc3QpOwogCXN0cnVjdCB0ZWdyYV9kc2kgKmRzaSA9IGhvc3QxeF9jbGllbnRf dG9fZHNpKGNsaWVudCk7CiAJaW50IGVycjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3RlZ3JhL2dyMmQuYyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9ncjJkLmMKaW5kZXggMWZjNGU1 NmM3Y2M1Li40ODM2M2Y3NDRiYjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9n cjJkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2dyMmQuYwpAQCAtMzQsNyArMzQsNyBA QCBzdGF0aWMgaW5saW5lIHN0cnVjdCBncjJkICp0b19ncjJkKHN0cnVjdCB0ZWdyYV9kcm1fY2xp ZW50ICpjbGllbnQpCiBzdGF0aWMgaW50IGdyMmRfaW5pdChzdHJ1Y3QgaG9zdDF4X2NsaWVudCAq Y2xpZW50KQogewogCXN0cnVjdCB0ZWdyYV9kcm1fY2xpZW50ICpkcm0gPSBob3N0MXhfdG9fZHJt X2NsaWVudChjbGllbnQpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfZ2V0X2RydmRh dGEoY2xpZW50LT5wYXJlbnQpOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfZ2V0X2Ry dmRhdGEoY2xpZW50LT5ob3N0KTsKIAl1bnNpZ25lZCBsb25nIGZsYWdzID0gSE9TVDFYX1NZTkNQ VF9IQVNfQkFTRTsKIAlzdHJ1Y3QgZ3IyZCAqZ3IyZCA9IHRvX2dyMmQoZHJtKTsKIAlpbnQgZXJy OwpAQCAtNzYsNyArNzYsNyBAQCBzdGF0aWMgaW50IGdyMmRfaW5pdChzdHJ1Y3QgaG9zdDF4X2Ns aWVudCAqY2xpZW50KQogc3RhdGljIGludCBncjJkX2V4aXQoc3RydWN0IGhvc3QxeF9jbGllbnQg KmNsaWVudCkKIHsKIAlzdHJ1Y3QgdGVncmFfZHJtX2NsaWVudCAqZHJtID0gaG9zdDF4X3RvX2Ry bV9jbGllbnQoY2xpZW50KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X2dldF9kcnZk YXRhKGNsaWVudC0+cGFyZW50KTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X2dldF9k cnZkYXRhKGNsaWVudC0+aG9zdCk7CiAJc3RydWN0IHRlZ3JhX2RybSAqdGVncmEgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBncjJkICpncjJkID0gdG9fZ3IyZChkcm0pOwogCWludCBlcnI7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZ3IzZC5jIGIvZHJpdmVycy9ncHUv ZHJtL3RlZ3JhL2dyM2QuYwppbmRleCAyNGZhZTBmNjQwMzIuLmMwYTUyOGJlMDM2OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2dyM2QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v dGVncmEvZ3IzZC5jCkBAIC00Myw3ICs0Myw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGdyM2Qg KnRvX2dyM2Qoc3RydWN0IHRlZ3JhX2RybV9jbGllbnQgKmNsaWVudCkKIHN0YXRpYyBpbnQgZ3Iz ZF9pbml0KHN0cnVjdCBob3N0MXhfY2xpZW50ICpjbGllbnQpCiB7CiAJc3RydWN0IHRlZ3JhX2Ry bV9jbGllbnQgKmRybSA9IGhvc3QxeF90b19kcm1fY2xpZW50KGNsaWVudCk7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPnBhcmVudCk7CisJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPmhvc3QpOwogCXVuc2ln bmVkIGxvbmcgZmxhZ3MgPSBIT1NUMVhfU1lOQ1BUX0hBU19CQVNFOwogCXN0cnVjdCBncjNkICpn cjNkID0gdG9fZ3IzZChkcm0pOwogCWludCBlcnI7CkBAIC04NSw3ICs4NSw3IEBAIHN0YXRpYyBp bnQgZ3IzZF9pbml0KHN0cnVjdCBob3N0MXhfY2xpZW50ICpjbGllbnQpCiBzdGF0aWMgaW50IGdy M2RfZXhpdChzdHJ1Y3QgaG9zdDF4X2NsaWVudCAqY2xpZW50KQogewogCXN0cnVjdCB0ZWdyYV9k cm1fY2xpZW50ICpkcm0gPSBob3N0MXhfdG9fZHJtX2NsaWVudChjbGllbnQpOwotCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBkZXZfZ2V0X2RydmRhdGEoY2xpZW50LT5wYXJlbnQpOworCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfZ2V0X2RydmRhdGEoY2xpZW50LT5ob3N0KTsKIAlzdHJ1 Y3QgZ3IzZCAqZ3IzZCA9IHRvX2dyM2QoZHJtKTsKIAlpbnQgZXJyOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vdGVncmEvaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2hkbWku YwppbmRleCA1MDI2OWZmYmNiNmIuLjM4YmYxZDE2MDk1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3RlZ3JhL2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvaGRtaS5jCkBA IC0xNDI0LDggKzE0MjQsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2hlbHBl cl9mdW5jcyB0ZWdyYV9oZG1pX2VuY29kZXJfaGVscGVyX2Z1bmNzID0gewogCiBzdGF0aWMgaW50 IHRlZ3JhX2hkbWlfaW5pdChzdHJ1Y3QgaG9zdDF4X2NsaWVudCAqY2xpZW50KQogewotCXN0cnVj dCBkcm1fZGV2aWNlICpkcm0gPSBkZXZfZ2V0X2RydmRhdGEoY2xpZW50LT5wYXJlbnQpOwogCXN0 cnVjdCB0ZWdyYV9oZG1pICpoZG1pID0gaG9zdDF4X2NsaWVudF90b19oZG1pKGNsaWVudCk7CisJ c3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPmhvc3QpOwog CWludCBlcnI7CiAKIAloZG1pLT5vdXRwdXQuZGV2ID0gY2xpZW50LT5kZXY7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvaHViLmMgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvaHVi LmMKaW5kZXggZTU2YzBmN2QzYTEzLi41Yzc1NDVlZTVhNWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS90ZWdyYS9odWIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvaHViLmMKQEAg LTcxNSw3ICs3MTUsNyBAQCB2b2lkIHRlZ3JhX2Rpc3BsYXlfaHViX2F0b21pY19jb21taXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRybSwKIHN0YXRpYyBpbnQgdGVncmFfZGlzcGxheV9odWJfaW5pdChz dHJ1Y3QgaG9zdDF4X2NsaWVudCAqY2xpZW50KQogewogCXN0cnVjdCB0ZWdyYV9kaXNwbGF5X2h1 YiAqaHViID0gdG9fdGVncmFfZGlzcGxheV9odWIoY2xpZW50KTsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZHJtID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+cGFyZW50KTsKKwlzdHJ1Y3QgZHJtX2Rl dmljZSAqZHJtID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+aG9zdCk7CiAJc3RydWN0IHRlZ3Jh X2RybSAqdGVncmEgPSBkcm0tPmRldl9wcml2YXRlOwogCXN0cnVjdCB0ZWdyYV9kaXNwbGF5X2h1 Yl9zdGF0ZSAqc3RhdGU7CiAKQEAgLTczMyw3ICs3MzMsNyBAQCBzdGF0aWMgaW50IHRlZ3JhX2Rp c3BsYXlfaHViX2luaXQoc3RydWN0IGhvc3QxeF9jbGllbnQgKmNsaWVudCkKIAogc3RhdGljIGlu dCB0ZWdyYV9kaXNwbGF5X2h1Yl9leGl0KHN0cnVjdCBob3N0MXhfY2xpZW50ICpjbGllbnQpCiB7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPnBhcmVu dCk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9nZXRfZHJ2ZGF0YShjbGllbnQtPmhv c3QpOwogCXN0cnVjdCB0ZWdyYV9kcm0gKnRlZ3JhID0gZHJtLT5kZXZfcHJpdmF0ZTsKIAogCWRy bV9hdG9taWNfcHJpdmF0ZV9vYmpfZmluaSgmdGVncmEtPmh1Yi0+YmFzZSk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvc29yLmMgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvc29y LmMKaW5kZXggYTY4ZDNiMzZiOTcyLi45NTZiZjVkNjgwYWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS90ZWdyYS9zb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvc29yLmMKQEAg LTMwNTMsNyArMzA1Myw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdGVncmFfc29yX29wcyB0ZWdy YV9zb3JfZHBfb3BzID0gewogCiBzdGF0aWMgaW50IHRlZ3JhX3Nvcl9pbml0KHN0cnVjdCBob3N0 MXhfY2xpZW50ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9nZXRf ZHJ2ZGF0YShjbGllbnQtPnBhcmVudCk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IGRldl9n ZXRfZHJ2ZGF0YShjbGllbnQtPmhvc3QpOwogCWNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxw ZXJfZnVuY3MgKmhlbHBlcnMgPSBOVUxMOwogCXN0cnVjdCB0ZWdyYV9zb3IgKnNvciA9IGhvc3Qx eF9jbGllbnRfdG9fc29yKGNsaWVudCk7CiAJaW50IGNvbm5lY3RvciA9IERSTV9NT0RFX0NPTk5F Q1RPUl9Vbmtub3duOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL3ZpYy5jIGIv ZHJpdmVycy9ncHUvZHJtL3RlZ3JhL3ZpYy5jCmluZGV4IDM1MjZjMjg5MmRkYi4uYWRlNTZiODYw Y2Y5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvdmljLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3RlZ3JhL3ZpYy5jCkBAIC0xNjEsNyArMTYxLDcgQEAgc3RhdGljIGludCB2aWNf Ym9vdChzdHJ1Y3QgdmljICp2aWMpCiBzdGF0aWMgaW50IHZpY19pbml0KHN0cnVjdCBob3N0MXhf Y2xpZW50ICpjbGllbnQpCiB7CiAJc3RydWN0IHRlZ3JhX2RybV9jbGllbnQgKmRybSA9IGhvc3Qx eF90b19kcm1fY2xpZW50KGNsaWVudCk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9n ZXRfZHJ2ZGF0YShjbGllbnQtPnBhcmVudCk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRl dl9nZXRfZHJ2ZGF0YShjbGllbnQtPmhvc3QpOwogCXN0cnVjdCB0ZWdyYV9kcm0gKnRlZ3JhID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgdmljICp2aWMgPSB0b192aWMoZHJtKTsKIAlpbnQg ZXJyOwpAQCAtMTkwLDkgKzE5MCw5IEBAIHN0YXRpYyBpbnQgdmljX2luaXQoc3RydWN0IGhvc3Qx eF9jbGllbnQgKmNsaWVudCkKIAogCS8qCiAJICogSW5oZXJpdCB0aGUgRE1BIHBhcmFtZXRlcnMg KHN1Y2ggYXMgbWF4aW11bSBzZWdtZW50IHNpemUpIGZyb20gdGhlCi0JICogcGFyZW50IGRldmlj ZS4KKwkgKiBwYXJlbnQgaG9zdDF4IGRldmljZS4KIAkgKi8KLQljbGllbnQtPmRldi0+ZG1hX3Bh cm1zID0gY2xpZW50LT5wYXJlbnQtPmRtYV9wYXJtczsKKwljbGllbnQtPmRldi0+ZG1hX3Bhcm1z ID0gY2xpZW50LT5ob3N0LT5kbWFfcGFybXM7CiAKIAlyZXR1cm4gMDsKIApAQCAtMjA5LDcgKzIw OSw3IEBAIHN0YXRpYyBpbnQgdmljX2luaXQoc3RydWN0IGhvc3QxeF9jbGllbnQgKmNsaWVudCkK IHN0YXRpYyBpbnQgdmljX2V4aXQoc3RydWN0IGhvc3QxeF9jbGllbnQgKmNsaWVudCkKIHsKIAlz dHJ1Y3QgdGVncmFfZHJtX2NsaWVudCAqZHJtID0gaG9zdDF4X3RvX2RybV9jbGllbnQoY2xpZW50 KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+cGFy ZW50KTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+ aG9zdCk7CiAJc3RydWN0IHRlZ3JhX2RybSAqdGVncmEgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCB2aWMgKnZpYyA9IHRvX3ZpYyhkcm0pOwogCWludCBlcnI7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9ob3N0MXgvYnVzLmMgYi9kcml2ZXJzL2dwdS9ob3N0MXgvYnVzLmMKaW5kZXggMmM4 NTU5ZmYzNDgxLi41MGQ1MDAzNDVkMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2hvc3QxeC9i dXMuYworKysgYi9kcml2ZXJzL2dwdS9ob3N0MXgvYnVzLmMKQEAgLTEyMCw3ICsxMjAsNyBAQCBz dGF0aWMgdm9pZCBob3N0MXhfc3ViZGV2X3JlZ2lzdGVyKHN0cnVjdCBob3N0MXhfZGV2aWNlICpk ZXZpY2UsCiAJbXV0ZXhfbG9jaygmZGV2aWNlLT5jbGllbnRzX2xvY2spOwogCWxpc3RfbW92ZV90 YWlsKCZjbGllbnQtPmxpc3QsICZkZXZpY2UtPmNsaWVudHMpOwogCWxpc3RfbW92ZV90YWlsKCZz dWJkZXYtPmxpc3QsICZkZXZpY2UtPmFjdGl2ZSk7Ci0JY2xpZW50LT5wYXJlbnQgPSAmZGV2aWNl LT5kZXY7CisJY2xpZW50LT5ob3N0ID0gJmRldmljZS0+ZGV2OwogCXN1YmRldi0+Y2xpZW50ID0g Y2xpZW50OwogCW11dGV4X3VubG9jaygmZGV2aWNlLT5jbGllbnRzX2xvY2spOwogCW11dGV4X3Vu bG9jaygmZGV2aWNlLT5zdWJkZXZzX2xvY2spOwpAQCAtMTU2LDcgKzE1Niw3IEBAIHN0YXRpYyB2 b2lkIF9faG9zdDF4X3N1YmRldl91bnJlZ2lzdGVyKHN0cnVjdCBob3N0MXhfZGV2aWNlICpkZXZp Y2UsCiAJICovCiAJbXV0ZXhfbG9jaygmZGV2aWNlLT5jbGllbnRzX2xvY2spOwogCXN1YmRldi0+ Y2xpZW50ID0gTlVMTDsKLQljbGllbnQtPnBhcmVudCA9IE5VTEw7CisJY2xpZW50LT5ob3N0ID0g TlVMTDsKIAlsaXN0X21vdmVfdGFpbCgmc3ViZGV2LT5saXN0LCAmZGV2aWNlLT5zdWJkZXZzKTsK IAkvKgogCSAqIFhYWDogUGVyaGFwcyBkb24ndCBkbyB0aGlzIGhlcmUsIGJ1dCByYXRoZXIgZXhw bGljaXRseSByZW1vdmUgaXQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2hvc3QxeC9zeW5jcHQu YyBiL2RyaXZlcnMvZ3B1L2hvc3QxeC9zeW5jcHQuYwppbmRleCBkZDFjZDAxNDI5NDEuLmZjZTc4 OTJkNTEzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvaG9zdDF4L3N5bmNwdC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2hvc3QxeC9zeW5jcHQuYwpAQCAtNDIxLDcgKzQyMSw3IEBAIGludCBob3N0MXhf c3luY3B0X2luaXQoc3RydWN0IGhvc3QxeCAqaG9zdCkKIHN0cnVjdCBob3N0MXhfc3luY3B0ICpo b3N0MXhfc3luY3B0X3JlcXVlc3Qoc3RydWN0IGhvc3QxeF9jbGllbnQgKmNsaWVudCwKIAkJCQkJ ICAgIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiB7Ci0Jc3RydWN0IGhvc3QxeCAqaG9zdCA9IGRldl9n ZXRfZHJ2ZGF0YShjbGllbnQtPnBhcmVudC0+cGFyZW50KTsKKwlzdHJ1Y3QgaG9zdDF4ICpob3N0 ID0gZGV2X2dldF9kcnZkYXRhKGNsaWVudC0+aG9zdC0+cGFyZW50KTsKIAogCXJldHVybiBob3N0 MXhfc3luY3B0X2FsbG9jKGhvc3QsIGNsaWVudCwgZmxhZ3MpOwogfQpkaWZmIC0tZ2l0IGEvaW5j bHVkZS9saW51eC9ob3N0MXguaCBiL2luY2x1ZGUvbGludXgvaG9zdDF4LmgKaW5kZXggNmVkZWI5 MjI4YzRlLi40NzBhMTkzYTlmZWQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvaG9zdDF4LmgK KysrIGIvaW5jbHVkZS9saW51eC9ob3N0MXguaApAQCAtNDQsNyArNDQsNyBAQCBzdHJ1Y3QgaG9z dDF4X2NsaWVudF9vcHMgewogICovCiBzdHJ1Y3QgaG9zdDF4X2NsaWVudCB7CiAJc3RydWN0IGxp c3RfaGVhZCBsaXN0OwotCXN0cnVjdCBkZXZpY2UgKnBhcmVudDsKKwlzdHJ1Y3QgZGV2aWNlICpo b3N0OwogCXN0cnVjdCBkZXZpY2UgKmRldjsKIAlzdHJ1Y3QgaW9tbXVfZ3JvdXAgKmdyb3VwOwog Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1053C432C0 for ; Tue, 3 Dec 2019 16:27:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B51162073B for ; Tue, 3 Dec 2019 16:27:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DgeflI0x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726628AbfLCQ1j (ORCPT ); Tue, 3 Dec 2019 11:27:39 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39349 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725848AbfLCQ1i (ORCPT ); Tue, 3 Dec 2019 11:27:38 -0500 Received: by mail-wr1-f66.google.com with SMTP id y11so4440103wrt.6; Tue, 03 Dec 2019 08:27:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0jfaKoGNvqeidEq8dhnq6AcI1xu7YSgIa7d+c2XneLU=; b=DgeflI0xhGeQdxE6Ff9+yRak9JHCaJ+JlQW06FT4AxZZMxXnxSsKuuMBIPPlc5/0zk rcq8WP4bDFUBpv1JXkCmJf4DVKLycRlHcFE3Mdf6mhIcQGdrUUH7k/m1Ch3FTsnISrx0 E7xF9nBP4x3hM7evKNyRckarMJwfIBVlGG0l/e1Cq/twzgtL4B1R4TQlnGeUGoNSk/hr Ilq8GyyytJ58dDRfZCVFZ1Nccvuz9cGkrpPxc30TZupqBBBUTUXSTTv0vfLDEDSU+sFD cNyUUEdCL+ar2jGZrLqC2G4SsN6vG2gslrYyZ1umGJUWE146OETBLEqLB3G5WvuP1C0h 6Zkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0jfaKoGNvqeidEq8dhnq6AcI1xu7YSgIa7d+c2XneLU=; b=YUts4Ln99oNhtgAxkr6CTmp52NcoaLW2TdrK9Al2HH1+n8EJHfbIRYhzyC+nvP5Ryp S3CM5mFzHb+JD2unM9A3t1urhkl/OD1RTKEQEO6vssyVZD07Yo+LMdBy4dfRqVGbsYIY H3Uak2/5OeJetaBzie5Eoqyc6Lf1ZNbXJYw+Jx0nkeD0XQ1Adzb4OIXKhPJQ9PxzLKge VxxH5WAWmTXBCGrrIYl3KwAELzM0mxTKjvJpu7fCFLY0d08Gm7EZncTpCQbnnGr5cMRJ kxTSrDVqeHivtmW2eemWjw+QcCTIuFEjbFkBCfZFI/4rnteJ5GcQa4USE3pav+AtqbQS 8DDw== X-Gm-Message-State: APjAAAWkYkxwmepjWKdDCTioFwAf0VzQVXUH6ewNtBkEubiv3oigtTuq rHk7Ia2MOplCmvni0GyH4N8= X-Google-Smtp-Source: APXvYqx/UGxSKekCs3iXh8mICGv/7cRs5i7A8WvP/ydE87BrhqKQsz6WpISddTAkIG1rAMzTt7I62g== X-Received: by 2002:a5d:6441:: with SMTP id d1mr6117959wrw.93.1575390455787; Tue, 03 Dec 2019 08:27:35 -0800 (PST) Received: from localhost (pD9E518ED.dip0.t-ipconnect.de. [217.229.24.237]) by smtp.gmail.com with ESMTPSA id k19sm3452068wmi.42.2019.12.03.08.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 08:27:34 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Daniel Vetter , "Rafael J. Wysocki" , dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 1/2] gpu: host1x: Rename "parent" to "host" Date: Tue, 3 Dec 2019 17:27:32 +0100 Message-Id: <20191203162733.1436800-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Thierry Reding Rename the host1x clients' parent to "host" because that more closely describes what it is. The parent can be confused with the parent device in terms of the device hierarchy. Subsequent patches will add a new member that refers to the parent in that hierarchy. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/dc.c | 6 +++--- drivers/gpu/drm/tegra/drm.c | 4 ++-- drivers/gpu/drm/tegra/dsi.c | 2 +- drivers/gpu/drm/tegra/gr2d.c | 4 ++-- drivers/gpu/drm/tegra/gr3d.c | 4 ++-- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/hub.c | 4 ++-- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/tegra/vic.c | 8 ++++---- drivers/gpu/host1x/bus.c | 4 ++-- drivers/gpu/host1x/syncpt.c | 2 +- include/linux/host1x.h | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 2b9a25c977c0..2983eb33f2be 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -2006,7 +2006,7 @@ static bool tegra_dc_has_window_groups(struct tegra_dc *dc) static int tegra_dc_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); unsigned long flags = HOST1X_SYNCPT_CLIENT_MANAGED; struct tegra_dc *dc = host1x_client_to_dc(client); struct tegra_drm *tegra = drm->dev_private; @@ -2087,9 +2087,9 @@ static int tegra_dc_init(struct host1x_client *client) /* * Inherit the DMA parameters (such as maximum segment size) from the - * parent device. + * parent host1x device. */ - client->dev->dma_parms = client->parent->dma_parms; + client->dev->dma_parms = client->host->dma_parms; return 0; diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index f455ce71e85d..aa9e49f04988 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -905,7 +905,7 @@ int tegra_drm_unregister_client(struct tegra_drm *tegra, int host1x_client_iommu_attach(struct host1x_client *client) { struct iommu_domain *domain = iommu_get_domain_for_dev(client->dev); - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; struct iommu_group *group = NULL; int err; @@ -941,7 +941,7 @@ int host1x_client_iommu_attach(struct host1x_client *client) void host1x_client_iommu_detach(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; struct iommu_domain *domain; diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index a5d47e301c5f..ec475d022fa0 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -1030,7 +1030,7 @@ static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = { static int tegra_dsi_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_dsi *dsi = host1x_client_to_dsi(client); int err; diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c index 1fc4e56c7cc5..48363f744bb9 100644 --- a/drivers/gpu/drm/tegra/gr2d.c +++ b/drivers/gpu/drm/tegra/gr2d.c @@ -34,7 +34,7 @@ static inline struct gr2d *to_gr2d(struct tegra_drm_client *client) static int gr2d_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); unsigned long flags = HOST1X_SYNCPT_HAS_BASE; struct gr2d *gr2d = to_gr2d(drm); int err; @@ -76,7 +76,7 @@ static int gr2d_init(struct host1x_client *client) static int gr2d_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct tegra_drm *tegra = dev->dev_private; struct gr2d *gr2d = to_gr2d(drm); int err; diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c index 24fae0f64032..c0a528be0369 100644 --- a/drivers/gpu/drm/tegra/gr3d.c +++ b/drivers/gpu/drm/tegra/gr3d.c @@ -43,7 +43,7 @@ static inline struct gr3d *to_gr3d(struct tegra_drm_client *client) static int gr3d_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); unsigned long flags = HOST1X_SYNCPT_HAS_BASE; struct gr3d *gr3d = to_gr3d(drm); int err; @@ -85,7 +85,7 @@ static int gr3d_init(struct host1x_client *client) static int gr3d_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct gr3d *gr3d = to_gr3d(drm); int err; diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 50269ffbcb6b..38bf1d16095f 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1424,8 +1424,8 @@ static const struct drm_encoder_helper_funcs tegra_hdmi_encoder_helper_funcs = { static int tegra_hdmi_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); + struct drm_device *drm = dev_get_drvdata(client->host); int err; hdmi->output.dev = client->dev; diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index e56c0f7d3a13..5c7545ee5a5b 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -715,7 +715,7 @@ void tegra_display_hub_atomic_commit(struct drm_device *drm, static int tegra_display_hub_init(struct host1x_client *client) { struct tegra_display_hub *hub = to_tegra_display_hub(client); - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; struct tegra_display_hub_state *state; @@ -733,7 +733,7 @@ static int tegra_display_hub_init(struct host1x_client *client) static int tegra_display_hub_exit(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; drm_atomic_private_obj_fini(&tegra->hub->base); diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index a68d3b36b972..956bf5d680ad 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -3053,7 +3053,7 @@ static const struct tegra_sor_ops tegra_sor_dp_ops = { static int tegra_sor_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); const struct drm_encoder_helper_funcs *helpers = NULL; struct tegra_sor *sor = host1x_client_to_sor(client); int connector = DRM_MODE_CONNECTOR_Unknown; diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 3526c2892ddb..ade56b860cf9 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -161,7 +161,7 @@ static int vic_boot(struct vic *vic) static int vic_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct tegra_drm *tegra = dev->dev_private; struct vic *vic = to_vic(drm); int err; @@ -190,9 +190,9 @@ static int vic_init(struct host1x_client *client) /* * Inherit the DMA parameters (such as maximum segment size) from the - * parent device. + * parent host1x device. */ - client->dev->dma_parms = client->parent->dma_parms; + client->dev->dma_parms = client->host->dma_parms; return 0; @@ -209,7 +209,7 @@ static int vic_init(struct host1x_client *client) static int vic_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct tegra_drm *tegra = dev->dev_private; struct vic *vic = to_vic(drm); int err; diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 2c8559ff3481..50d500345d04 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -120,7 +120,7 @@ static void host1x_subdev_register(struct host1x_device *device, mutex_lock(&device->clients_lock); list_move_tail(&client->list, &device->clients); list_move_tail(&subdev->list, &device->active); - client->parent = &device->dev; + client->host = &device->dev; subdev->client = client; mutex_unlock(&device->clients_lock); mutex_unlock(&device->subdevs_lock); @@ -156,7 +156,7 @@ static void __host1x_subdev_unregister(struct host1x_device *device, */ mutex_lock(&device->clients_lock); subdev->client = NULL; - client->parent = NULL; + client->host = NULL; list_move_tail(&subdev->list, &device->subdevs); /* * XXX: Perhaps don't do this here, but rather explicitly remove it diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c index dd1cd0142941..fce7892d5137 100644 --- a/drivers/gpu/host1x/syncpt.c +++ b/drivers/gpu/host1x/syncpt.c @@ -421,7 +421,7 @@ int host1x_syncpt_init(struct host1x *host) struct host1x_syncpt *host1x_syncpt_request(struct host1x_client *client, unsigned long flags) { - struct host1x *host = dev_get_drvdata(client->parent->parent); + struct host1x *host = dev_get_drvdata(client->host->parent); return host1x_syncpt_alloc(host, client, flags); } diff --git a/include/linux/host1x.h b/include/linux/host1x.h index 6edeb9228c4e..470a193a9fed 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -44,7 +44,7 @@ struct host1x_client_ops { */ struct host1x_client { struct list_head list; - struct device *parent; + struct device *host; struct device *dev; struct iommu_group *group; -- 2.23.0