From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 24/35] drm/i915: Unify modeset and flip paths of intel_crtc_set_config() Date: Tue, 21 Apr 2015 17:13:13 +0300 Message-ID: <1429625604-22252-25-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 574776E5EC for ; Tue, 21 Apr 2015 07:14:07 -0700 (PDT) In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org Q2FsbCBpbnRlbF9zZXRfbW9kZSgpIHVuY29uZGlvbmFsbHkgZnJvbSBpbnRlbF9jcnRjX3NldF9j b25maWcoKSwgc2luY2UKdGhlIGZvcm1lciBmdW5jdGlvbiBpcyBub3cgcHJvcGVybHkgd2lyZWQg dG8gaWdub3JlIGFsbCB0aGUgbW9kZXNldHMgaWYKdGhlIG1vZGVfY2hhbmdlZCBhbmQgYWN0aXZl X2NoYW5nZWQgZmxhZ3MgYXJlIGZhbHNlIGluIGNydGNfc3RhdGUuCgpTaWduZWQtb2ZmLWJ5OiBB bmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzcg KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAg aW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDNjYzJkYTYuLjQ5NDljMjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTEyNzYyLDEyICsxMjc2MiwyMSBAQCBpbnRlbF9tb2Rlc2V0X3N0YWdlX291 dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogfQogCitzdGF0 aWMgYm9vbCBwcmltYXJ5X3BsYW5lX3Zpc2libGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQorewor CXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUgPQorCQl0b19pbnRlbF9wbGFu ZV9zdGF0ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSk7CisKKwlyZXR1cm4gcGxhbmVfc3RhdGUtPnZp c2libGU7Cit9CisKIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19zZXRfY29uZmlnKHN0cnVjdCBkcm1f bW9kZV9zZXQgKnNldCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2OwogCXN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVsX3NldF9jb25maWcgKmNv bmZpZzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7CisJYm9vbCBwcmlt YXJ5X3BsYW5lX3dhc192aXNpYmxlOwogCWludCByZXQ7CiAKIAlCVUdfT04oIXNldCk7CkBAIC0x MjgyOSwyOSArMTI4MzgsMjMgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3Ry dWN0IGRybV9tb2RlX3NldCAqc2V0KQogCiAJaW50ZWxfdXBkYXRlX3BpcGVfc2l6ZSh0b19pbnRl bF9jcnRjKHNldC0+Y3J0YykpOwogCi0JaWYgKHBpcGVfY29uZmlnLT5iYXNlLm1vZGVfY2hhbmdl ZCkgewotCQlyZXQgPSBpbnRlbF9zZXRfbW9kZV93aXRoX2NvbmZpZyhzZXQtPmNydGMsIHNldC0+ bW9kZSwKLQkJCQkJCSBwaXBlX2NvbmZpZyk7Ci0JfSBlbHNlIGlmIChwaXBlX2NvbmZpZy0+YmFz ZS5wbGFuZXNfY2hhbmdlZCkgeworCXByaW1hcnlfcGxhbmVfd2FzX3Zpc2libGUgPSBwcmltYXJ5 X3BsYW5lX3Zpc2libGUoc2V0LT5jcnRjKTsKKworCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhf Y29uZmlnKHNldC0+Y3J0Yywgc2V0LT5tb2RlLAorCQkJCQkgcGlwZV9jb25maWcpOworCisJaWYg KHJldCA9PSAwICYmCisJICAgIHBpcGVfY29uZmlnLT5iYXNlLmVuYWJsZSAmJgorCSAgICBwaXBl X2NvbmZpZy0+YmFzZS5wbGFuZXNfY2hhbmdlZCAmJgorCSAgICAhbmVlZHNfbW9kZXNldCgmcGlw ZV9jb25maWctPmJhc2UpKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhzZXQtPmNydGMpOwotCQlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gc2V0 LT5jcnRjLT5wcmltYXJ5OwotCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRl ID0KLQkJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7Ci0JCWJvb2wgd2Fz X3Zpc2libGUgPSBwbGFuZV9zdGF0ZS0+dmlzaWJsZTsKLQkJaW50IHZkaXNwbGF5LCBoZGlzcGxh eTsKLQotCQlkcm1fY3J0Y19nZXRfaHZfdGltaW5nKHNldC0+bW9kZSwgJmhkaXNwbGF5LCAmdmRp c3BsYXkpOwotCQlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZShwcmltYXJ5LCBzZXQtPmNy dGMsIHNldC0+ZmIsCi0JCQkJCSAgICAgIDAsIDAsIGhkaXNwbGF5LCB2ZGlzcGxheSwKLQkJCQkJ ICAgICAgc2V0LT54IDw8IDE2LCBzZXQtPnkgPDwgMTYsCi0JCQkJCSAgICAgIGhkaXNwbGF5IDw8 IDE2LCB2ZGlzcGxheSA8PCAxNik7CiAKIAkJLyoKIAkJICogV2UgbmVlZCB0byBtYWtlIHN1cmUg dGhlIHByaW1hcnkgcGxhbmUgaXMgcmUtZW5hYmxlZCBpZiBpdAogCQkgKiBoYXMgcHJldmlvdXNs eSBiZWVuIHR1cm5lZCBvZmYuCiAJCSAqLwotCQlwbGFuZV9zdGF0ZSA9IHRvX2ludGVsX3BsYW5l X3N0YXRlKHByaW1hcnktPnN0YXRlKTsKLQkJaWYgKHJldCA9PSAwICYmICF3YXNfdmlzaWJsZSAm JiBwbGFuZV9zdGF0ZS0+dmlzaWJsZSkgeworCQlpZiAocmV0ID09IDAgJiYgIXByaW1hcnlfcGxh bmVfd2FzX3Zpc2libGUgJiYKKwkJICAgIHByaW1hcnlfcGxhbmVfdmlzaWJsZShzZXQtPmNydGMp KSB7CiAJCQlXQVJOX09OKCFpbnRlbF9jcnRjLT5hY3RpdmUpOwogCQkJaW50ZWxfcG9zdF9lbmFi bGVfcHJpbWFyeShzZXQtPmNydGMpOwogCQl9Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK