From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 14/42] drm/i915: Make __intel_set_mode() take only atomic state as argument Date: Mon, 11 May 2015 16:24:50 +0200 Message-ID: <1431354318-11995-15-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-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: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A6BB6E407 for ; Mon, 11 May 2015 07:25:44 -0700 (PDT) In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.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 RnJvbTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xp dmVpcmFAaW50ZWwuY29tPgoKVGhlIGxhc3QgcmVtYWluaW5nIHBvcnRpb24gdGhhdCByZXF1aXJl ZCB0aGUgbW9kZXNldF9jcnRjIGFyZ3VtZW50IGlzCmNvbnZlcnRlZCB0byBkZWFsIHdpdGggYWxs IGNydGNzIGluIHRoZSBzdGF0ZSB0aGF0IG5lZWRfbW9kZXNldCgpLiBCeQpkb2luZyB0aGF0LCBf X2ludGVsX3NldF9tb2RlKCkgaXMgZ2VuZXJpYyBlbm91Z2gsIGJlaGF2aW5nIGxpa2UgYSBjb21t aXQKZnVuY3Rpb24gZm9yIHRoZSBhdG9taWMgc3RhdGUuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVu IExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDkgKysrLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMyBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCAwNDU5MTBiMzZiYmYuLjcyMjYyZTczMDEzZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTE1MTAsNyArMTE1MTAsNiBAQCBpbnRlbF9t b2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCX0g ZWxzZQogCQkJY29ubmVjdG9yLT5kcG1zID0gRFJNX01PREVfRFBNU19PRkY7CiAJfQotCiB9CiAK IHN0YXRpYyBib29sIGludGVsX2Z1enp5X2Nsb2NrX2NoZWNrKGludCBjbG9jazEsIGludCBjbG9j azIpCkBAIC0xMjI0NywxMiArMTIyNDYsMTAgQEAgc3RhdGljIHZvaWQgX19pbnRlbF9zZXRfbW9k ZV9jbGVhbnVwX3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWRybV9hdG9taWNfaGVs cGVyX2NsZWFudXBfcGxhbmVzKGRldiwgb2xkX3N0YXRlKTsKIH0KIAotc3RhdGljIGludCBfX2lu dGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqbW9kZXNldF9jcnRjLAotCQkJICAgIHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKK3N0YXRpYyBpbnQgX19pbnRlbF9zZXRf bW9kZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IG1vZGVzZXRfY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBz dGF0ZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gcGlwZV9jb25maWct PmJhc2Uuc3RhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCXN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqb2xkX2NydGNfc3RhdGU7CiAJaW50IHJldDsKQEAgLTEyMzI1LDcgKzEyMzIyLDcgQEAg c3RhdGljIGludCBpbnRlbF9zZXRfbW9kZV93aXRoX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiB7CiAJaW50IHJldDsKIAotCXJldCA9IF9faW50ZWxfc2V0X21vZGUoY3J0YywgcGlwZV9j b25maWcpOworCXJldCA9IF9faW50ZWxfc2V0X21vZGUocGlwZV9jb25maWctPmJhc2Uuc3RhdGUp OwogCiAJaWYgKHJldCA9PSAwKQogCQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKGNydGMtPmRl dik7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK