From: Ander Conselvan de Oliveira Subject: [PATCH 4/7] drm/i915: Use local pipe_config varariable when available Date: Thu, 15 Jan 2015 14:55:24 +0200 Message-ID: <1421326527-24906-5-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1421326527-24906-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 847E86E142 for ; Thu, 15 Jan 2015 04:55:38 -0800 (PST) In-Reply-To: <1421326527-24906-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 SW4gZnVuY3Rpb25zIHRoYXQgZGVmaW5lIGEgbG9jYWwgcGlwZV9jb25maWcgdmFyaWFibGUgdG8g cG9pbnQgdG8KY3J0Yy0+Y29uZmlnLCByZXBsYWNlIHJlbWFpbmluZyByZWZlcmVuY2VzIHRvIGNy dGMtPmNvbmZpZyB3aXRoCnRoZSBsb2NhbCB2YXJpYWJsZS4gVGhpcyBtYWtlcyB0aGUgY29kZSBt b3JlIGNvbnNpc3RlbnQgYW5kIGVhc2llcgp0byBjaGFuZ2UgaW4gYW4gYXV0b21hdGVkIG1hbm5l ci4KClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29u c2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgfCA2ICsrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygr KSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg MzBmMGUyOC4uZDJkNmRmZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt NDYwNSw3ICs0NjA1LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9wZml0X2VuYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9ICZj cnRjLT5jb25maWc7CiAKLQlpZiAoIWNydGMtPmNvbmZpZy5nbWNoX3BmaXQuY29udHJvbCkKKwlp ZiAoIXBpcGVfY29uZmlnLT5nbWNoX3BmaXQuY29udHJvbCkKIAkJcmV0dXJuOwogCiAJLyoKQEAg LTU5MjgsNyArNTkyOCw3IEBAIHN0YXRpYyB2b2lkIHZsdl9wcmVwYXJlX3BsbChzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAkJdmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QTExf RFcxMChwaXBlKSwKIAkJCQkgMHgwMGQwMDAwZik7CiAKLQlpZiAoY3J0Yy0+Y29uZmlnLmhhc19k cF9lbmNvZGVyKSB7CisJaWYgKHBpcGVfY29uZmlnLT5oYXNfZHBfZW5jb2RlcikgewogCQkvKiBV c2UgU1NDIHNvdXJjZSAqLwogCQlpZiAocGlwZSA9PSBQSVBFX0EpCiAJCQl2bHZfZHBpb193cml0 ZShkZXZfcHJpdiwgcGlwZSwgVkxWX1BMTF9EVzUocGlwZSksCkBAIC03NTQ0LDcgKzc1NDQsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9jcHVfdHJhbnNjb2Rlcl9nZXRfbV9uKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjLAogdm9pZCBpbnRlbF9kcF9nZXRfbV9uKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAogCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpCiB7Ci0JaWYg KGNydGMtPmNvbmZpZy5oYXNfcGNoX2VuY29kZXIpCisJaWYgKHBpcGVfY29uZmlnLT5oYXNfcGNo X2VuY29kZXIpCiAJCWludGVsX3BjaF90cmFuc2NvZGVyX2dldF9tX24oY3J0YywgJnBpcGVfY29u ZmlnLT5kcF9tX24pOwogCWVsc2UKIAkJaW50ZWxfY3B1X3RyYW5zY29kZXJfZ2V0X21fbihjcnRj LCBwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXIsCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK