From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 25/42] drm/i915: Remove use of crtc->config from
	intel_psr.c
Date: Mon, 11 May 2015 16:25:01 +0200
Message-ID: <1431354318-11995-26-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id AD11B6E3F4
 for <intel-gfx@lists.freedesktop.org>; 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: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4
LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyB8IDI1ICsr
KysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCsp
LCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCmluZGV4IDVlZTBmYTU3
ZWQxOS4uODY4ODE3NDAyYzExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtNzMsMTQg
KzczLDE1IEBAIHN0YXRpYyBib29sIHZsdl9pc19wc3JfYWN0aXZlX29uX3BpcGUoc3RydWN0IGRy
bV9kZXZpY2UgKmRldiwgaW50IHBpcGUpCiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX3Bzcl93cml0
ZV92c2Moc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKLQkJCQkgICAgc3RydWN0IGVkcF92c2Nf
cHNyICp2c2NfcHNyKQorCQkJCXN0cnVjdCBlZHBfdnNjX3BzciAqdnNjX3BzcikKIHsKIAlzdHJ1
Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2Rw
KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CiAJ
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlz
dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZGlnX3BvcnQtPmJhc2UuYmFz
ZS5jcnRjKTsKLQl1MzIgY3RsX3JlZyA9IEhTV19UVklERU9fRElQX0NUTChjcnRjLT5jb25maWct
PmNwdV90cmFuc2NvZGVyKTsKLQl1MzIgZGF0YV9yZWcgPSBIU1dfVFZJREVPX0RJUF9WU0NfREFU
QShjcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0
ZSAqcGlwZV9jb25maWcgPQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGRpZ19wb3J0LT5iYXNlLmJh
c2UuY3J0Yy0+c3RhdGUpOworCXUzMiBjdGxfcmVnID0gSFNXX1RWSURFT19ESVBfQ1RMKHBpcGVf
Y29uZmlnLT5jcHVfdHJhbnNjb2Rlcik7CisJdTMyIGRhdGFfcmVnID0gSFNXX1RWSURFT19ESVBf
VlNDX0RBVEEocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyKTsKIAl1aW50MzJfdCAqZGF0YSA9
ICh1aW50MzJfdCAqKSB2c2NfcHNyOwogCXVuc2lnbmVkIGludCBpOwogCkBAIC0yODIsMTMgKzI4
MywxMyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2VuYWJsZV9zb3VyY2Uoc3RydWN0IGludGVsX2Rw
ICppbnRlbF9kcCkKIAkJCQlFRFBfU1VfVFJBQ0tfRU5BQkxFIHwgRURQX1BTUjJfVFAyX1RJTUVf
MTAwKTsKIH0KIAotc3RhdGljIGJvb2wgaW50ZWxfcHNyX21hdGNoX2NvbmRpdGlvbnMoc3RydWN0
IGludGVsX2RwICppbnRlbF9kcCkKK3N0YXRpYyBib29sIGludGVsX3Bzcl9tYXRjaF9jb25kaXRp
b25zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCisJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9j
cnRjX3N0YXRlICpwaXBlX2NvbmZpZykKIHsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpk
aWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2ID0gZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBk
aWdfcG9ydC0+YmFzZS5iYXNlLmNydGM7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg
PSB0b19pbnRlbF9jcnRjKGNydGMpOwogCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYt
PnBzci5sb2NrKTsKIAlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19sb2NrZWQoJmRldi0+bW9kZV9j
b25maWcuY29ubmVjdGlvbl9tdXRleCkpOwpAQCAtMzA3LDE0ICszMDgsMTQgQEAgc3RhdGljIGJv
b2wgaW50ZWxfcHNyX21hdGNoX2NvbmRpdGlvbnMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkK
IAl9CiAKIAlpZiAoSVNfSEFTV0VMTChkZXYpICYmCi0JICAgIEk5MTVfUkVBRChIU1dfU1RFUkVP
XzNEX0NUTChpbnRlbF9jcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyKSkgJgorCSAgICBJOTE1
X1JFQUQoSFNXX1NURVJFT18zRF9DVEwocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyKSkgJgog
CQkgICAgICBTM0RfRU5BQkxFKSB7CiAJCURSTV9ERUJVR19LTVMoIlBTUiBjb25kaXRpb24gZmFp
bGVkOiBTdGVyZW8gM0QgaXMgRW5hYmxlZFxuIik7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKIAlp
ZiAoSVNfSEFTV0VMTChkZXYpICYmCi0JICAgIGludGVsX2NydGMtPmNvbmZpZy0+YmFzZS5hZGp1
c3RlZF9tb2RlLmZsYWdzICYgRFJNX01PREVfRkxBR19JTlRFUkxBQ0UpIHsKKwkgICAgcGlwZV9j
b25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNF
KSB7CiAJCURSTV9ERUJVR19LTVMoIlBTUiBjb25kaXRpb24gZmFpbGVkOiBJbnRlcmxhY2VkIGlz
IEVuYWJsZWRcbiIpOwogCQlyZXR1cm4gZmFsc2U7CiAJfQpAQCAtMzY0LDYgKzM2NSw4IEBAIHZv
aWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCXN0cnVjdCBk
cm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsKIAlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBp
bnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNl
LmNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJCXRvX2lu
dGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKIAlpZiAoIUhBU19QU1IoZGV2KSkg
ewogCQlEUk1fREVCVUdfS01TKCJQU1Igbm90IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtXG4i
KTsKQEAgLTM4MSw3ICszODQsNyBAQCB2b2lkIGludGVsX3Bzcl9lbmFibGUoc3RydWN0IGludGVs
X2RwICppbnRlbF9kcCkKIAkJZ290byB1bmxvY2s7CiAJfQogCi0JaWYgKCFpbnRlbF9wc3JfbWF0
Y2hfY29uZGl0aW9ucyhpbnRlbF9kcCkpCisJaWYgKCFpbnRlbF9wc3JfbWF0Y2hfY29uZGl0aW9u
cyhpbnRlbF9kcCwgcGlwZV9jb25maWcpKQogCQlnb3RvIHVubG9jazsKIAogCWRldl9wcml2LT5w
c3IuYnVzeV9mcm9udGJ1ZmZlcl9iaXRzID0gMDsKQEAgLTM5MSw4ICszOTQsOCBAQCB2b2lkIGlu
dGVsX3Bzcl9lbmFibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogCQlpZiAoZGV2X3By
aXYtPnBzci5wc3IyX3N1cHBvcnQpIHsKIAkJCS8qIFBTUjIgaXMgcmVzdHJpY3RlZCB0byB3b3Jr
IHdpdGggcGFuZWwgcmVzb2x1dGlvbnMgdXB0byAzMjAweDIwMDAgKi8KLQkJCWlmIChjcnRjLT5j
b25maWctPnBpcGVfc3JjX3cgPiAzMjAwIHx8Ci0JCQkJY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19o
ID4gMjAwMCkKKwkJCWlmIChwaXBlX2NvbmZpZy0+cGlwZV9zcmNfdyA+IDMyMDAgfHwKKwkJCQlw
aXBlX2NvbmZpZy0+cGlwZV9zcmNfaCA+IDIwMDApCiAJCQkJZGV2X3ByaXYtPnBzci5wc3IyX3N1
cHBvcnQgPSBmYWxzZTsKIAkJCWVsc2UKIAkJCQlza2xfcHNyX3NldHVwX3N1X3ZzYyhpbnRlbF9k
cCk7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK