From: Jani Nikula Subject: [PATCH] drm/r128: make ATI PCI GART part of its only user, r128 Date: Tue, 19 Nov 2019 12:05:36 +0200 Message-ID: <20191119100536.12024-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFA036E8DF for ; Tue, 19 Nov 2019 10:05:44 +0000 (UTC) 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: Jani Nikula , Alex Deucher , Dave Airlie , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhlIEFUSSBSYWdlIDEyOCBkcml2ZXIgaGFzIGJlZW4gdGhlIG9ubHkgdXNlciBvZiBBVEkgUENJ IEdBUlQgY29kZQpzaW5jZSBSYWRlb24gZHJvcHBlZCBVTVMgc3VwcG9ydCBpbiBjb21taXQgODMz M2Y2MDdhNjMxICgiZHJtL3JhZGVvbjoKcmVtb3ZlIFVNUyBzdXBwb3J0IikuIENsZWFuIHVwIHRo ZSBkcm0gdG9wIGxldmVsIGRpcmVjdG9yeSwgS2NvbmZpZyBhbmQKTWFrZWZpbGUgYnkgbWFraW5n IGF0aV9wY2lnYXJ0LltjaF0gcGFydCBvZiByMTI4LiBEcm9wIHRoZQpDT05GSUdfRFJNX0FUSV9Q Q0lHQVJUIGNvbmZpZyBvcHRpb24gbWFkZSByZWR1bmRhbnQgYnkgdGhlIGNoYW5nZS4KClRoaXMg cmVkdWNlcyBkcm0ua28gbW9kdWxlIHNpemUgc2xpZ2h0bHkgd2hlbiBsZWdhY3kgZHJpdmVycyBh cmUKZW5hYmxlZCwgYW5kIG1vdmVzIHRoZSBiYWdnYWdlIHRvIHIxMjgua28gaW5zdGVhZC4KCkNj OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+CkNjOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVk aGF0LmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vS2NvbmZpZyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCA0IC0tLS0KIGRyaXZlcnMvZ3B1L2RybS9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAg ICAgICAgICB8IDEgLQogZHJpdmVycy9ncHUvZHJtL3IxMjgvTWFrZWZpbGUgICAgICAgICAgICAg ICAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL3sgPT4gcjEyOH0vYXRpX3BjaWdhcnQu YyAgICAgICAgICAgIHwgNSArKy0tLQoge2luY2x1ZGUvZHJtID0+IGRyaXZlcnMvZ3B1L2RybS9y MTI4fS9hdGlfcGNpZ2FydC5oIHwgMAogZHJpdmVycy9ncHUvZHJtL3IxMjgvcjEyOF9kcnYuaCAg ICAgICAgICAgICAgICAgICAgIHwgMyArKy0KIDYgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25z KCspLCAxMCBkZWxldGlvbnMoLSkKIHJlbmFtZSBkcml2ZXJzL2dwdS9kcm0veyA9PiByMTI4fS9h dGlfcGNpZ2FydC5jICg5OCUpCiByZW5hbWUge2luY2x1ZGUvZHJtID0+IGRyaXZlcnMvZ3B1L2Ry bS9yMTI4fS9hdGlfcGNpZ2FydC5oICgxMDAlKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9LY29uZmlnIGIvZHJpdmVycy9ncHUvZHJtL0tjb25maWcKaW5kZXggNzZkYjhiYzBkZDFmLi42 ZDU1YTczZDVkMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9LY29uZmlnCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9LY29uZmlnCkBAIC0yOTcsOSArMjk3LDYgQEAgY29uZmlnIERSTV9WS01T CiAKIAkgIElmIE0gaXMgc2VsZWN0ZWQgdGhlIG1vZHVsZSB3aWxsIGJlIGNhbGxlZCB2a21zLgog Ci1jb25maWcgRFJNX0FUSV9QQ0lHQVJUCi0gICAgICAgIGJvb2wKLQogc291cmNlICJkcml2ZXJz L2dwdS9kcm0vZXh5bm9zL0tjb25maWciCiAKIHNvdXJjZSAiZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL0tjb25maWciCkBAIC0zOTYsNyArMzkzLDYgQEAgbWVudWNvbmZpZyBEUk1fTEVHQUNZCiAJ Ym9vbCAiRW5hYmxlIGxlZ2FjeSBkcml2ZXJzIChEQU5HRVJPVVMpIgogCWRlcGVuZHMgb24gRFJN ICYmIE1NVQogCXNlbGVjdCBEUk1fVk0KLQlzZWxlY3QgRFJNX0FUSV9QQ0lHQVJUIGlmIFBDSQog CWhlbHAKIAkgIEVuYWJsZSBsZWdhY3kgRFJJMSBkcml2ZXJzLiBUaG9zZSBkcml2ZXJzIGV4cG9z ZSB1bnNhZmUgYW5kIGRhbmdlcm91cwogCSAgQVBJcyB0byB1c2VyLXNwYWNlLCB3aGljaCBjYW4g YmUgdXNlZCB0byBjaXJjdW12ZW50IGFjY2VzcwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlCmluZGV4IDlmMWM3YzQ4NmY4OC4u ZDliY2M5ZjJhMGE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vTWFrZWZpbGUKKysrIGIv ZHJpdmVycy9ncHUvZHJtL01ha2VmaWxlCkBAIC0yNSw3ICsyNSw2IEBAIGRybS0kKENPTkZJR19E Uk1fVk0pICs9IGRybV92bS5vCiBkcm0tJChDT05GSUdfQ09NUEFUKSArPSBkcm1faW9jMzIubwog ZHJtLSQoQ09ORklHX0RSTV9HRU1fQ01BX0hFTFBFUikgKz0gZHJtX2dlbV9jbWFfaGVscGVyLm8K IGRybS0kKENPTkZJR19EUk1fR0VNX1NITUVNX0hFTFBFUikgKz0gZHJtX2dlbV9zaG1lbV9oZWxw ZXIubwotZHJtLSQoQ09ORklHX0RSTV9BVElfUENJR0FSVCkgKz0gYXRpX3BjaWdhcnQubwogZHJt LSQoQ09ORklHX0RSTV9QQU5FTCkgKz0gZHJtX3BhbmVsLm8KIGRybS0kKENPTkZJR19PRikgKz0g ZHJtX29mLm8KIGRybS0kKENPTkZJR19BR1ApICs9IGRybV9hZ3BzdXBwb3J0Lm8KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9yMTI4L01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL3IxMjgv TWFrZWZpbGUKaW5kZXggYWU4YTE4NjBjNmI4Li5jMDdhMDY5NTMzZWYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yMTI4L01ha2VmaWxlCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yMTI4L01h a2VmaWxlCkBAIC0zLDcgKzMsNyBAQAogIyBNYWtlZmlsZSBmb3IgdGhlIGRybSBkZXZpY2UgZHJp dmVyLiAgVGhpcyBkcml2ZXIgcHJvdmlkZXMgc3VwcG9ydCBmb3IgdGhlCiAjIERpcmVjdCBSZW5k ZXJpbmcgSW5mcmFzdHJ1Y3R1cmUgKERSSSkgaW4gWEZyZWU4NiA0LjEuMCBhbmQgaGlnaGVyLgog Ci1yMTI4LXkgICA6PSByMTI4X2Rydi5vIHIxMjhfY2NlLm8gcjEyOF9zdGF0ZS5vIHIxMjhfaXJx Lm8KK3IxMjgteSAgIDo9IHIxMjhfZHJ2Lm8gcjEyOF9jY2UubyByMTI4X3N0YXRlLm8gcjEyOF9p cnEubyBhdGlfcGNpZ2FydC5vCiAKIHIxMjgtJChDT05GSUdfQ09NUEFUKSAgICs9IHIxMjhfaW9j MzIubwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXRpX3BjaWdhcnQuYyBiL2RyaXZl cnMvZ3B1L2RybS9yMTI4L2F0aV9wY2lnYXJ0LmMKc2ltaWxhcml0eSBpbmRleCA5OCUKcmVuYW1l IGZyb20gZHJpdmVycy9ncHUvZHJtL2F0aV9wY2lnYXJ0LmMKcmVuYW1lIHRvIGRyaXZlcnMvZ3B1 L2RybS9yMTI4L2F0aV9wY2lnYXJ0LmMKaW5kZXggNTgwYWEyNjc2MzU4Li45YjQwNzJmOTcyMTUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hdGlfcGNpZ2FydC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9yMTI4L2F0aV9wY2lnYXJ0LmMKQEAgLTMzLDExICszMywxMiBAQAogCiAjaW5jbHVk ZSA8bGludXgvZXhwb3J0Lmg+CiAKLSNpbmNsdWRlIDxkcm0vYXRpX3BjaWdhcnQuaD4KICNpbmNs dWRlIDxkcm0vZHJtX2RldmljZS5oPgogI2luY2x1ZGUgPGRybS9kcm1fcGNpLmg+CiAjaW5jbHVk ZSA8ZHJtL2RybV9wcmludC5oPgogCisjaW5jbHVkZSAiYXRpX3BjaWdhcnQuaCIKKwogIyBkZWZp bmUgQVRJX1BDSUdBUlRfUEFHRV9TSVpFCQk0MDk2CS8qKjwgUENJIEdBUlQgcGFnZSBzaXplICov CiAKIHN0YXRpYyBpbnQgZHJtX2F0aV9hbGxvY19wY2lnYXJ0X3RhYmxlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCkBAIC05NSw3ICs5Niw2IEBAIGludCBkcm1fYXRpX3BjaWdhcnRfY2xlYW51cChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2F0aV9wY2lnYXJ0X2luZm8KIAogCXJl dHVybiAxOwogfQotRVhQT1JUX1NZTUJPTChkcm1fYXRpX3BjaWdhcnRfY2xlYW51cCk7CiAKIGlu dCBkcm1fYXRpX3BjaWdhcnRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2F0aV9wY2lnYXJ0X2luZm8gKmdhcnRfaW5mbykKIHsKQEAgLTIwNyw0ICsyMDcsMyBAQCBpbnQg ZHJtX2F0aV9wY2lnYXJ0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9h dGlfcGNpZ2FydF9pbmZvICpnYQogCWdhcnRfaW5mby0+YnVzX2FkZHIgPSBidXNfYWRkcmVzczsK IAlyZXR1cm4gcmV0OwogfQotRVhQT1JUX1NZTUJPTChkcm1fYXRpX3BjaWdhcnRfaW5pdCk7CmRp ZmYgLS1naXQgYS9pbmNsdWRlL2RybS9hdGlfcGNpZ2FydC5oIGIvZHJpdmVycy9ncHUvZHJtL3Ix MjgvYXRpX3BjaWdhcnQuaApzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gaW5jbHVk ZS9kcm0vYXRpX3BjaWdhcnQuaApyZW5hbWUgdG8gZHJpdmVycy9ncHUvZHJtL3IxMjgvYXRpX3Bj aWdhcnQuaApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3IxMjgvcjEyOF9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9yMTI4L3IxMjhfZHJ2LmgKaW5kZXggYmE4YzMwZWQ5MWQxLi44YjI1NjEy M2NmMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yMTI4L3IxMjhfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3IxMjgvcjEyOF9kcnYuaApAQCAtMzksMTEgKzM5LDEyIEBACiAjaW5j bHVkZSA8bGludXgvaW8uaD4KICNpbmNsdWRlIDxsaW51eC9pcnFyZXR1cm4uaD4KIAotI2luY2x1 ZGUgPGRybS9hdGlfcGNpZ2FydC5oPgogI2luY2x1ZGUgPGRybS9kcm1faW9jdGwuaD4KICNpbmNs dWRlIDxkcm0vZHJtX2xlZ2FjeS5oPgogI2luY2x1ZGUgPGRybS9yMTI4X2RybS5oPgogCisjaW5j bHVkZSAiYXRpX3BjaWdhcnQuaCIKKwogLyogR2VuZXJhbCBjdXN0b21pemF0aW9uOgogICovCiAj ZGVmaW5lIERSSVZFUl9BVVRIT1IJCSJHYXJldGggSHVnaGVzLCBWQSBMaW51eCBTeXN0ZW1zIElu Yy4iCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbA==