From: Keith Packard Subject: [PATCH 2/3] drm: Reorganize drm_pending_event to support future event types [v2] Date: Thu, 12 Oct 2017 17:50:15 -0700 Message-ID: <20171013005016.3715-3-keithp@keithp.com> References: <20171013005016.3715-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A5336E9D4 for ; Fri, 13 Oct 2017 00:50:23 +0000 (UTC) In-Reply-To: <20171013005016.3715-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, Dave Airlie , Daniel Vetter Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org UGxhY2UgZHJtX2V2ZW50X3ZibGFuayBpbiBhIG5ldyB1bmlvbiB0aGF0IGluY2x1ZGVzIHRoYXQg YW5kIGEgYmFyZQpkcm1fZXZlbnQgc3RydWN0dXJlLiBUaGlzIHdpbGwgYWxsb3cgbmV3IG1lbWJl cnMgb2YgdGhhdCB1bmlvbiB0byBiZQphZGRlZCBpbiB0aGUgZnV0dXJlIHdpdGhvdXQgY2hhbmdp bmcgY29kZSByZWxhdGVkIHRvIHRoZSBleGlzdGluZyB2YmwKZXZlbnQgdHlwZS4KCkFzc2lnbm1l bnRzIHRvIHRoZSBjcnRjX2lkIGZpZWxkIGFyZSBub3cgZG9uZSB3aGVuIHRoZSBldmVudCBpcwph bGxvY2F0ZWQsIHJhdGhlciB0aGFuIHdoZW4gZGVsaWV2ZXJlZC4gVGhpcyB3YXksIGRlbGl2ZXJ5 IGRvZXNuJ3QKbmVlZCB0byBoYXZlIHRoZSBjcnRjIElEIGF2YWlsYWJsZS4KCnYyOgogKiBSZW1v dmUgJ2RldicgYXJndW1lbnQgZnJvbSBjcmVhdGVfdmJsYW5rX2V2ZW50CgoJSXQgd2Fzbid0IGJl aW5nIHVzZWQgYW55d2F5cywgYW5kIGlmIHdlIG5lZWQgaXQgaW4gdGhlIGZ1dHVyZSwKCXdlIGNh biBhbHdheXMgZ2V0IGl0IGZyb20gY3J0Yy0+ZGV2LgoKICogQ2hlY2sgZm9yIE1PREVTRVRUSU5H IGJlZm9yZSBsb29raW5nIGZvciBjcnRjIGluIHF1ZXVlX3ZibGFua19ldmVudAoKCVVNUyBkcml2 ZXJzIHdpbGwgb29wcyBpZiB3ZSB0cnkgdG8gZ2V0IGEgY3J0Yywgc28gbWFrZSBzdXJlCgl3ZSdy ZSBtb2Rlc2V0dGluZyBiZWZvcmUgd2UgdHJ5IHRvIGZpbmQgYSBjcnRjX2lkIHRvIGZpbGwgaW50 bwoJdGhlIGV2ZW50LgoKU2lnbmVkLW9mZi1ieTogS2VpdGggUGFja2FyZCA8a2VpdGhwQGtlaXRo cC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyAgICAgICAgIHwgIDcgKysr LS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgICAgICAgICAgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2RybV92YmxhbmsuYyAgICAgICAgIHwgNDEgKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zY3JuLmMgfCAg NCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMgfCAgNCArKy0tCiBp bmNsdWRlL2RybS9kcm1fdmJsYW5rLmggICAgICAgICAgICAgfCAgOCArKysrKystCiA2IGZpbGVz IGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Yy5jCmluZGV4IDI2ODk2OWZlY2VlNy4uMWUyMDIxYmVkMjY1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMK QEAgLTE4MTUsNyArMTgxNSw3IEBAIGludCBkcm1fYXRvbWljX2RlYnVnZnNfaW5pdChzdHJ1Y3Qg ZHJtX21pbm9yICptaW5vcikKICAqLwogCiBzdGF0aWMgc3RydWN0IGRybV9wZW5kaW5nX3ZibGFu a19ldmVudCAqY3JlYXRlX3ZibGFua19ldmVudCgKLQkJc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dWludDY0X3QgdXNlcl9kYXRhKQorCQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHVpbnQ2NF90IHVz ZXJfZGF0YSkKIHsKIAlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplID0gTlVMTDsK IApAQCAtMTgyNSw3ICsxODI1LDggQEAgc3RhdGljIHN0cnVjdCBkcm1fcGVuZGluZ192Ymxhbmtf ZXZlbnQgKmNyZWF0ZV92YmxhbmtfZXZlbnQoCiAKIAllLT5ldmVudC5iYXNlLnR5cGUgPSBEUk1f RVZFTlRfRkxJUF9DT01QTEVURTsKIAllLT5ldmVudC5iYXNlLmxlbmd0aCA9IHNpemVvZihlLT5l dmVudCk7Ci0JZS0+ZXZlbnQudXNlcl9kYXRhID0gdXNlcl9kYXRhOworCWUtPmV2ZW50LnZibC5j cnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKKwllLT5ldmVudC52YmwudXNlcl9kYXRhID0gdXNlcl9k YXRhOwogCiAJcmV0dXJuIGU7CiB9CkBAIC0yMDc5LDcgKzIwODAsNyBAQCBzdGF0aWMgaW50IHBy ZXBhcmVfY3J0Y19zaWduYWxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKGFyZy0+ ZmxhZ3MgJiBEUk1fTU9ERV9QQUdFX0ZMSVBfRVZFTlQgfHwgZmVuY2VfcHRyKSB7CiAJCQlzdHJ1 Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplOwogCi0JCQllID0gY3JlYXRlX3ZibGFua19l dmVudChkZXYsIGFyZy0+dXNlcl9kYXRhKTsKKwkJCWUgPSBjcmVhdGVfdmJsYW5rX2V2ZW50KGNy dGMsIGFyZy0+dXNlcl9kYXRhKTsKIAkJCWlmICghZSkKIAkJCQlyZXR1cm4gLUVOT01FTTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJt L2RybV9wbGFuZS5jCmluZGV4IDZhZjAyYzdiNWRhMy4uNTc0ZmQxNDc1MjE0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9w bGFuZS5jCkBAIC0xMDM5LDcgKzEwMzksNyBAQCBpbnQgZHJtX21vZGVfcGFnZV9mbGlwX2lvY3Rs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCX0KIAkJZS0+ZXZlbnQuYmFzZS50eXBlID0gRFJN X0VWRU5UX0ZMSVBfQ09NUExFVEU7CiAJCWUtPmV2ZW50LmJhc2UubGVuZ3RoID0gc2l6ZW9mKGUt PmV2ZW50KTsKLQkJZS0+ZXZlbnQudXNlcl9kYXRhID0gcGFnZV9mbGlwLT51c2VyX2RhdGE7CisJ CWUtPmV2ZW50LnZibC51c2VyX2RhdGEgPSBwYWdlX2ZsaXAtPnVzZXJfZGF0YTsKIAkJcmV0ID0g ZHJtX2V2ZW50X3Jlc2VydmVfaW5pdChkZXYsIGZpbGVfcHJpdiwgJmUtPmJhc2UsICZlLT5ldmVu dC5iYXNlKTsKIAkJaWYgKHJldCkgewogCQkJa2ZyZWUoZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX3ZibGFuay5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV92YmxhbmsuYwppbmRl eCA0NzQ2MDU4OWQ0Y2QuLmQyNTA2MDZjYzc3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2RybV92YmxhbmsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jCkBAIC04MDQs MjAgKzgwNCwyMyBAQCBzdGF0aWMgdm9pZCBzZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplLAogCQl1NjQg c2VxLCBrdGltZV90IG5vdykKIHsKLQlzdHJ1Y3QgdGltZXNwZWM2NCB0diA9IGt0aW1lX3RvX3Rp bWVzcGVjNjQobm93KTsKLQotCWUtPmV2ZW50LnNlcXVlbmNlID0gc2VxOwotCS8qCi0JICogZS0+ ZXZlbnQgaXMgYSB1c2VyIHNwYWNlIHN0cnVjdHVyZSwgd2l0aCBoYXJkY29kZWQgdW5zaWduZWQK LQkgKiAzMi1iaXQgc2Vjb25kcy9taWNyb3NlY29uZHMuIFRoaXMgaXMgc2FmZSBhcyB3ZSBhbHdh eXMgdXNlCi0JICogbW9ub3RvbmljIHRpbWVzdGFtcHMgc2luY2UgbGludXgtNC4xNQotCSAqLwot CWUtPmV2ZW50LnR2X3NlYyA9IHR2LnR2X3NlYzsKLQllLT5ldmVudC50dl91c2VjID0gdHYudHZf bnNlYyAvIDEwMDA7Ci0KLQl0cmFjZV9kcm1fdmJsYW5rX2V2ZW50X2RlbGl2ZXJlZChlLT5iYXNl LmZpbGVfcHJpdiwgZS0+cGlwZSwKLQkJCQkJIGUtPmV2ZW50LnNlcXVlbmNlKTsKKwlzdHJ1Y3Qg dGltZXNwZWM2NCB0djsKIAorCXN3aXRjaCAoZS0+ZXZlbnQuYmFzZS50eXBlKSB7CisJY2FzZSBE Uk1fRVZFTlRfVkJMQU5LOgorCWNhc2UgRFJNX0VWRU5UX0ZMSVBfQ09NUExFVEU6CisJCXR2ID0g a3RpbWVfdG9fdGltZXNwZWM2NChub3cpOworCQllLT5ldmVudC52Ymwuc2VxdWVuY2UgPSBzZXE7 CisJCS8qCisJCSAqIGUtPmV2ZW50IGlzIGEgdXNlciBzcGFjZSBzdHJ1Y3R1cmUsIHdpdGggaGFy ZGNvZGVkIHVuc2lnbmVkCisJCSAqIDMyLWJpdCBzZWNvbmRzL21pY3Jvc2Vjb25kcy4gVGhpcyBp cyBzYWZlIGFzIHdlIGFsd2F5cyB1c2UKKwkJICogbW9ub3RvbmljIHRpbWVzdGFtcHMgc2luY2Ug bGludXgtNC4xNQorCQkgKi8KKwkJZS0+ZXZlbnQudmJsLnR2X3NlYyA9IHR2LnR2X3NlYzsKKwkJ ZS0+ZXZlbnQudmJsLnR2X3VzZWMgPSB0di50dl9uc2VjIC8gMTAwMDsKKwkJYnJlYWs7CisJfQor CXRyYWNlX2RybV92YmxhbmtfZXZlbnRfZGVsaXZlcmVkKGUtPmJhc2UuZmlsZV9wcml2LCBlLT5w aXBlLCBzZXEpOwogCWRybV9zZW5kX2V2ZW50X2xvY2tlZChkZXYsICZlLT5iYXNlKTsKIH0KIApA QCAtODY5LDcgKzg3Miw2IEBAIHZvaWQgZHJtX2NydGNfYXJtX3ZibGFua19ldmVudChzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAKIAllLT5waXBlID0gcGlwZTsKIAllLT5zZXF1ZW5jZSA9IGRybV92 YmxhbmtfY291bnQoZGV2LCBwaXBlKTsKLQllLT5ldmVudC5jcnRjX2lkID0gY3J0Yy0+YmFzZS5p ZDsKIAlsaXN0X2FkZF90YWlsKCZlLT5iYXNlLmxpbmssICZkZXYtPnZibGFua19ldmVudF9saXN0 KTsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2NydGNfYXJtX3ZibGFua19ldmVudCk7CkBAIC05MDEs NyArOTAzLDYgQEAgdm9pZCBkcm1fY3J0Y19zZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAJCW5vdyA9IGt0aW1lX2dldCgpOwogCX0KIAllLT5waXBlID0gcGlwZTsKLQll LT5ldmVudC5jcnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKIAlzZW5kX3ZibGFua19ldmVudChkZXYs IGUsIHNlcSwgbm93KTsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2NydGNfc2VuZF92YmxhbmtfZXZl bnQpOwpAQCAtMTMzNiw4ICsxMzM3LDE0IEBAIHN0YXRpYyBpbnQgZHJtX3F1ZXVlX3ZibGFua19l dmVudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKIAogCWUtPnBp cGUgPSBwaXBlOwogCWUtPmV2ZW50LmJhc2UudHlwZSA9IERSTV9FVkVOVF9WQkxBTks7Ci0JZS0+ ZXZlbnQuYmFzZS5sZW5ndGggPSBzaXplb2YoZS0+ZXZlbnQpOwotCWUtPmV2ZW50LnVzZXJfZGF0 YSA9IHZibHdhaXQtPnJlcXVlc3Quc2lnbmFsOworCWUtPmV2ZW50LmJhc2UubGVuZ3RoID0gc2l6 ZW9mKGUtPmV2ZW50LnZibCk7CisJZS0+ZXZlbnQudmJsLnVzZXJfZGF0YSA9IHZibHdhaXQtPnJl cXVlc3Quc2lnbmFsOworCWUtPmV2ZW50LnZibC5jcnRjX2lkID0gMDsKKwlpZiAoZHJtX2NvcmVf Y2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9NT0RFU0VUKSkgeworCQlzdHJ1Y3QgZHJtX2NydGMg KmNydGMgPSBkcm1fY3J0Y19mcm9tX2luZGV4KGRldiwgcGlwZSk7CisJCWlmIChjcnRjKQorCQkJ ZS0+ZXZlbnQudmJsLmNydGNfaWQgPSBjcnRjLT5iYXNlLmlkOworCX0KIAogCXNwaW5fbG9ja19p cnFzYXZlKCZkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn Znhfc2Nybi5jCmluZGV4IGQxNTUyZDNlMDY1Mi4uYmM1ZjYwMjY1NzNkIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zY3JuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L3Ztd2dmeC92bXdnZnhfc2Nybi5jCkBAIC0zNjAsOCArMzYwLDggQEAgc3RhdGljIGludCB2bXdf c291X2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCQlyZXQgPSB2bXdf ZXZlbnRfZmVuY2VfYWN0aW9uX3F1ZXVlKGZpbGVfcHJpdiwgZmVuY2UsCiAJCQkJCQkgICAmZXZl bnQtPmJhc2UsCi0JCQkJCQkgICAmZXZlbnQtPmV2ZW50LnR2X3NlYywKLQkJCQkJCSAgICZldmVu dC0+ZXZlbnQudHZfdXNlYywKKwkJCQkJCSAgICZldmVudC0+ZXZlbnQudmJsLnR2X3NlYywKKwkJ CQkJCSAgICZldmVudC0+ZXZlbnQudmJsLnR2X3VzZWMsCiAJCQkJCQkgICB0cnVlKTsKIAl9CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3N0ZHUuYyBiL2RyaXZl cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3N0ZHUuYwppbmRleCBjYTNhZmFlMmRiMWYuLjkwYjU0 MzdmZDc4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc3RkdS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3N0ZHUuYwpAQCAtNTQ5LDggKzU0 OSw4IEBAIHN0YXRpYyBpbnQgdm13X3N0ZHVfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCiAJCXJldCA9IHZtd19ldmVudF9mZW5jZV9hY3Rpb25fcXVldWUoZmlsZV9wcml2 LCBmZW5jZSwKIAkJCQkJCSAgICZldmVudC0+YmFzZSwKLQkJCQkJCSAgICZldmVudC0+ZXZlbnQu dHZfc2VjLAotCQkJCQkJICAgJmV2ZW50LT5ldmVudC50dl91c2VjLAorCQkJCQkJICAgJmV2ZW50 LT5ldmVudC52YmwudHZfc2VjLAorCQkJCQkJICAgJmV2ZW50LT5ldmVudC52YmwudHZfdXNlYywK IAkJCQkJCSAgIHRydWUpOwogCQl2bXdfZmVuY2Vfb2JqX3VucmVmZXJlbmNlKCZmZW5jZSk7CiAJ fSBlbHNlIHsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV92YmxhbmsuaCBiL2luY2x1ZGUv ZHJtL2RybV92YmxhbmsuaAppbmRleCBjY2U1MzEzMDUxMGYuLmJmOGUwNzAzNWEwYSAxMDA2NDQK LS0tIGEvaW5jbHVkZS9kcm0vZHJtX3ZibGFuay5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV92Ymxh bmsuaApAQCAtNTQsNyArNTQsMTAgQEAgc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCB7 CiAJLyoqCiAJICogQGV2ZW50OiBBY3R1YWwgZXZlbnQgd2hpY2ggd2lsbCBiZSBzZW50IHRvIHVz ZXJzcGFjZS4KIAkgKi8KLQlzdHJ1Y3QgZHJtX2V2ZW50X3ZibGFuayBldmVudDsKKwl1bmlvbiB7 CisJCXN0cnVjdCBkcm1fZXZlbnQgYmFzZTsKKwkJc3RydWN0IGRybV9ldmVudF92YmxhbmsgdmJs OworCX0gZXZlbnQ7CiB9OwogCiAvKioKQEAgLTE2Myw2ICsxNjYsOSBAQCB2b2lkIGRybV9jcnRj X3NlbmRfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICAgICBzdHJ1 Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplKTsKIHZvaWQgZHJtX2NydGNfYXJtX3ZibGFu a19ldmVudChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX3BlbmRp bmdfdmJsYW5rX2V2ZW50ICplKTsKK3ZvaWQgZHJtX3ZibGFua19zZXRfZXZlbnQoc3RydWN0IGRy bV9wZW5kaW5nX3ZibGFua19ldmVudCAqZSwKKwkJCSAgdTY0ICpzZXEsCisJCQkgIGt0aW1lX3Qg Km5vdyk7CiBib29sIGRybV9oYW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVu c2lnbmVkIGludCBwaXBlKTsKIGJvb2wgZHJtX2NydGNfaGFuZGxlX3ZibGFuayhzdHJ1Y3QgZHJt X2NydGMgKmNydGMpOwogaW50IGRybV9jcnRjX3ZibGFua19nZXQoc3RydWN0IGRybV9jcnRjICpj cnRjKTsKLS0gCjIuMTUuMC5yYzAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo=