From: Daniel Vetter Subject: [PATCH 4/4] drm: Simplify GETRESOURCES ioctl Date: Sat, 10 Dec 2016 22:52:55 +0100 Message-ID: <20161210215255.7765-4-daniel.vetter@ffwll.ch> References: <20161210215255.7765-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CB336E179 for ; Sat, 10 Dec 2016 21:52:54 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m203so3107371wma.3 for ; Sat, 10 Dec 2016 13:52:54 -0800 (PST) In-Reply-To: <20161210215255.7765-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org TG9vcGluZyB0d2ljZSB3aGVuIHdlIGNhbiBkbyBpdCBvbmNlIGlzIHNpbGx5LiBBbHNvIHVzZSBh IGNvbnNpc3RlbnQKc3R5bGUuIE5vdGUgdGhhdCB0aGVyZSdzIGEgZ29vZCByYWNlIHdpdGggdGhl IGNvbm5lY3RvciBsaXN0IHdhbGtpbmcsCnNpbmNlIHRoYXQgaXMgbm8gbG9uZ2VyIHByb3RlY3Rl ZCBieSBtb2RlX2NvbmZpZy5tdXRleC4gQnV0IHRoYXQncyBmb3IKYSBsYXRlciBwYXRjaCB0byBm aXguCgp2MjogQWN0dWFsbHkgdHJ5IHRvIG5vdCBibG93IHVwLCBzb21laG93IEkgbG9zdCB0aGUg aHVuayB0aGF0IGNoZWNrcwp3ZSBkb24ndCBjb3B5IHRvbyBtdWNoLiBOb3RpY2VkIGJ5IENocmlz LgoKdjM6Ci0gc3F1YXNoIGFsbCBkcm1fbW9kZV9nZXRyZXNvdXJjZXMgY2xlYW51cHMgaW50byBv bmUKLSB1c2UgY29uc2lzdGVudCBzdHlsZSBmb3Igd2Fsa2luZyBvYmplY3RzIChDaHJpcykKCkNj OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2RybV9tb2RlX2NvbmZpZy5jIHwgMTE5ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNzIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jIGIvZHJp dmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCmluZGV4IDI3MzVhNTg0N2ZmYS4uNTRlMzcx ZGFjNjk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCkBAIC04NCwxNyArODQsMTEgQEAg aW50IGRybV9tb2RlX2dldHJlc291cmNlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCQkJICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX21v ZGVfY2FyZF9yZXMgKmNhcmRfcmVzID0gZGF0YTsKLQlzdHJ1Y3QgbGlzdF9oZWFkICpsaDsKIAlz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29k ZXI7Ci0JaW50IHJldCA9IDA7Ci0JaW50IGNvbm5lY3Rvcl9jb3VudCA9IDA7Ci0JaW50IGNydGNf Y291bnQgPSAwOwotCWludCBmYl9jb3VudCA9IDA7Ci0JaW50IGVuY29kZXJfY291bnQgPSAwOwot CWludCBjb3BpZWQgPSAwOworCWludCBjb3VudCwgcmV0ID0gMDsKIAl1aW50MzJfdCBfX3VzZXIg KmZiX2lkOwogCXVpbnQzMl90IF9fdXNlciAqY3J0Y19pZDsKIAl1aW50MzJfdCBfX3VzZXIgKmNv bm5lY3Rvcl9pZDsKQEAgLTEwNSw4OSArOTksNzAgQEAgaW50IGRybV9tb2RlX2dldHJlc291cmNl cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCiAKIAltdXRleF9sb2NrKCZm aWxlX3ByaXYtPmZic19sb2NrKTsKLQkvKgotCSAqIEZvciB0aGUgbm9uLWNvbnRyb2wgbm9kZXMg d2UgbmVlZCB0byBsaW1pdCB0aGUgbGlzdCBvZiByZXNvdXJjZXMKLQkgKiBieSBJRHMgaW4gdGhl IGdyb3VwIGxpc3QgZm9yIHRoaXMgbm9kZQotCSAqLwotCWxpc3RfZm9yX2VhY2gobGgsICZmaWxl X3ByaXYtPmZicykKLQkJZmJfY291bnQrKzsKLQotCS8qIGhhbmRsZSB0aGlzIGluIDQgcGFydHMg Ki8KLQkvKiBGQnMgKi8KLQlpZiAoY2FyZF9yZXMtPmNvdW50X2ZicyA+PSBmYl9jb3VudCkgewot CQljb3BpZWQgPSAwOwotCQlmYl9pZCA9ICh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9u ZyljYXJkX3Jlcy0+ZmJfaWRfcHRyOwotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGZiLCAmZmlsZV9w cml2LT5mYnMsIGZpbHBfaGVhZCkgewotCQkJaWYgKHB1dF91c2VyKGZiLT5iYXNlLmlkLCBmYl9p ZCArIGNvcGllZCkpIHsKLQkJCQltdXRleF91bmxvY2soJmZpbGVfcHJpdi0+ZmJzX2xvY2spOwot CQkJCXJldHVybiAtRUZBVUxUOwotCQkJfQotCQkJY29waWVkKys7CisJY291bnQgPSAwOworCWZi X2lkID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKWNhcmRfcmVzLT5mYl9pZF9w dHI7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShmYiwgJmZpbGVfcHJpdi0+ZmJzLCBmaWxwX2hlYWQp IHsKKwkJY291bnQrKzsKKwkJaWYgKGNvdW50ID4gY2FyZF9yZXMtPmNvdW50X2ZicykKKwkJCWNv bnRpbnVlOworCisJCWlmIChwdXRfdXNlcihmYi0+YmFzZS5pZCwgZmJfaWQgKyBjb3VudCkpIHsK KwkJCW11dGV4X3VubG9jaygmZmlsZV9wcml2LT5mYnNfbG9jayk7CisJCQlyZXR1cm4gLUVGQVVM VDsKIAkJfQogCX0KLQljYXJkX3Jlcy0+Y291bnRfZmJzID0gZmJfY291bnQ7CisJY2FyZF9yZXMt PmNvdW50X2ZicyA9IGNvdW50OwogCW11dGV4X3VubG9jaygmZmlsZV9wcml2LT5mYnNfbG9jayk7 CiAKIAkvKiBtb2RlX2NvbmZpZy5tdXRleCBwcm90ZWN0cyB0aGUgY29ubmVjdG9yIGxpc3QgYWdh aW5zdCBlLmcuIERQIE1TVAogCSAqIGNvbm5lY3RvciBob3QtYWRkaW5nLiBDUlRDL1BsYW5lIGxp c3RzIGFyZSBpbnZhcmlhbnQuICovCiAJbXV0ZXhfbG9jaygmZGV2LT5tb2RlX2NvbmZpZy5tdXRl eCk7Ci0JZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KQotCQljcnRjX2NvdW50Kys7Ci0KLQlk cm1fZm9yX2VhY2hfY29ubmVjdG9yKGNvbm5lY3RvciwgZGV2KQotCQljb25uZWN0b3JfY291bnQr KzsKLQotCWRybV9mb3JfZWFjaF9lbmNvZGVyKGVuY29kZXIsIGRldikKLQkJZW5jb2Rlcl9jb3Vu dCsrOwotCiAJY2FyZF9yZXMtPm1heF9oZWlnaHQgPSBkZXYtPm1vZGVfY29uZmlnLm1heF9oZWln aHQ7CiAJY2FyZF9yZXMtPm1pbl9oZWlnaHQgPSBkZXYtPm1vZGVfY29uZmlnLm1pbl9oZWlnaHQ7 CiAJY2FyZF9yZXMtPm1heF93aWR0aCA9IGRldi0+bW9kZV9jb25maWcubWF4X3dpZHRoOwogCWNh cmRfcmVzLT5taW5fd2lkdGggPSBkZXYtPm1vZGVfY29uZmlnLm1pbl93aWR0aDsKIAotCS8qIENS VENzICovCi0JaWYgKGNhcmRfcmVzLT5jb3VudF9jcnRjcyA+PSBjcnRjX2NvdW50KSB7Ci0JCWNv cGllZCA9IDA7Ci0JCWNydGNfaWQgPSAodWludDMyX3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcp Y2FyZF9yZXMtPmNydGNfaWRfcHRyOwotCQlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBkZXYpIHsK LQkJCWlmIChwdXRfdXNlcihjcnRjLT5iYXNlLmlkLCBjcnRjX2lkICsgY29waWVkKSkgewotCQkJ CXJldCA9IC1FRkFVTFQ7Ci0JCQkJZ290byBvdXQ7Ci0JCQl9Ci0JCQljb3BpZWQrKzsKKwljb3Vu dCA9IDA7CisJY3J0Y19pZCA9ICh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9uZyljYXJk X3Jlcy0+Y3J0Y19pZF9wdHI7CisJZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KSB7CisJCWNv dW50Kys7CisJCWlmIChjb3VudCA+IGNhcmRfcmVzLT5jb3VudF9jcnRjcykKKwkJCWNvbnRpbnVl OworCisJCWlmIChwdXRfdXNlcihjcnRjLT5iYXNlLmlkLCBjcnRjX2lkICsgY291bnQpKSB7CisJ CQlyZXQgPSAtRUZBVUxUOworCQkJZ290byBvdXQ7CiAJCX0KIAl9Ci0JY2FyZF9yZXMtPmNvdW50 X2NydGNzID0gY3J0Y19jb3VudDsKLQotCS8qIEVuY29kZXJzICovCi0JaWYgKGNhcmRfcmVzLT5j b3VudF9lbmNvZGVycyA+PSBlbmNvZGVyX2NvdW50KSB7Ci0JCWNvcGllZCA9IDA7Ci0JCWVuY29k ZXJfaWQgPSAodWludDMyX3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpY2FyZF9yZXMtPmVuY29k ZXJfaWRfcHRyOwotCQlkcm1fZm9yX2VhY2hfZW5jb2RlcihlbmNvZGVyLCBkZXYpIHsKLQkJCWlm IChwdXRfdXNlcihlbmNvZGVyLT5iYXNlLmlkLCBlbmNvZGVyX2lkICsKLQkJCQkgICAgIGNvcGll ZCkpIHsKLQkJCQlyZXQgPSAtRUZBVUxUOwotCQkJCWdvdG8gb3V0OwotCQkJfQotCQkJY29waWVk Kys7CisJY2FyZF9yZXMtPmNvdW50X2NydGNzID0gY291bnQ7CisKKwljb3VudCA9IDA7CisJZW5j b2Rlcl9pZCA9ICh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9uZyljYXJkX3Jlcy0+ZW5j b2Rlcl9pZF9wdHI7CisJZHJtX2Zvcl9lYWNoX2VuY29kZXIoZW5jb2RlciwgZGV2KSB7CisJCWNv dW50Kys7CisJCWlmIChjb3VudCA+IGNhcmRfcmVzLT5jb3VudF9lbmNvZGVycykKKwkJCWNvbnRp bnVlOworCisJCWlmIChwdXRfdXNlcihlbmNvZGVyLT5iYXNlLmlkLCBlbmNvZGVyX2lkICsgY291 bnQpKSB7CisJCQlyZXQgPSAtRUZBVUxUOworCQkJZ290byBvdXQ7CiAJCX0KIAl9Ci0JY2FyZF9y ZXMtPmNvdW50X2VuY29kZXJzID0gZW5jb2Rlcl9jb3VudDsKLQotCS8qIENvbm5lY3RvcnMgKi8K LQlpZiAoY2FyZF9yZXMtPmNvdW50X2Nvbm5lY3RvcnMgPj0gY29ubmVjdG9yX2NvdW50KSB7Ci0J CWNvcGllZCA9IDA7Ci0JCWNvbm5lY3Rvcl9pZCA9ICh1aW50MzJfdCBfX3VzZXIgKikodW5zaWdu ZWQgbG9uZyljYXJkX3Jlcy0+Y29ubmVjdG9yX2lkX3B0cjsKLQkJZHJtX2Zvcl9lYWNoX2Nvbm5l Y3Rvcihjb25uZWN0b3IsIGRldikgewotCQkJaWYgKHB1dF91c2VyKGNvbm5lY3Rvci0+YmFzZS5p ZCwKLQkJCQkgICAgIGNvbm5lY3Rvcl9pZCArIGNvcGllZCkpIHsKLQkJCQlyZXQgPSAtRUZBVUxU OwotCQkJCWdvdG8gb3V0OwotCQkJfQotCQkJY29waWVkKys7CisJY2FyZF9yZXMtPmNvdW50X2Vu Y29kZXJzID0gY291bnQ7CisKKwljb3VudCA9IDA7CisJY29ubmVjdG9yX2lkID0gKHVpbnQzMl90 IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKWNhcmRfcmVzLT5jb25uZWN0b3JfaWRfcHRyOworCWRy bV9mb3JfZWFjaF9jb25uZWN0b3IoY29ubmVjdG9yLCBkZXYpIHsKKwkJY291bnQrKzsKKwkJaWYg KGNvdW50ID49IGNhcmRfcmVzLT5jb3VudF9jb25uZWN0b3JzKQorCQkJY29udGludWU7CisKKwkJ aWYgKHB1dF91c2VyKGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yX2lkICsgY291bnQpKSB7 CisJCQlyZXQgPSAtRUZBVUxUOworCQkJZ290byBvdXQ7CiAJCX0KIAl9Ci0JY2FyZF9yZXMtPmNv dW50X2Nvbm5lY3RvcnMgPSBjb25uZWN0b3JfY291bnQ7CisJY2FyZF9yZXMtPmNvdW50X2Nvbm5l Y3RvcnMgPSBjb3VudDsKIAogb3V0OgogCW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5t dXRleCk7Ci0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=