From: Ander Conselvan de Oliveira Subject: [PATCH 2/3] drm/i915: Don't update staged config during force restore modesets Date: Fri, 12 Jun 2015 10:19:41 +0300 Message-ID: <1434093582-5824-3-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1434093582-5824-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EAD96E555 for ; Fri, 12 Jun 2015 00:19:58 -0700 (PDT) In-Reply-To: <1434093582-5824-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 VGhlIGZvcmNlIHJlc3RvcmUgcGF0aCByZWxpZXMgb24gdGhlIHN0YWdlZCBjb25maWcgdG8gcHJl c2VydmUgdGhlCmNvbmZpZ3VyYXRpb24gdXNlZCBiZWZvcmUgYSBzdXNwZW5kL3Jlc3VtZSBjeWNs ZS4gVGhlIHVwZGF0ZSBkb25lIHRvIGl0CmluIGludGVsX21vZGVzZXRfZml4dXBfc3RhdGUoKSB3 b3VsZCBjYXVzZSB0aGF0IGluZm9ybWF0aW9uIHRvIGJlIGxvc3QKYWZ0ZXIgdGhlIGZpcnN0IG1v ZGVzZXQsIG1ha2luZyBpdCBpbXBvc3NpYmxlIHRvIHJlc3RvcmUgdGhlIG1vZGVzIGZvcgpwaXBl cyBCIGFuZCBDLgoKUmVmZXJlbmNlczogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTA0NjgKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZl aXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDggKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IDZlZjU3ZTYuLjQ5YzY2OTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTExMzg2LDEwICsxMTM4Niw2IEBAIHN0YXRpYyB2b2lkIGludGVsX21v ZGVzZXRfZml4dXBfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQljcnRj LT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGU7CiAJCWNydGMtPmNvbmZp ZyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJfQotCi0JLyogQ29w eSB0aGUgbmV3IGNvbmZpZ3VyYXRpb24gdG8gdGhlIHN0YWdlZCBzdGF0ZSwgdG8ga2VlcCB0aGUg ZmV3Ci0JICogcGllY2VzIG9mIGNvZGUgdGhhdCBoYXZlbid0IGJlZW4gY29udmVydGVkIHlldCBo YXBweSAqLwotCWludGVsX21vZGVzZXRfdXBkYXRlX3N0YWdlZF9vdXRwdXRfc3RhdGUoc3RhdGUt PmRldik7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0xMjY1NCw4ICsxMjY1MCwxMCBAQCBzdGF0aWMg aW50IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAog CXJldCA9IF9faW50ZWxfc2V0X21vZGUoY3J0YywgcGlwZV9jb25maWcpOwogCi0JaWYgKHJldCA9 PSAwICYmIGNoZWNrKQorCWlmIChyZXQgPT0gMCAmJiBjaGVjaykgeworCQlpbnRlbF9tb2Rlc2V0 X3VwZGF0ZV9zdGFnZWRfb3V0cHV0X3N0YXRlKGNydGMtPmRldik7CiAJCWludGVsX21vZGVzZXRf Y2hlY2tfc3RhdGUoY3J0Yy0+ZGV2KTsKKwl9CiAKIAlyZXR1cm4gcmV0OwogfQotLSAKMi4xLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==