From: Matt Roper Subject: [PATCH 09/10] drm/i915: Switch plane properties to full atomic helper. Date: Wed, 21 Jan 2015 16:35:48 -0800 Message-ID: <1421886949-26704-10-git-send-email-matthew.d.roper@intel.com> References: <1421886949-26704-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id EC1866E2C4 for ; Wed, 21 Jan 2015 16:36:17 -0800 (PST) In-Reply-To: <1421886949-26704-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyB3aWxsIGV4ZXJjaXNlIG91ciBhdG9taWMgcGlwZWxpbmUgZm9yIGxlZ2FjeSBwcm9wZXJ0 eSB1cGRhdGVzLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8 ICA5ICsrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAg fCAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAgIHwgMjYg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9u cygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNf cGxhbmUuYwppbmRleCA0YTM5MTRmLi45ZTZmNzI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTE4LDYgKzExOCwxNSBAQCBzdGF0aWMgaW50IGludGVs X3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpbnRlbF9jcnRj ID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAogCS8qCisJICogQm90aCBjcnRjIGFuZCBwbGFuZS0+ Y3J0YyBjb3VsZCBiZSBOVUxMIGlmIHdlJ3JlIHVwZGF0aW5nIGEKKwkgKiBwcm9wZXJ0eSB3aGls ZSB0aGUgcGxhbmUgaXMgZGlzYWJsZWQuICBXZSBkb24ndCBhY3R1YWxseSBoYXZlCisJICogYW55 dGhpbmcgZHJpdmVyLXNwZWNpZmljIHdlIG5lZWQgdG8gdGVzdCBpbiB0aGF0IGNhc2UsIHNvCisJ ICoganVzdCByZXR1cm4gc3VjY2Vzcy4KKwkgKi8KKwlpZiAoIWNydGMpCisJCXJldHVybiAwOwor CisJLyoKIAkgKiBUaGUgb3JpZ2luYWwgc3JjL2Rlc3QgY29vcmRpbmF0ZXMgYXJlIHN0b3JlZCBp biBzdGF0ZS0+YmFzZSwgYnV0CiAJICogd2Ugd2FudCB0byBrZWVwIGFub3RoZXIgY29weSBpbnRl cm5hbCB0byBvdXIgZHJpdmVyIHRoYXQgd2UgY2FuCiAJICogY2xpcC9tb2RpZnkgb3Vyc2VsdmVz LgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGRiMjA3NzMuLjkwYjc4OGEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM3LDYgKzM3LDcgQEAKICNp bmNsdWRlIDxkcm0vaTkxNV9kcm0uaD4KICNpbmNsdWRlICJpOTE1X2Rydi5oIgogI2luY2x1ZGUg Imk5MTVfdHJhY2UuaCIKKyNpbmNsdWRlIDxkcm0vZHJtX2F0b21pY19oZWxwZXIuaD4KICNpbmNs dWRlIDxkcm0vZHJtX2RwX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fY3J0Y19oZWxwZXIu aD4KICNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgpAQCAtMTIwNTUsNyArMTIwNTYs NyBAQCBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3BsYW5lX2Z1bmNzID0gewog CS51cGRhdGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZSwKIAkuZGlzYWJsZV9wbGFu ZSA9IGRybV9wbGFuZV9oZWxwZXJfZGlzYWJsZSwKIAkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rl c3Ryb3ksCi0JLnNldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eSwKKwkuc2V0 X3Byb3BlcnR5ID0gZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfc2V0X3Byb3BlcnR5LAogCS5hdG9t aWNfZ2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX2dldF9wcm9wZXJ0eSwKIAkuYXRv bWljX3NldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHksCiAJLmF0 b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDUwNjgzZDQuLjBhNTJjNDQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMzYyLDMyICsxMzYyLDYgQEAgb3V0X3VubG9j azoKIAlyZXR1cm4gcmV0OwogfQogCi1pbnQgaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5KHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJICAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wLAot CQkJICAgICB1aW50NjRfdCB2YWwpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5l LT5kZXY7Ci0JdWludDY0X3Qgb2xkX3ZhbDsKLQlpbnQgcmV0ID0gLUVOT0VOVDsKLQotCWlmIChw cm9wID09IGRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHkpIHsKLQkJLyogZXhhY3Rs eSBvbmUgcm90YXRpb24gYW5nbGUgcGxlYXNlICovCi0JCWlmIChod2VpZ2h0MzIodmFsICYgMHhm KSAhPSAxKQotCQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQkJaWYgKHBsYW5lLT5zdGF0ZS0+cm90YXRp b24gPT0gdmFsKQotCQkJcmV0dXJuIDA7Ci0KLQkJb2xkX3ZhbCA9IHBsYW5lLT5zdGF0ZS0+cm90 YXRpb247Ci0JCXBsYW5lLT5zdGF0ZS0+cm90YXRpb24gPSB2YWw7Ci0JCXJldCA9IGludGVsX3Bs YW5lX3Jlc3RvcmUocGxhbmUpOwotCQlpZiAocmV0KQotCQkJcGxhbmUtPnN0YXRlLT5yb3RhdGlv biA9IG9sZF92YWw7Ci0JfQotCi0JcmV0dXJuIHJldDsKLX0KLQogaW50IGludGVsX3BsYW5lX3Jl c3RvcmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB7CiAJaWYgKCFwbGFuZS0+Y3J0YyB8fCAh cGxhbmUtPmZiKQotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK