From: Jani Nikula Subject: [PATCH] drm/i915/dsm: remove unnecessary dsm priv structure Date: Thu, 14 Jun 2018 13:47:09 +0300 Message-ID: <20180614104709.2808-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C61E46E220 for ; Thu, 14 Jun 2018 10:47:22 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org UGFzcyBhIGxvY2FsIGFjcGlfaGFuZGxlIGFyb3VuZCBpbnN0ZWFkIG9mIGhhdmluZyBhIHN0YXRp YyBkc20gcHJpdgpzdHJ1Y3R1cmUuIElmIHdlIG5lZWQgaXQgbGF0ZXIsIHdlIGNhbiBhbHdheXMg bW92ZSBpdCB0byBkZXZfcHJpdiwgYW5kCnRoZSBjaGFuZ2UgYXQgaGFuZCB3aWxsIG1ha2UgdGhh dCBlYXNpZXIgYXMgd2VsbC4KCkNhcmUgaXMgdGFrZW4gdG8gcHJlc2VydmUgb2xkIGJlaGF2aW91 ciwgcGFydGljdWxhcmx5IHVzaW5nIHRoZSBsYXN0Cm5vbi1OVUxMIGFjcGkgaGFuZGxlLCB3aGV0 aGVyIGl0IG1ha2VzIHNlbnNlIG9yIG5vdC4KClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxq YW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYWNw aS5jIHwgMjcgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEg aW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYWNwaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYWNwaS5j CmluZGV4IGQxYWJmNGJiN2M4MS4uNmJhNDc4ZTU3YjliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hY3BpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YWNwaS5jCkBAIC0xMiwxMCArMTIsNiBAQAogI2RlZmluZSBJTlRFTF9EU01fUkVWSVNJT05fSUQg MSAvKiBGb3IgQ2FscGVsbGEgYW55d2F5Li4uICovCiAjZGVmaW5lIElOVEVMX0RTTV9GTl9QTEFU Rk9STV9NVVhfSU5GTyAxIC8qIE5vIGFyZ3MgKi8KIAotc3RhdGljIHN0cnVjdCBpbnRlbF9kc21f cHJpdiB7Ci0JYWNwaV9oYW5kbGUgZGhhbmRsZTsKLX0gaW50ZWxfZHNtX3ByaXY7Ci0KIHN0YXRp YyBjb25zdCBndWlkX3QgaW50ZWxfZHNtX2d1aWQgPQogCUdVSURfSU5JVCgweDdlZDg3M2QzLCAw eGMyZDAsIDB4NGU0ZiwKIAkJICAweGE4LCAweDU0LCAweDBmLCAweDEzLCAweDE3LCAweGIwLCAw eDFjLCAweDJjKTsKQEAgLTcyLDEyICs2OCwxMiBAQCBzdGF0aWMgY2hhciAqaW50ZWxfZHNtX211 eF90eXBlKHU4IHR5cGUpCiAJfQogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9kc21fcGxhdGZvcm1f bXV4X2luZm8odm9pZCkKK3N0YXRpYyB2b2lkIGludGVsX2RzbV9wbGF0Zm9ybV9tdXhfaW5mbyhh Y3BpX2hhbmRsZSBkaGFuZGxlKQogewogCWludCBpOwogCXVuaW9uIGFjcGlfb2JqZWN0ICpwa2cs ICpjb25uZWN0b3JfY291bnQ7CiAKLQlwa2cgPSBhY3BpX2V2YWx1YXRlX2RzbV90eXBlZChpbnRl bF9kc21fcHJpdi5kaGFuZGxlLCAmaW50ZWxfZHNtX2d1aWQsCisJcGtnID0gYWNwaV9ldmFsdWF0 ZV9kc21fdHlwZWQoZGhhbmRsZSwgJmludGVsX2RzbV9ndWlkLAogCQkJSU5URUxfRFNNX1JFVklT SU9OX0lELCBJTlRFTF9EU01fRk5fUExBVEZPUk1fTVVYX0lORk8sCiAJCQlOVUxMLCBBQ1BJX1RZ UEVfUEFDS0FHRSk7CiAJaWYgKCFwa2cpIHsKQEAgLTEwNyw0MSArMTAzLDQwIEBAIHN0YXRpYyB2 b2lkIGludGVsX2RzbV9wbGF0Zm9ybV9tdXhfaW5mbyh2b2lkKQogCUFDUElfRlJFRShwa2cpOwog fQogCi1zdGF0aWMgYm9vbCBpbnRlbF9kc21fcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpwZGV2 KQorc3RhdGljIGFjcGlfaGFuZGxlIGludGVsX2RzbV9wY2lfcHJvYmUoc3RydWN0IHBjaV9kZXYg KnBkZXYpCiB7CiAJYWNwaV9oYW5kbGUgZGhhbmRsZTsKIAogCWRoYW5kbGUgPSBBQ1BJX0hBTkRM RSgmcGRldi0+ZGV2KTsKIAlpZiAoIWRoYW5kbGUpCi0JCXJldHVybiBmYWxzZTsKKwkJcmV0dXJu IE5VTEw7CiAKIAlpZiAoIWFjcGlfY2hlY2tfZHNtKGRoYW5kbGUsICZpbnRlbF9kc21fZ3VpZCwg SU5URUxfRFNNX1JFVklTSU9OX0lELAogCQkJICAgIDEgPDwgSU5URUxfRFNNX0ZOX1BMQVRGT1JN X01VWF9JTkZPKSkgewogCQlEUk1fREVCVUdfS01TKCJubyBfRFNNIG1ldGhvZCBmb3IgaW50ZWwg ZGV2aWNlXG4iKTsKLQkJcmV0dXJuIGZhbHNlOworCQlyZXR1cm4gTlVMTDsKIAl9CiAKLQlpbnRl bF9kc21fcHJpdi5kaGFuZGxlID0gZGhhbmRsZTsKLQlpbnRlbF9kc21fcGxhdGZvcm1fbXV4X2lu Zm8oKTsKKwlpbnRlbF9kc21fcGxhdGZvcm1fbXV4X2luZm8oZGhhbmRsZSk7CiAKLQlyZXR1cm4g dHJ1ZTsKKwlyZXR1cm4gZGhhbmRsZTsKIH0KIAogc3RhdGljIGJvb2wgaW50ZWxfZHNtX2RldGVj dCh2b2lkKQogeworCWFjcGlfaGFuZGxlIGRoYW5kbGUgPSBOVUxMOwogCWNoYXIgYWNwaV9tZXRo b2RfbmFtZVsyNTVdID0geyAwIH07CiAJc3RydWN0IGFjcGlfYnVmZmVyIGJ1ZmZlciA9IHtzaXpl b2YoYWNwaV9tZXRob2RfbmFtZSksIGFjcGlfbWV0aG9kX25hbWV9OwogCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gTlVMTDsKLQlib29sIGhhc19kc20gPSBmYWxzZTsKIAlpbnQgdmdhX2NvdW50ID0g MDsKIAogCXdoaWxlICgocGRldiA9IHBjaV9nZXRfY2xhc3MoUENJX0NMQVNTX0RJU1BMQVlfVkdB IDw8IDgsIHBkZXYpKSAhPSBOVUxMKSB7CiAJCXZnYV9jb3VudCsrOwotCQloYXNfZHNtIHw9IGlu dGVsX2RzbV9wY2lfcHJvYmUocGRldik7CisJCWRoYW5kbGUgPSBpbnRlbF9kc21fcGNpX3Byb2Jl KHBkZXYpID86IGRoYW5kbGU7CiAJfQogCi0JaWYgKHZnYV9jb3VudCA9PSAyICYmIGhhc19kc20p IHsKLQkJYWNwaV9nZXRfbmFtZShpbnRlbF9kc21fcHJpdi5kaGFuZGxlLCBBQ1BJX0ZVTExfUEFU SE5BTUUsICZidWZmZXIpOworCWlmICh2Z2FfY291bnQgPT0gMiAmJiBkaGFuZGxlKSB7CisJCWFj cGlfZ2V0X25hbWUoZGhhbmRsZSwgQUNQSV9GVUxMX1BBVEhOQU1FLCAmYnVmZmVyKTsKIAkJRFJN X0RFQlVHX0RSSVZFUigidmdhX3N3aXRjaGVyb286IGRldGVjdGVkIERTTSBzd2l0Y2hpbmcgbWV0 aG9kICVzIGhhbmRsZVxuIiwKIAkJCQkgYWNwaV9tZXRob2RfbmFtZSk7CiAJCXJldHVybiB0cnVl OwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK