From: Keith Packard Subject: [PATCH 2/3] drm: Reorganize drm_pending_event to support future event types Date: Wed, 5 Jul 2017 15:10:12 -0700 Message-ID: <20170705221013.27940-3-keithp@keithp.com> References: <20170705221013.27940-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 D69816E550 for ; Wed, 5 Jul 2017 22:10:26 +0000 (UTC) In-Reply-To: <20170705221013.27940-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 IGRvZXNuJ3QKbmVlZCB0byBoYXZlIHRoZSBjcnRjIElEIGF2YWlsYWJsZS4KClNpZ25lZC1vZmYt Ynk6IEtlaXRoIFBhY2thcmQgPGtlaXRocEBrZWl0aHAuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljLmMgICAgICAgICB8ICA3ICsrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1f cGxhbmUuYyAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jICAg ICAgICAgfCAyNyArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92 bXdnZngvdm13Z2Z4X3Njcm4uYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13 Z2Z4X3N0ZHUuYyB8ICA0ICsrLS0KIGluY2x1ZGUvZHJtL2RybV92YmxhbmsuaCAgICAgICAgICAg ICB8ICA4ICsrKysrKystCiA2IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDIwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCmluZGV4IGMwZjMzNmQyM2Y5Yy4uZjU2OWQ3ZjAz ZjNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKQEAgLTE4MzksNyArMTgzOSw3IEBAIGludCBkcm1fYXRv bWljX2RlYnVnZnNfaW5pdChzdHJ1Y3QgZHJtX21pbm9yICptaW5vcikKICAqLwogCiBzdGF0aWMg c3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqY3JlYXRlX3ZibGFua19ldmVudCgKLQkJ c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDY0X3QgdXNlcl9kYXRhKQorCQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHVpbnQ2NF90IHVzZXJfZGF0YSkK IHsKIAlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplID0gTlVMTDsKIApAQCAtMTg0 OSw3ICsxODQ5LDggQEAgc3RhdGljIHN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmNy ZWF0ZV92YmxhbmtfZXZlbnQoCiAKIAllLT5ldmVudC5iYXNlLnR5cGUgPSBEUk1fRVZFTlRfRkxJ UF9DT01QTEVURTsKIAllLT5ldmVudC5iYXNlLmxlbmd0aCA9IHNpemVvZihlLT5ldmVudCk7Ci0J ZS0+ZXZlbnQudXNlcl9kYXRhID0gdXNlcl9kYXRhOworCWUtPmV2ZW50LnZibC5jcnRjX2lkID0g Y3J0Yy0+YmFzZS5pZDsKKwllLT5ldmVudC52YmwudXNlcl9kYXRhID0gdXNlcl9kYXRhOwogCiAJ cmV0dXJuIGU7CiB9CkBAIC0yMDUyLDcgKzIwNTMsNyBAQCBzdGF0aWMgaW50IHByZXBhcmVfY3J0 Y19zaWduYWxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKGFyZy0+ZmxhZ3MgJiBE Uk1fTU9ERV9QQUdFX0ZMSVBfRVZFTlQgfHwgZmVuY2VfcHRyKSB7CiAJCQlzdHJ1Y3QgZHJtX3Bl bmRpbmdfdmJsYW5rX2V2ZW50ICplOwogCi0JCQllID0gY3JlYXRlX3ZibGFua19ldmVudChkZXYs IGFyZy0+dXNlcl9kYXRhKTsKKwkJCWUgPSBjcmVhdGVfdmJsYW5rX2V2ZW50KGRldiwgY3J0Yywg YXJnLT51c2VyX2RhdGEpOwogCQkJaWYgKCFlKQogCQkJCXJldHVybiAtRU5PTUVNOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJt X3BsYW5lLmMKaW5kZXggNWRjOGM0MzUwNjAyLi5mZTlmMzEyODViYzIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5l LmMKQEAgLTkxOCw3ICs5MTgsNyBAQCBpbnQgZHJtX21vZGVfcGFnZV9mbGlwX2lvY3RsKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCX0KIAkJZS0+ZXZlbnQuYmFzZS50eXBlID0gRFJNX0VWRU5U X0ZMSVBfQ09NUExFVEU7CiAJCWUtPmV2ZW50LmJhc2UubGVuZ3RoID0gc2l6ZW9mKGUtPmV2ZW50 KTsKLQkJZS0+ZXZlbnQudXNlcl9kYXRhID0gcGFnZV9mbGlwLT51c2VyX2RhdGE7CisJCWUtPmV2 ZW50LnZibC51c2VyX2RhdGEgPSBwYWdlX2ZsaXAtPnVzZXJfZGF0YTsKIAkJcmV0ID0gZHJtX2V2 ZW50X3Jlc2VydmVfaW5pdChkZXYsIGZpbGVfcHJpdiwgJmUtPmJhc2UsICZlLT5ldmVudC5iYXNl KTsKIAkJaWYgKHJldCkgewogCQkJa2ZyZWUoZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZHJtX3ZibGFuay5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV92YmxhbmsuYwppbmRleCBmNTVm OTk3YzBiOGYuLjlhZTE3MDg1N2VmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV92 YmxhbmsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jCkBAIC04MDcsMTMgKzgw NywxOCBAQCBzdGF0aWMgdm9pZCBzZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplLAogCQl1NjQgc2VxLCBz dHJ1Y3QgdGltZXNwZWMgKm5vdykKIHsKLQllLT5ldmVudC5zZXF1ZW5jZSA9IHNlcTsKLQllLT5l dmVudC50dl9zZWMgPSBub3ctPnR2X3NlYzsKLQllLT5ldmVudC50dl91c2VjID0gbm93LT50dl9u c2VjIC8gMTAwMDsKLQotCXRyYWNlX2RybV92YmxhbmtfZXZlbnRfZGVsaXZlcmVkKGUtPmJhc2Uu ZmlsZV9wcml2LCBlLT5waXBlLAotCQkJCQkgZS0+ZXZlbnQuc2VxdWVuY2UpOwotCisJc3dpdGNo IChlLT5ldmVudC5iYXNlLnR5cGUpIHsKKwljYXNlIERSTV9FVkVOVF9WQkxBTks6CisJY2FzZSBE Uk1fRVZFTlRfRkxJUF9DT01QTEVURToKKwkJaWYgKHNlcSkKKwkJCWUtPmV2ZW50LnZibC5zZXF1 ZW5jZSA9ICh1MzIpIHNlcTsKKwkJaWYgKG5vdykgeworCQkJZS0+ZXZlbnQudmJsLnR2X3NlYyA9 IG5vdy0+dHZfc2VjOworCQkJZS0+ZXZlbnQudmJsLnR2X3VzZWMgPSBub3ctPnR2X25zZWMgLyAx MDAwOworCQl9CisJCWJyZWFrOworCX0KKwl0cmFjZV9kcm1fdmJsYW5rX2V2ZW50X2RlbGl2ZXJl ZChlLT5iYXNlLmZpbGVfcHJpdiwgZS0+cGlwZSwgc2VxKTsKIAlkcm1fc2VuZF9ldmVudF9sb2Nr ZWQoZGV2LCAmZS0+YmFzZSk7CiB9CiAKQEAgLTg2NSw3ICs4NzAsNiBAQCB2b2lkIGRybV9jcnRj X2FybV92YmxhbmtfZXZlbnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJZS0+cGlwZSA9IHBp cGU7CiAJZS0+c2VxdWVuY2UgPSBkcm1fdmJsYW5rX2NvdW50KGRldiwgcGlwZSk7Ci0JZS0+ZXZl bnQuY3J0Y19pZCA9IGNydGMtPmJhc2UuaWQ7CiAJbGlzdF9hZGRfdGFpbCgmZS0+YmFzZS5saW5r LCAmZGV2LT52YmxhbmtfZXZlbnRfbGlzdCk7CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9jcnRjX2Fy bV92YmxhbmtfZXZlbnQpOwpAQCAtODk3LDcgKzkwMSw2IEBAIHZvaWQgZHJtX2NydGNfc2VuZF92 YmxhbmtfZXZlbnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlub3cgPSBnZXRfZHJtX3RpbWVz dGFtcCgpOwogCX0KIAllLT5waXBlID0gcGlwZTsKLQllLT5ldmVudC5jcnRjX2lkID0gY3J0Yy0+ YmFzZS5pZDsKIAlzZW5kX3ZibGFua19ldmVudChkZXYsIGUsIHNlcSwgJm5vdyk7CiB9CiBFWFBP UlRfU1lNQk9MKGRybV9jcnRjX3NlbmRfdmJsYW5rX2V2ZW50KTsKQEAgLTEzNDIsNiArMTM0NSw3 IEBAIHN0YXRpYyBpbnQgZHJtX3F1ZXVlX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKIAkJCQkgIHVuaW9uIGRybV93YWl0X3ZibGFuayAqdmJs d2FpdCwKIAkJCQkgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KQogeworCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YyA9IGRybV9jcnRjX2Zyb21faW5kZXgoZGV2LCBwaXBlKTsKIAlzdHJ1Y3QgZHJt X3ZibGFua19jcnRjICp2YmxhbmsgPSAmZGV2LT52YmxhbmtbcGlwZV07CiAJc3RydWN0IGRybV9w ZW5kaW5nX3ZibGFua19ldmVudCAqZTsKIAlzdHJ1Y3QgdGltZXNwZWMgbm93OwpAQCAtMTM1Nyw4 ICsxMzYxLDkgQEAgc3RhdGljIGludCBkcm1fcXVldWVfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCiAJZS0+cGlwZSA9IHBpcGU7CiAJZS0+ ZXZlbnQuYmFzZS50eXBlID0gRFJNX0VWRU5UX1ZCTEFOSzsKLQllLT5ldmVudC5iYXNlLmxlbmd0 aCA9IHNpemVvZihlLT5ldmVudCk7Ci0JZS0+ZXZlbnQudXNlcl9kYXRhID0gdmJsd2FpdC0+cmVx dWVzdC5zaWduYWw7CisJZS0+ZXZlbnQuYmFzZS5sZW5ndGggPSBzaXplb2YoZS0+ZXZlbnQudmJs KTsKKwllLT5ldmVudC52YmwudXNlcl9kYXRhID0gdmJsd2FpdC0+cmVxdWVzdC5zaWduYWw7CisJ ZS0+ZXZlbnQudmJsLmNydGNfaWQgPSBjcnRjID8gY3J0Yy0+YmFzZS5pZCA6IDA7CiAKIAlzcGlu X2xvY2tfaXJxc2F2ZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3Njcm4uYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdn Zngvdm13Z2Z4X3Njcm4uYwppbmRleCA4ZDdkYzlkZWY3YzIuLmMxM2I5NzMzODMxMCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS92bXdnZngvdm13Z2Z4X3Njcm4uYwpAQCAtMzU4LDggKzM1OCw4IEBAIHN0YXRpYyBp bnQgdm13X3NvdV9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAkJcmV0 ID0gdm13X2V2ZW50X2ZlbmNlX2FjdGlvbl9xdWV1ZShmaWxlX3ByaXYsIGZlbmNlLAogCQkJCQkJ ICAgJmV2ZW50LT5iYXNlLAotCQkJCQkJICAgJmV2ZW50LT5ldmVudC50dl9zZWMsCi0JCQkJCQkg ICAmZXZlbnQtPmV2ZW50LnR2X3VzZWMsCisJCQkJCQkgICAmZXZlbnQtPmV2ZW50LnZibC50dl9z ZWMsCisJCQkJCQkgICAmZXZlbnQtPmV2ZW50LnZibC50dl91c2VjLAogCQkJCQkJICAgdHJ1ZSk7 CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMg Yi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMKaW5kZXggYmFkMzFiZGYwOWI2 Li40ZTMyOTU4OGNlOWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X3N0ZHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMKQEAgLTU0 NCw4ICs1NDQsOCBAQCBzdGF0aWMgaW50IHZtd19zdGR1X2NydGNfcGFnZV9mbGlwKHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAogCQlyZXQgPSB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uX3F1ZXVlKGZp bGVfcHJpdiwgZmVuY2UsCiAJCQkJCQkgICAmZXZlbnQtPmJhc2UsCi0JCQkJCQkgICAmZXZlbnQt PmV2ZW50LnR2X3NlYywKLQkJCQkJCSAgICZldmVudC0+ZXZlbnQudHZfdXNlYywKKwkJCQkJCSAg ICZldmVudC0+ZXZlbnQudmJsLnR2X3NlYywKKwkJCQkJCSAgICZldmVudC0+ZXZlbnQudmJsLnR2 X3VzZWMsCiAJCQkJCQkgICB0cnVlKTsKIAkJdm13X2ZlbmNlX29ial91bnJlZmVyZW5jZSgmZmVu Y2UpOwogCX0gZWxzZSB7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fdmJsYW5rLmggYi9p bmNsdWRlL2RybS9kcm1fdmJsYW5rLmgKaW5kZXggNjhlOTkxNzdmZmYzLi4zZWY3ZGRjNWRiNWYg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV92YmxhbmsuaAorKysgYi9pbmNsdWRlL2RybS9k cm1fdmJsYW5rLmgKQEAgLTU0LDcgKzU0LDEwIEBAIHN0cnVjdCBkcm1fcGVuZGluZ192Ymxhbmtf ZXZlbnQgewogCS8qKgogCSAqIEBldmVudDogQWN0dWFsIGV2ZW50IHdoaWNoIHdpbGwgYmUgc2Vu dCB0byB1c2Vyc3BhY2UuCiAJICovCi0Jc3RydWN0IGRybV9ldmVudF92YmxhbmsgZXZlbnQ7CisJ dW5pb24geworCQlzdHJ1Y3QgZHJtX2V2ZW50IGJhc2U7CisJCXN0cnVjdCBkcm1fZXZlbnRfdmJs YW5rIHZibDsKKwl9IGV2ZW50OwogfTsKIAogLyoqCkBAIC0xNjMsNiArMTY2LDkgQEAgdm9pZCBk cm1fY3J0Y19zZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkgICAg ICAgc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZSk7CiB2b2lkIGRybV9jcnRjX2Fy bV92YmxhbmtfZXZlbnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAgICAgc3RydWN0IGRy bV9wZW5kaW5nX3ZibGFua19ldmVudCAqZSk7Cit2b2lkIGRybV92Ymxhbmtfc2V0X2V2ZW50KHN0 cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmUsCisJCQkgIHU2NCAqc2VxLAorCQkJICBz dHJ1Y3QgdGltZXNwZWMgKm5vdyk7CiBib29sIGRybV9oYW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKTsKIGJvb2wgZHJtX2NydGNfaGFuZGxlX3Zi bGFuayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogaW50IGRybV9jcnRjX3ZibGFua19nZXQoc3Ry dWN0IGRybV9jcnRjICpjcnRjKTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==