From: Keith Packard Subject: [PATCH 2/3] drm: Reorganize drm_pending_event to support future event types [v2] Date: Tue, 10 Oct 2017 17:45:13 -0700 Message-ID: <20171011004514.9500-3-keithp@keithp.com> References: <20171011004514.9500-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 9BA946E08E for ; Wed, 11 Oct 2017 00:45:18 +0000 (UTC) In-Reply-To: <20171011004514.9500-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 Ky0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZS5jICAgICAgICAgIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9kcm1fdmJsYW5rLmMgICAgICAgICB8IDMwICsrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jIHwgIDQgKyst LQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc3RkdS5jIHwgIDQgKystLQogaW5jbHVk ZS9kcm0vZHJtX3ZibGFuay5oICAgICAgICAgICAgIHwgIDggKysrKysrKy0KIDYgZmlsZXMgY2hh bmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMK aW5kZXggMzY2YzU2ZmU1ZjU4Li4wOGZmMWIwMjNmN2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwpAQCAt MTgxNSw3ICsxODE1LDcgQEAgaW50IGRybV9hdG9taWNfZGVidWdmc19pbml0KHN0cnVjdCBkcm1f bWlub3IgKm1pbm9yKQogICovCiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2 ZW50ICpjcmVhdGVfdmJsYW5rX2V2ZW50KAotCQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50 NjRfdCB1c2VyX2RhdGEpCisJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdWludDY0X3QgdXNlcl9k YXRhKQogewogCXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmUgPSBOVUxMOwogCkBA IC0xODI1LDcgKzE4MjUsOCBAQCBzdGF0aWMgc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVu dCAqY3JlYXRlX3ZibGFua19ldmVudCgKIAogCWUtPmV2ZW50LmJhc2UudHlwZSA9IERSTV9FVkVO VF9GTElQX0NPTVBMRVRFOwogCWUtPmV2ZW50LmJhc2UubGVuZ3RoID0gc2l6ZW9mKGUtPmV2ZW50 KTsKLQllLT5ldmVudC51c2VyX2RhdGEgPSB1c2VyX2RhdGE7CisJZS0+ZXZlbnQudmJsLmNydGNf aWQgPSBjcnRjLT5iYXNlLmlkOworCWUtPmV2ZW50LnZibC51c2VyX2RhdGEgPSB1c2VyX2RhdGE7 CiAKIAlyZXR1cm4gZTsKIH0KQEAgLTIwNzksNyArMjA4MCw3IEBAIHN0YXRpYyBpbnQgcHJlcGFy ZV9jcnRjX3NpZ25hbGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoYXJnLT5mbGFn cyAmIERSTV9NT0RFX1BBR0VfRkxJUF9FVkVOVCB8fCBmZW5jZV9wdHIpIHsKIAkJCXN0cnVjdCBk cm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmU7CiAKLQkJCWUgPSBjcmVhdGVfdmJsYW5rX2V2ZW50 KGRldiwgYXJnLT51c2VyX2RhdGEpOworCQkJZSA9IGNyZWF0ZV92YmxhbmtfZXZlbnQoY3J0Yywg YXJnLT51c2VyX2RhdGEpOwogCQkJaWYgKCFlKQogCQkJCXJldHVybiAtRU5PTUVNOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJt X3BsYW5lLmMKaW5kZXggNzJjYmE5ODA1ZWRjLi4xOTIwNzEyMDliYWEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5l LmMKQEAgLTEwMzksNyArMTAzOSw3IEBAIGludCBkcm1fbW9kZV9wYWdlX2ZsaXBfaW9jdGwoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJfQogCQllLT5ldmVudC5iYXNlLnR5cGUgPSBEUk1fRVZF TlRfRkxJUF9DT01QTEVURTsKIAkJZS0+ZXZlbnQuYmFzZS5sZW5ndGggPSBzaXplb2YoZS0+ZXZl bnQpOwotCQllLT5ldmVudC51c2VyX2RhdGEgPSBwYWdlX2ZsaXAtPnVzZXJfZGF0YTsKKwkJZS0+ ZXZlbnQudmJsLnVzZXJfZGF0YSA9IHBhZ2VfZmxpcC0+dXNlcl9kYXRhOwogCQlyZXQgPSBkcm1f ZXZlbnRfcmVzZXJ2ZV9pbml0KGRldiwgZmlsZV9wcml2LCAmZS0+YmFzZSwgJmUtPmV2ZW50LmJh c2UpOwogCQlpZiAocmV0KSB7CiAJCQlrZnJlZShlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fdmJsYW5rLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jCmluZGV4IDhj M2YyZmRkODIxYS4uN2QyNjc0ZTAzNjJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X3ZibGFuay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fdmJsYW5rLmMKQEAgLTgyMywxNCAr ODIzLDE2IEBAIHN0YXRpYyB2b2lkIHNlbmRfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiB7CiAJc3RydWN0IHRpbWV2YWwgdHY7CiAKLQl0diA9IGt0aW1lX3RvX3RpbWV2YWwo bm93KTsKLQllLT5ldmVudC5zZXF1ZW5jZSA9IHNlcTsKLQllLT5ldmVudC50dl9zZWMgPSB0di50 dl9zZWM7Ci0JZS0+ZXZlbnQudHZfdXNlYyA9IHR2LnR2X3VzZWM7Ci0KLQl0cmFjZV9kcm1fdmJs YW5rX2V2ZW50X2RlbGl2ZXJlZChlLT5iYXNlLmZpbGVfcHJpdiwgZS0+cGlwZSwKLQkJCQkJIGUt PmV2ZW50LnNlcXVlbmNlKTsKLQorCXN3aXRjaCAoZS0+ZXZlbnQuYmFzZS50eXBlKSB7CisJY2Fz ZSBEUk1fRVZFTlRfVkJMQU5LOgorCWNhc2UgRFJNX0VWRU5UX0ZMSVBfQ09NUExFVEU6CisJCXR2 ID0ga3RpbWVfdG9fdGltZXZhbChub3cpOworCQllLT5ldmVudC52Ymwuc2VxdWVuY2UgPSBzZXE7 CisJCWUtPmV2ZW50LnZibC50dl9zZWMgPSB0di50dl9zZWM7CisJCWUtPmV2ZW50LnZibC50dl91 c2VjID0gdHYudHZfdXNlYzsKKwkJYnJlYWs7CisJfQorCXRyYWNlX2RybV92YmxhbmtfZXZlbnRf ZGVsaXZlcmVkKGUtPmJhc2UuZmlsZV9wcml2LCBlLT5waXBlLCBzZXEpOwogCWRybV9zZW5kX2V2 ZW50X2xvY2tlZChkZXYsICZlLT5iYXNlKTsKIH0KIApAQCAtODgyLDcgKzg4NCw2IEBAIHZvaWQg ZHJtX2NydGNfYXJtX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAllLT5w aXBlID0gcGlwZTsKIAllLT5zZXF1ZW5jZSA9IGRybV92YmxhbmtfY291bnQoZGV2LCBwaXBlKTsK LQllLT5ldmVudC5jcnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKIAlsaXN0X2FkZF90YWlsKCZlLT5i YXNlLmxpbmssICZkZXYtPnZibGFua19ldmVudF9saXN0KTsKIH0KIEVYUE9SVF9TWU1CT0woZHJt X2NydGNfYXJtX3ZibGFua19ldmVudCk7CkBAIC05MTMsNyArOTE0LDYgQEAgdm9pZCBkcm1fY3J0 Y19zZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCW5vdyA9IGdldF9k cm1fdGltZXN0YW1wKCk7CiAJfQogCWUtPnBpcGUgPSBwaXBlOwotCWUtPmV2ZW50LmNydGNfaWQg PSBjcnRjLT5iYXNlLmlkOwogCXNlbmRfdmJsYW5rX2V2ZW50KGRldiwgZSwgc2VxLCBub3cpOwog fQogRVhQT1JUX1NZTUJPTChkcm1fY3J0Y19zZW5kX3ZibGFua19ldmVudCk7CkBAIC0xMzQ3LDgg KzEzNDcsMTQgQEAgc3RhdGljIGludCBkcm1fcXVldWVfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCiAJZS0+cGlwZSA9IHBpcGU7CiAJZS0+ ZXZlbnQuYmFzZS50eXBlID0gRFJNX0VWRU5UX1ZCTEFOSzsKLQllLT5ldmVudC5iYXNlLmxlbmd0 aCA9IHNpemVvZihlLT5ldmVudCk7Ci0JZS0+ZXZlbnQudXNlcl9kYXRhID0gdmJsd2FpdC0+cmVx dWVzdC5zaWduYWw7CisJZS0+ZXZlbnQuYmFzZS5sZW5ndGggPSBzaXplb2YoZS0+ZXZlbnQudmJs KTsKKwllLT5ldmVudC52YmwudXNlcl9kYXRhID0gdmJsd2FpdC0+cmVxdWVzdC5zaWduYWw7CisJ ZS0+ZXZlbnQudmJsLmNydGNfaWQgPSAwOworCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRl diwgRFJJVkVSX01PREVTRVQpKSB7CisJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGRybV9jcnRj X2Zyb21faW5kZXgoZGV2LCBwaXBlKTsKKwkJaWYgKGNydGMpCisJCQllLT5ldmVudC52YmwuY3J0 Y19pZCA9IGNydGMtPmJhc2UuaWQ7CisJfQogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldi0+ZXZl bnRfbG9jaywgZmxhZ3MpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Zt d2dmeF9zY3JuLmMgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zY3JuLmMKaW5kZXgg ZDE1NTJkM2UwNjUyLi5iYzVmNjAyNjU3M2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92 bXdnZngvdm13Z2Z4X3Njcm4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9z Y3JuLmMKQEAgLTM2MCw4ICszNjAsOCBAQCBzdGF0aWMgaW50IHZtd19zb3VfY3J0Y19wYWdlX2Zs aXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJCXJldCA9IHZtd19ldmVudF9mZW5jZV9hY3Rp b25fcXVldWUoZmlsZV9wcml2LCBmZW5jZSwKIAkJCQkJCSAgICZldmVudC0+YmFzZSwKLQkJCQkJ CSAgICZldmVudC0+ZXZlbnQudHZfc2VjLAotCQkJCQkJICAgJmV2ZW50LT5ldmVudC50dl91c2Vj LAorCQkJCQkJICAgJmV2ZW50LT5ldmVudC52YmwudHZfc2VjLAorCQkJCQkJICAgJmV2ZW50LT5l dmVudC52YmwudHZfdXNlYywKIAkJCQkJCSAgIHRydWUpOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc3RkdS5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dm eC92bXdnZnhfc3RkdS5jCmluZGV4IGNhM2FmYWUyZGIxZi4uOTBiNTQzN2ZkNzg3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3Ztd2dmeC92bXdnZnhfc3RkdS5jCkBAIC01NDksOCArNTQ5LDggQEAgc3RhdGljIGlu dCB2bXdfc3RkdV9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAkJcmV0 ID0gdm13X2V2ZW50X2ZlbmNlX2FjdGlvbl9xdWV1ZShmaWxlX3ByaXYsIGZlbmNlLAogCQkJCQkJ ICAgJmV2ZW50LT5iYXNlLAotCQkJCQkJICAgJmV2ZW50LT5ldmVudC50dl9zZWMsCi0JCQkJCQkg ICAmZXZlbnQtPmV2ZW50LnR2X3VzZWMsCisJCQkJCQkgICAmZXZlbnQtPmV2ZW50LnZibC50dl9z ZWMsCisJCQkJCQkgICAmZXZlbnQtPmV2ZW50LnZibC50dl91c2VjLAogCQkJCQkJICAgdHJ1ZSk7 CiAJCXZtd19mZW5jZV9vYmpfdW5yZWZlcmVuY2UoJmZlbmNlKTsKIAl9IGVsc2UgewpkaWZmIC0t Z2l0IGEvaW5jbHVkZS9kcm0vZHJtX3ZibGFuay5oIGIvaW5jbHVkZS9kcm0vZHJtX3ZibGFuay5o CmluZGV4IGNjZTUzMTMwNTEwZi4uYmY4ZTA3MDM1YTBhIDEwMDY0NAotLS0gYS9pbmNsdWRlL2Ry bS9kcm1fdmJsYW5rLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX3ZibGFuay5oCkBAIC01NCw3ICs1 NCwxMCBAQCBzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50IHsKIAkvKioKIAkgKiBAZXZl bnQ6IEFjdHVhbCBldmVudCB3aGljaCB3aWxsIGJlIHNlbnQgdG8gdXNlcnNwYWNlLgogCSAqLwot CXN0cnVjdCBkcm1fZXZlbnRfdmJsYW5rIGV2ZW50OworCXVuaW9uIHsKKwkJc3RydWN0IGRybV9l dmVudCBiYXNlOworCQlzdHJ1Y3QgZHJtX2V2ZW50X3ZibGFuayB2Ymw7CisJfSBldmVudDsKIH07 CiAKIC8qKgpAQCAtMTYzLDYgKzE2Niw5IEBAIHZvaWQgZHJtX2NydGNfc2VuZF92YmxhbmtfZXZl bnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAgICAgIHN0cnVjdCBkcm1fcGVuZGluZ192 YmxhbmtfZXZlbnQgKmUpOwogdm9pZCBkcm1fY3J0Y19hcm1fdmJsYW5rX2V2ZW50KHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAkJCSAgICAgIHN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQg KmUpOwordm9pZCBkcm1fdmJsYW5rX3NldF9ldmVudChzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5r X2V2ZW50ICplLAorCQkJICB1NjQgKnNlcSwKKwkJCSAga3RpbWVfdCAqbm93KTsKIGJvb2wgZHJt X2hhbmRsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUp OwogYm9vbCBkcm1fY3J0Y19oYW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiBp bnQgZHJtX2NydGNfdmJsYW5rX2dldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotLSAKMi4xMy4z CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK