From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: [PATCH v2 1/4] drm/mga: drop dependency on drm_os_linux.h Date: Sun, 23 Jun 2019 12:35:39 +0200 Message-ID: <20190623103542.30697-2-sam@ravnborg.org> References: <20190623103542.30697-1-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FF4089A94 for ; Sun, 23 Jun 2019 10:35:54 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id v18so9828205ljh.6 for ; Sun, 23 Jun 2019 03:35:54 -0700 (PDT) In-Reply-To: <20190623103542.30697-1-sam@ravnborg.org> 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: David Airlie , Sam Ravnborg , Thomas Zimmermann List-Id: dri-devel@lists.freedesktop.org T3BlbmNvZGUgYWxsIG1hY3JvcyB1c2VkIGZyb20gdGhlIGRlcHJlY2F0ZWQgZHJtX29zX2xpbnV4 LmggaGVhZGVyIGZpbGUuClRoZSBEUk1fV0FJVF9PTiB1c2VkIDMgKiBIWiBhcyB0aW1lb3V0LgpU aGlzIHdhcyB0cmFuc2xhdGVkIHRvIDMwMDAgbXNlYy4KClRoZSByZXR1cm4gdmFsdWUgb2YgbWdh X2RyaXZlcl9mZW5jZV93YWl0KCkgd2FzIG5vdAp1c2VkLCBzbyBtYWtlIGl0IHJldHVybiB2b2lk IHRvIHNpbXBsaWZ5IGNvZGUgYSBiaXQuCgp2MjoKLSBmaXhlZCB0aW1lb3V0IHRvIDMwMDAgbXNl YyAob3JpZ2luYWwgdmFsdWUgd2FzIDMgKiBIeikKLSBkcm9wIHVudXNlZCByZXR1cm4gdmFsdWUg ZnJvbSBtZ2FfZHJpdmVyX2ZlbmNlX3dhaXQoKQoKU2lnbmVkLW9mZi1ieTogU2FtIFJhdm5ib3Jn IDxzYW1AcmF2bmJvcmcub3JnPgpBY2tlZC1ieTogVGhvbWFzIFppbW1lcm1hbm4gPHR6aW1tZXJt YW5uQHN1c2UuZGU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBEYXZp ZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+Ci0tLQogZHJpdmVycy9ncHUvZHJtL21nYS9tZ2Ff ZG1hLmMgICB8IDExICsrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWdhL21nYV9kcnYuaCAg IHwgMTQgKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tZ2EvbWdhX2lycS5jICAgfCAx MCArKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWdhL21nYV9zdGF0ZS5jIHwgIDYgKysrLS0t CiA0IGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZ2EvbWdhX2RtYS5jIGIvZHJpdmVycy9ncHUvZHJt L21nYS9tZ2FfZG1hLmMKaW5kZXggMWZmZGFmZWEyN2U0Li5jNWU3YzIxMDk5OWYgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9tZ2EvbWdhX2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9t Z2EvbWdhX2RtYS5jCkBAIC0zNSw2ICszNSw4IEBACiAgKiBcYXV0aG9yIEdhcmV0aCBIdWdoZXMg PGdhcmV0aEB2YWxpbnV4LmNvbT4KICAqLwogCisjaW5jbHVkZSA8bGludXgvZGVsYXkuaD4KKwog I2luY2x1ZGUgPGRybS9kcm1QLmg+CiAjaW5jbHVkZSA8ZHJtL21nYV9kcm0uaD4KICNpbmNsdWRl ICJtZ2FfZHJ2LmgiCkBAIC02Miw3ICs2NCw3IEBAIGludCBtZ2FfZG9fd2FpdF9mb3JfaWRsZShk cm1fbWdhX3ByaXZhdGVfdCAqZGV2X3ByaXYpCiAJCQlNR0FfV1JJVEU4KE1HQV9DUlRDX0lOREVY LCAwKTsKIAkJCXJldHVybiAwOwogCQl9Ci0JCURSTV9VREVMQVkoMSk7CisJCXVkZWxheSgxKTsK IAl9CiAKICNpZiBNR0FfRE1BX0RFQlVHCkBAIC0xMTQsNyArMTE2LDcgQEAgdm9pZCBtZ2FfZG9f ZG1hX2ZsdXNoKGRybV9tZ2FfcHJpdmF0ZV90ICpkZXZfcHJpdikKIAkJc3RhdHVzID0gTUdBX1JF QUQoTUdBX1NUQVRVUykgJiBNR0FfRU5HSU5FX0lETEVfTUFTSzsKIAkJaWYgKHN0YXR1cyA9PSBN R0FfRU5EUFJETUFTVFMpCiAJCQlicmVhazsKLQkJRFJNX1VERUxBWSgxKTsKKwkJdWRlbGF5KDEp OwogCX0KIAogCWlmIChwcmltYXJ5LT50YWlsID09IHByaW1hcnktPmxhc3RfZmx1c2gpIHsKQEAg LTExMjAsNyArMTEyMiw3IEBAIGludCBtZ2FfZG1hX2J1ZmZlcnMoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqZGF0YSwKIAkgKi8KIAlpZiAoZC0+c2VuZF9jb3VudCAhPSAwKSB7CiAJCURS TV9FUlJPUigiUHJvY2VzcyAlZCB0cnlpbmcgdG8gc2VuZCAlZCBidWZmZXJzIHZpYSBkcm1ETUFc biIsCi0JCQkgIERSTV9DVVJSRU5UUElELCBkLT5zZW5kX2NvdW50KTsKKwkJCSAgdGFza19waWRf bnIoY3VycmVudCksIGQtPnNlbmRfY291bnQpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAg LTExMjgsNyArMTEzMCw4IEBAIGludCBtZ2FfZG1hX2J1ZmZlcnMoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqZGF0YSwKIAkgKi8KIAlpZiAoZC0+cmVxdWVzdF9jb3VudCA8IDAgfHwgZC0+ cmVxdWVzdF9jb3VudCA+IGRtYS0+YnVmX2NvdW50KSB7CiAJCURSTV9FUlJPUigiUHJvY2VzcyAl ZCB0cnlpbmcgdG8gZ2V0ICVkIGJ1ZmZlcnMgKG9mICVkIG1heClcbiIsCi0JCQkgIERSTV9DVVJS RU5UUElELCBkLT5yZXF1ZXN0X2NvdW50LCBkbWEtPmJ1Zl9jb3VudCk7CisJCQkgIHRhc2tfcGlk X25yKGN1cnJlbnQpLCBkLT5yZXF1ZXN0X2NvdW50LAorCQkJICBkbWEtPmJ1Zl9jb3VudCk7CiAJ CXJldHVybiAtRUlOVkFMOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21nYS9t Z2FfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vbWdhL21nYV9kcnYuaAppbmRleCBhNDViYjIyMjc1 YTcuLjE3NjZjMTk1YjM5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21nYS9tZ2FfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL21nYS9tZ2FfZHJ2LmgKQEAgLTE4OCw3ICsxODgsNyBA QCBleHRlcm4gaW50IG1nYV93YXJwX2luaXQoZHJtX21nYV9wcml2YXRlX3QgKmRldl9wcml2KTsK IGV4dGVybiBpbnQgbWdhX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5z aWduZWQgaW50IHBpcGUpOwogZXh0ZXJuIHZvaWQgbWdhX2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKTsKIGV4dGVybiB1MzIgbWdhX2dldF92 YmxhbmtfY291bnRlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSk7 Ci1leHRlcm4gaW50IG1nYV9kcml2ZXJfZmVuY2Vfd2FpdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB1bnNpZ25lZCBpbnQgKnNlcXVlbmNlKTsKK2V4dGVybiB2b2lkIG1nYV9kcml2ZXJfZmVuY2Vf d2FpdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgKnNlcXVlbmNlKTsKIGV4 dGVybiBpbnQgbWdhX2RyaXZlcl92Ymxhbmtfd2FpdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1 bnNpZ25lZCBpbnQgKnNlcXVlbmNlKTsKIGV4dGVybiBpcnFyZXR1cm5fdCBtZ2FfZHJpdmVyX2ly cV9oYW5kbGVyKGludCBpcnEsIHZvaWQgKmFyZyk7CiBleHRlcm4gdm9pZCBtZ2FfZHJpdmVyX2ly cV9wcmVpbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpAQCAtMTk5LDEwICsxOTksMTQg QEAgZXh0ZXJuIGxvbmcgbWdhX2NvbXBhdF9pb2N0bChzdHJ1Y3QgZmlsZSAqZmlscCwgdW5zaWdu ZWQgaW50IGNtZCwKIAogI2RlZmluZSBtZ2FfZmx1c2hfd3JpdGVfY29tYmluZSgpCXdtYigpCiAK LSNkZWZpbmUgTUdBX1JFQUQ4KHJlZykJCURSTV9SRUFEOChkZXZfcHJpdi0+bW1pbywgKHJlZykp Ci0jZGVmaW5lIE1HQV9SRUFEKHJlZykJCURSTV9SRUFEMzIoZGV2X3ByaXYtPm1taW8sIChyZWcp KQotI2RlZmluZSBNR0FfV1JJVEU4KHJlZywgdmFsKQlEUk1fV1JJVEU4KGRldl9wcml2LT5tbWlv LCAocmVnKSwgKHZhbCkpCi0jZGVmaW5lIE1HQV9XUklURShyZWcsIHZhbCkJRFJNX1dSSVRFMzIo ZGV2X3ByaXYtPm1taW8sIChyZWcpLCAodmFsKSkKKyNkZWZpbmUgTUdBX1JFQUQ4KHJlZykgXAor CXJlYWRiKCgodm9pZCBfX2lvbWVtICopZGV2X3ByaXYtPm1taW8tPmhhbmRsZSkgKyAocmVnKSkK KyNkZWZpbmUgTUdBX1JFQUQocmVnKSBcCisJcmVhZGwoKCh2b2lkIF9faW9tZW0gKilkZXZfcHJp di0+bW1pby0+aGFuZGxlKSArIChyZWcpKQorI2RlZmluZSBNR0FfV1JJVEU4KHJlZywgdmFsKSBc CisJd3JpdGViKHZhbCwgKCh2b2lkIF9faW9tZW0gKilkZXZfcHJpdi0+bW1pby0+aGFuZGxlKSAr IChyZWcpKQorI2RlZmluZSBNR0FfV1JJVEUocmVnLCB2YWwpIFwKKwl3cml0ZWwodmFsLCAoKHZv aWQgX19pb21lbSAqKWRldl9wcml2LT5tbWlvLT5oYW5kbGUpICsgKHJlZykpCiAKICNkZWZpbmUg RFdHUkVHMAkJMHgxYzAwCiAjZGVmaW5lIERXR1JFRzBfRU5ECTB4MWRmZgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL21nYS9tZ2FfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWdhL21nYV9p cnEuYwppbmRleCA2OTNiYTcwOGNmZWQuLjE1NDVhMzY5NGI1MyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL21nYS9tZ2FfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21nYS9tZ2FfaXJx LmMKQEAgLTExOCwyMyArMTE4LDIxIEBAIHZvaWQgbWdhX2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQogCS8qIE1HQV9XUklURShNR0FfSUVO LCBNR0FfVkxJTkVJRU4gfCBNR0FfU09GVFJBUEVOKTsgKi8KIH0KIAotaW50IG1nYV9kcml2ZXJf ZmVuY2Vfd2FpdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgKnNlcXVlbmNl KQordm9pZCBtZ2FfZHJpdmVyX2ZlbmNlX3dhaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5z aWduZWQgaW50ICpzZXF1ZW5jZSkKIHsKIAlkcm1fbWdhX3ByaXZhdGVfdCAqZGV2X3ByaXYgPSAo ZHJtX21nYV9wcml2YXRlX3QgKikgZGV2LT5kZXZfcHJpdmF0ZTsKIAl1bnNpZ25lZCBpbnQgY3Vy X2ZlbmNlOwotCWludCByZXQgPSAwOwogCiAJLyogQXNzdW1lIHRoYXQgdGhlIHVzZXIgaGFzIG1p c3NlZCB0aGUgY3VycmVudCBzZXF1ZW5jZSBudW1iZXIKIAkgKiBieSBhYm91dCBhIGRheSByYXRo ZXIgdGhhbiBzaGUgd2FudHMgdG8gd2FpdCBmb3IgeWVhcnMKIAkgKiB1c2luZyBmZW5jZXMuCiAJ ICovCi0JRFJNX1dBSVRfT04ocmV0LCBkZXZfcHJpdi0+ZmVuY2VfcXVldWUsIDMgKiBIWiwKKwl3 YWl0X2V2ZW50X3RpbWVvdXQoZGV2X3ByaXYtPmZlbmNlX3F1ZXVlLAogCQkgICAgKCgoY3VyX2Zl bmNlID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5sYXN0X2ZlbmNlX3JldGlyZWQpKQotCQkgICAg ICAtICpzZXF1ZW5jZSkgPD0gKDEgPDwgMjMpKSk7CisJCSAgICAgIC0gKnNlcXVlbmNlKSA8PSAo MSA8PCAyMykpLAorCQkgICAgbXNlY3NfdG9famlmZmllcygzMDAwKSk7CiAKIAkqc2VxdWVuY2Ug PSBjdXJfZmVuY2U7Ci0KLQlyZXR1cm4gcmV0OwogfQogCiB2b2lkIG1nYV9kcml2ZXJfaXJxX3By ZWluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9tZ2EvbWdhX3N0YXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWdhL21nYV9zdGF0ZS5jCmlu ZGV4IGU1ZjZiNzM1ZjU3NS4uMjk2YTFkYjdlNWVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vbWdhL21nYV9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZ2EvbWdhX3N0YXRlLmMK QEAgLTEwMTYsNyArMTAxNiw3IEBAIGludCBtZ2FfZ2V0cGFyYW0oc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiAJCXJldHVybiAt RUlOVkFMOwogCX0KIAotCURSTV9ERUJVRygicGlkPSVkXG4iLCBEUk1fQ1VSUkVOVFBJRCk7CisJ RFJNX0RFQlVHKCJwaWQ9JWRcbiIsIHRhc2tfcGlkX25yKGN1cnJlbnQpKTsKIAogCXN3aXRjaCAo cGFyYW0tPnBhcmFtKSB7CiAJY2FzZSBNR0FfUEFSQU1fSVJRX05SOgpAQCAtMTA0OCw3ICsxMDQ4 LDcgQEAgc3RhdGljIGludCBtZ2Ffc2V0X2ZlbmNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmkKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0J RFJNX0RFQlVHKCJwaWQ9JWRcbiIsIERSTV9DVVJSRU5UUElEKTsKKwlEUk1fREVCVUcoInBpZD0l ZFxuIiwgdGFza19waWRfbnIoY3VycmVudCkpOwogCiAJLyogSSB3b3VsZCBub3JtYWwgZG8gdGhp cyBhc3NpZ25tZW50IGluIHRoZSBkZWNsYXJhdGlvbiBvZiBmZW5jZSwKIAkgKiBidXQgZGV2X3By aXYgbWF5IGJlIE5VTEwuCkBAIC0xMDc3LDcgKzEwNzcsNyBAQCBmaWxlX3ByaXYpCiAJCXJldHVy biAtRUlOVkFMOwogCX0KIAotCURSTV9ERUJVRygicGlkPSVkXG4iLCBEUk1fQ1VSUkVOVFBJRCk7 CisJRFJNX0RFQlVHKCJwaWQ9JWRcbiIsIHRhc2tfcGlkX25yKGN1cnJlbnQpKTsKIAogCW1nYV9k cml2ZXJfZmVuY2Vfd2FpdChkZXYsIGZlbmNlKTsKIAlyZXR1cm4gMDsKLS0gCjIuMjAuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs