From: Sean Paul Subject: [PATCH v2] drm: Merge __drm_atomic_helper_disable_all() into drm_atomic_helper_disable_all() Date: Tue, 12 Feb 2019 12:32:41 -0500 Message-ID: <20190212173245.51980-1-sean@poorly.run> References: <20190212170816.GJ114153@art_vandelay> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BB2C6E34E for ; Tue, 12 Feb 2019 17:32:49 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id 2so3908732qtb.5 for ; Tue, 12 Feb 2019 09:32:49 -0800 (PST) In-Reply-To: <20190212170816.GJ114153@art_vandelay> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Sinclair Yeh , Maxime Ripard , Sean Paul , David Airlie , Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpUaGUgb25seSBkaWZmZXJl bmNlIGJldHdlZW4gdGhlIGZ1bmN0aW9ucyBpcyB0aGUgY2xlYW5fb2xkX2ZicyBhcmd1bWVudCwg d2hvc2UKdXNlIHdhcyByZW1vdmVkIGluIHRoZSBwYXRjaCByZWZlcmVuY2VkIGJlbG93LiBTbyBy ZW1vdmUgdGhlIGludGVybmFsCmNvcHkgYW5kIGRyb3AgdGhlIGd1dHMgYmFjayBpbnRvIGRybV9h dG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKCkKCkNoYW5nZXMgaW4gdjI6Ci0gSW5zdGVhZCBvZiBq dXN0IHJlbW92aW5nIHRoZSB1bnVzZWQgYXJnLCBtZXJnZSB0aGUgZnVuY3Rpb25zCgpGaXhlczog ZTAwZmI4NTY0ZWU5ICgiZHJtOiBTdG9wIHVwZGF0aW5nIHBsYW5lLT5jcnRjL2ZiL29sZF9mYiBv biBhdG9taWMgZHJpdmVycyIpCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp bnV4LmludGVsLmNvbT4KQ2M6IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29t PgpDYzogU2luY2xhaXIgWWVoIDxzeWVoQHZtd2FyZS5jb20+ICMgVGhpcyBlbWFpbCBib3VuY2Vz IDooCkNjOiBNYXhpbWUgUmlwYXJkIDxtYXhpbWUucmlwYXJkQGJvb3RsaW4uY29tPgpDYzogU2Vh biBQYXVsIDxzZWFuQHBvb3JseS5ydW4+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXgu aWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hy b21pdW0ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgNTkg KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRp b25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmlu ZGV4IGM1M2VjYmQ5YWJkZGQuLjdhNzIzMWQwMDc3OTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj X2hlbHBlci5jCkBAIC0zMDMwLDkgKzMwMzAsMzEgQEAgaW50IF9fZHJtX2F0b21pY19oZWxwZXJf c2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQsCiAJcmV0dXJuIDA7CiB9CiAKLXN0 YXRpYyBpbnQgX19kcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAotCQkJCQkgICBzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCwKLQkJ CQkJICAgYm9vbCBjbGVhbl9vbGRfZmJzKQorLyoqCisgKiBkcm1fYXRvbWljX2hlbHBlcl9kaXNh YmxlX2FsbCAtIGRpc2FibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgb3V0cHV0cworICogQGRldjog RFJNIGRldmljZQorICogQGN0eDogbG9jayBhY3F1aXNpdGlvbiBjb250ZXh0CisgKgorICogTG9v cHMgdGhyb3VnaCBhbGwgY29ubmVjdG9ycywgZmluZGluZyB0aG9zZSB0aGF0IGFyZW4ndCB0dXJu ZWQgb2ZmIGFuZCB0aGVuCisgKiB0dXJucyB0aGVtIG9mZiBieSBzZXR0aW5nIHRoZWlyIERQTVMg bW9kZSB0byBPRkYgYW5kIGRlYWN0aXZhdGluZyB0aGUgQ1JUQworICogdGhhdCB0aGV5IGFyZSBj b25uZWN0ZWQgdG8uCisgKgorICogVGhpcyBpcyB1c2VkIGZvciBleGFtcGxlIGluIHN1c3BlbmQv cmVzdW1lIHRvIGRpc2FibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUKKyAqIGZ1bmN0aW9ucyB3aGVu IHN1c3BlbmRpbmcuIElmIHlvdSBqdXN0IHdhbnQgdG8gc2h1dCBkb3duIGV2ZXJ5dGhpbmcgYXQg ZS5nLgorICogZHJpdmVyIHVubG9hZCwgbG9vayBhdCBkcm1fYXRvbWljX2hlbHBlcl9zaHV0ZG93 bigpLgorICoKKyAqIE5vdGUgdGhhdCBpZiBjYWxsZXJzIGhhdmVuJ3QgYWxyZWFkeSBhY3F1aXJl ZCBhbGwgbW9kZXNldCBsb2NrcyB0aGlzIG1pZ2h0CisgKiByZXR1cm4gLUVERUFETEssIHdoaWNo IG11c3QgYmUgaGFuZGxlZCBieSBjYWxsaW5nIGRybV9tb2Rlc2V0X2JhY2tvZmYoKS4KKyAqCisg KiBSZXR1cm5zOgorICogMCBvbiBzdWNjZXNzIG9yIGEgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBm YWlsdXJlLgorICoKKyAqIFNlZSBhbHNvOgorICogZHJtX2F0b21pY19oZWxwZXJfc3VzcGVuZCgp LCBkcm1fYXRvbWljX2hlbHBlcl9yZXN1bWUoKSBhbmQKKyAqIGRybV9hdG9taWNfaGVscGVyX3No dXRkb3duKCkuCisgKi8KK2ludCBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAorCQkJCSAgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpj dHgpCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwogCXN0cnVjdCBkcm1fY29u bmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwpAQCAtMzA5MCwzNSArMzExMiw2IEBAIHN0YXRpYyBp bnQgX19kcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCWRybV9hdG9taWNfc3RhdGVfcHV0KHN0YXRlKTsKIAlyZXR1cm4gcmV0OwogfQotCi0vKioK LSAqIGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsIC0gZGlzYWJsZSBhbGwgY3VycmVudGx5 IGFjdGl2ZSBvdXRwdXRzCi0gKiBAZGV2OiBEUk0gZGV2aWNlCi0gKiBAY3R4OiBsb2NrIGFjcXVp c2l0aW9uIGNvbnRleHQKLSAqCi0gKiBMb29wcyB0aHJvdWdoIGFsbCBjb25uZWN0b3JzLCBmaW5k aW5nIHRob3NlIHRoYXQgYXJlbid0IHR1cm5lZCBvZmYgYW5kIHRoZW4KLSAqIHR1cm5zIHRoZW0g b2ZmIGJ5IHNldHRpbmcgdGhlaXIgRFBNUyBtb2RlIHRvIE9GRiBhbmQgZGVhY3RpdmF0aW5nIHRo ZSBDUlRDCi0gKiB0aGF0IHRoZXkgYXJlIGNvbm5lY3RlZCB0by4KLSAqCi0gKiBUaGlzIGlzIHVz ZWQgZm9yIGV4YW1wbGUgaW4gc3VzcGVuZC9yZXN1bWUgdG8gZGlzYWJsZSBhbGwgY3VycmVudGx5 IGFjdGl2ZQotICogZnVuY3Rpb25zIHdoZW4gc3VzcGVuZGluZy4gSWYgeW91IGp1c3Qgd2FudCB0 byBzaHV0IGRvd24gZXZlcnl0aGluZyBhdCBlLmcuCi0gKiBkcml2ZXIgdW5sb2FkLCBsb29rIGF0 IGRybV9hdG9taWNfaGVscGVyX3NodXRkb3duKCkuCi0gKgotICogTm90ZSB0aGF0IGlmIGNhbGxl cnMgaGF2ZW4ndCBhbHJlYWR5IGFjcXVpcmVkIGFsbCBtb2Rlc2V0IGxvY2tzIHRoaXMgbWlnaHQK LSAqIHJldHVybiAtRURFQURMSywgd2hpY2ggbXVzdCBiZSBoYW5kbGVkIGJ5IGNhbGxpbmcgZHJt X21vZGVzZXRfYmFja29mZigpLgotICoKLSAqIFJldHVybnM6Ci0gKiAwIG9uIHN1Y2Nlc3Mgb3Ig YSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUuCi0gKgotICogU2VlIGFsc286Ci0gKiBk cm1fYXRvbWljX2hlbHBlcl9zdXNwZW5kKCksIGRybV9hdG9taWNfaGVscGVyX3Jlc3VtZSgpIGFu ZAotICogZHJtX2F0b21pY19oZWxwZXJfc2h1dGRvd24oKS4KLSAqLwotaW50IGRybV9hdG9taWNf aGVscGVyX2Rpc2FibGVfYWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICBzdHJ1Y3Qg ZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCkKLXsKLQlyZXR1cm4gX19kcm1fYXRvbWljX2hl bHBlcl9kaXNhYmxlX2FsbChkZXYsIGN0eCwgZmFsc2UpOwotfQogRVhQT1JUX1NZTUJPTChkcm1f YXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbCk7CiAKIC8qKgpAQCAtMzEzOSw3ICszMTMyLDcgQEAg dm9pZCBkcm1fYXRvbWljX2hlbHBlcl9zaHV0ZG93bihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJRFJNX01PREVTRVRfTE9DS19BTExfQkVHSU4oZGV2LCBjdHgsIDAsIHJldCk7CiAKLQlyZXQg PSBfX2RybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKGRldiwgJmN0eCwgdHJ1ZSk7CisJcmV0 ID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9hbGwoZGV2LCAmY3R4KTsKIAlpZiAocmV0KQog CQlEUk1fRVJST1IoIkRpc2FibGluZyBhbGwgY3J0YydzIGR1cmluZyB1bmxvYWQgZmFpbGVkIHdp dGggJWlcbiIsIHJldCk7CiAKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUgRW5naW5lZXIsIEdvb2ds ZSAvIENocm9taXVtIE9TCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWw=