From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 1/6] drm/atomic: Clean up update_output_state. Date: Wed, 24 Feb 2016 09:37:28 +0100 Message-ID: <1456303053-28806-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1456303053-28806-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1456303053-28806-1-git-send-email-maarten.lankhorst@linux.intel.com> 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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2l0aCB0aGUgYWRkaXRpb24gb2YgY3J0Y19zdGF0ZS0+Y29ubmVjdG9yX21hc2sgb3RoZXIgY29u bmVjdG9ycyBmcm9tCmRpZmZlcmVudCBjcnRjJ3MgYXJlbid0IG5lZWRlZCBhbnkgbW9yZSB0byBk ZXRlcm1pbmUgaWYgYSBjcnRjIGhhcwpjb25uZWN0b3JzLCBzbyBvbmx5IGNhbGwgYWRkX2FmZmVj dGVkX2Nvbm5lY3RvcnMgb24gdGhlIHRhcmdldCBjcnRjLgpUaGlzIGFsbG93cyBhIGNsZWFudXAg dG8gZmlyc3QgcmVtb3ZlIGFsbCBjdXJyZW50IGNvbm5lY3RvcnMsIHRoZW4KYWRkIGFsbCBzZXQt PmNvbm5lY3RvcnMgdG8gdGhlIHRhcmdldCBjcnRjLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDQxICsrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAyNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDRkYTRmMmE0OTA3 OC4uYTAyMjZkNGI5NDlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMTc2 MSwyOCArMTc2MSwxOCBAQCBzdGF0aWMgaW50IHVwZGF0ZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY29ubmVj dG9yX3N0YXRlICpjb25uX3N0YXRlOwotCWludCByZXQsIGksIGo7CisJaW50IHJldCwgaTsKIAog CXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRl eCwKIAkJCSAgICAgICBzdGF0ZS0+YWNxdWlyZV9jdHgpOwogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKLQkvKiBGaXJzdCBncmFiIGFsbCBhZmZlY3RlZCBjb25uZWN0b3IvY3J0YyBzdGF0ZXMu ICovCi0JZm9yIChpID0gMDsgaSA8IHNldC0+bnVtX2Nvbm5lY3RvcnM7IGkrKykgewotCQljb25u X3N0YXRlID0gZHJtX2F0b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHN0YXRlLAotCQkJCQkJCSAg ICBzZXQtPmNvbm5lY3RvcnNbaV0pOwotCQlpZiAoSVNfRVJSKGNvbm5fc3RhdGUpKQotCQkJcmV0 dXJuIFBUUl9FUlIoY29ubl9zdGF0ZSk7Ci0JfQotCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShz dGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZl Y3RlZF9jb25uZWN0b3JzKHN0YXRlLCBjcnRjKTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7 Ci0JfQorCS8qIEZpcnN0IGRpc2FibGUgYWxsIGNvbm5lY3RvcnMgb24gdGhlIHRhcmdldCBjcnRj LiAqLworCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX2Nvbm5lY3RvcnMoc3RhdGUsIHNl dC0+Y3J0Yyk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKIAotCS8qIFRoZW4gcmVjb21wdXRl IGNvbm5lY3Rvci0+Y3J0YyBsaW5rcyBhbmQgY3J0YyBlbmFibGluZyBzdGF0ZS4gKi8KIAlmb3Jf ZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkg ewogCQlpZiAoY29ubl9zdGF0ZS0+Y3J0YyA9PSBzZXQtPmNydGMpIHsKIAkJCXJldCA9IGRybV9h dG9taWNfc2V0X2NydGNfZm9yX2Nvbm5lY3Rvcihjb25uX3N0YXRlLApAQCAtMTc5MCwxNiArMTc4 MCwxOSBAQCBzdGF0aWMgaW50IHVwZGF0ZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlLAogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0OwogCQl9CisJfQogCi0J CWZvciAoaiA9IDA7IGogPCBzZXQtPm51bV9jb25uZWN0b3JzOyBqKyspIHsKLQkJCWlmIChzZXQt PmNvbm5lY3RvcnNbal0gPT0gY29ubmVjdG9yKSB7Ci0JCQkJcmV0ID0gZHJtX2F0b21pY19zZXRf Y3J0Y19mb3JfY29ubmVjdG9yKGNvbm5fc3RhdGUsCi0JCQkJCQkJCQlzZXQtPmNydGMpOwotCQkJ CWlmIChyZXQpCi0JCQkJCXJldHVybiByZXQ7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0JCX0KKwkvKiBU aGVuIHNldCBhbGwgY29ubmVjdG9ycyBmcm9tIHNldC0+Y29ubmVjdG9ycyBvbiB0aGUgdGFyZ2V0 IGNydGMgKi8KKwlmb3IgKGkgPSAwOyBpIDwgc2V0LT5udW1fY29ubmVjdG9yczsgaSsrKSB7CisJ CWNvbm5fc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3RhdGUsCisJCQkJ CQkJICAgIHNldC0+Y29ubmVjdG9yc1tpXSk7CisJCWlmIChJU19FUlIoY29ubl9zdGF0ZSkpCisJ CQlyZXR1cm4gUFRSX0VSUihjb25uX3N0YXRlKTsKKworCQlyZXQgPSBkcm1fYXRvbWljX3NldF9j cnRjX2Zvcl9jb25uZWN0b3IoY29ubl9zdGF0ZSwKKwkJCQkJCQlzZXQtPmNydGMpOworCQlpZiAo cmV0KQorCQkJcmV0dXJuIHJldDsKIAl9CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==