From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v4 6/8] drm/i915: Nuke fbc members from
	intel_crtc->atomic, v2.
Date: Wed, 10 Feb 2016 13:49:41 +0100
Message-ID: <1455108583-29227-7-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1455108583-29227-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 ESMTPS id D1B376E6C3
 for <intel-gfx@lists.freedesktop.org>; Wed, 10 Feb 2016 04:49:49 -0800 (PST)
In-Reply-To: <1455108583-29227-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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
List-Id: intel-gfx@lists.freedesktop.org

RmFjdG9yIG91dCBpbnRlbF9mYmNfc3VwcG9ydHNfcm90YXRpb24gYW5kIHVzZSBpdCBpbgpwcmVf
cGxhbmVfdXBkYXRlIGFzIHdlbGwuIFRoaXMgbGVhdmVzIGludGVsX2NydGMtPmF0b21pYwplbXB0
eSwgc28gcmVtb3ZlIGl0IHRvby4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gQWRkIGEgaW50ZWxfZmJj
X3N1cHBvcnRzX3JvdGF0aW9uIGhlbHBlci4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv
cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTggKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAxNSAtLS0t
LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDUzIGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1NGJlOGEyNTVmMWYuLjAw
Y2IyNjFjNjc4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDc4Miwx
MSArNDc4Miw5IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKHN0cnVjdCBp
bnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0YyA9IHRvX2ludGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0
IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSA9IG9sZF9jcnRjX3N0YXRlLT5iYXNlLnN0YXRl
OwotCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9t
aWM7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJdG9faW50ZWxf
Y3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g
Y3J0Yy0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2
LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+YmFzZS5w
cmltYXJ5OwogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmlfc3RhdGUgPQogCQlkcm1f
YXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHByaW1hcnkpOwpAQCAt
NDc5OCwyMiArNDc5NiwxOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShz
dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJaWYgKHBpcGVfY29uZmln
LT53bV9jaGFuZ2VkICYmIHBpcGVfY29uZmlnLT5iYXNlLmFjdGl2ZSkKIAkJaW50ZWxfdXBkYXRl
X3dhdGVybWFya3MoJmNydGMtPmJhc2UpOwogCi0JaWYgKGF0b21pYy0+dXBkYXRlX2ZiYykKLQkJ
aW50ZWxfZmJjX3Bvc3RfdXBkYXRlKGNydGMpOwotCiAJaWYgKG9sZF9wcmlfc3RhdGUpIHsKIAkJ
c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmltYXJ5X3N0YXRlID0KIAkJCXRvX2ludGVsX3Bs
YW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpv
bGRfcHJpbWFyeV9zdGF0ZSA9CiAJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfcHJpX3N0YXRl
KTsKIAorCQlpbnRlbF9mYmNfcG9zdF91cGRhdGUoY3J0Yyk7CisKIAkJaWYgKHByaW1hcnlfc3Rh
dGUtPnZpc2libGUgJiYKIAkJICAgIChuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkg
fHwKIAkJICAgICAhb2xkX3ByaW1hcnlfc3RhdGUtPnZpc2libGUpKQogCQkJaW50ZWxfcG9zdF9l
bmFibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7CiAJfQotCi0JbWVtc2V0KGF0b21pYywgMCwgc2l6
ZW9mKCphdG9taWMpKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShz
dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCkBAIC00ODIxLDcgKzQ4MTYs
NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRj
X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2lu
dGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRybV9kZXZpY2Ug
KmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCAq
YXRvbWljID0gJmNydGMtPmF0b21pYzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j
b25maWcgPQogCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOwogCXN0cnVj
dCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUgPSBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0
ZTsKQEAgLTQ4MzAsMTcgKzQ4MjQsMTcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3Vw
ZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJCWRybV9hdG9t
aWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwgcHJpbWFyeSk7CiAJYm9vbCBt
b2Rlc2V0ID0gbmVlZHNfbW9kZXNldCgmcGlwZV9jb25maWctPmJhc2UpOwogCi0JaWYgKGF0b21p
Yy0+dXBkYXRlX2ZiYykKLQkJaW50ZWxfZmJjX3ByZV91cGRhdGUoY3J0Yyk7Ci0KIAlpZiAob2xk
X3ByaV9zdGF0ZSkgewogCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaW1hcnlfc3RhdGUg
PQogCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocHJpbWFyeS0+c3RhdGUpOwogCQlzdHJ1Y3QgaW50
ZWxfcGxhbmVfc3RhdGUgKm9sZF9wcmltYXJ5X3N0YXRlID0KIAkJCXRvX2ludGVsX3BsYW5lX3N0
YXRlKG9sZF9wcmlfc3RhdGUpOworCQlib29sIHR1cm5fb2ZmID0gb2xkX3ByaW1hcnlfc3RhdGUt
PnZpc2libGUgJiYKKwkJICAgIChtb2Rlc2V0IHx8ICFwcmltYXJ5X3N0YXRlLT52aXNpYmxlKTsK
KworCQlpbnRlbF9mYmNfcHJlX3VwZGF0ZShjcnRjKTsKIAotCQlpZiAob2xkX3ByaW1hcnlfc3Rh
dGUtPnZpc2libGUgJiYKLQkJICAgIChtb2Rlc2V0IHx8ICFwcmltYXJ5X3N0YXRlLT52aXNpYmxl
KSkKKwkJaWYgKHR1cm5fb2ZmKQogCQkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+
YmFzZSk7CiAJfQogCkBAIC0xMTgyMiwyNyArMTE4MTYsMTcgQEAgaW50IGludGVsX3BsYW5lX2F0
b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCWlm
ICh2aXNpYmxlIHx8IHdhc192aXNpYmxlKQogCQlwaXBlX2NvbmZpZy0+ZmJfYml0cyB8PSB0b19p
bnRlbF9wbGFuZShwbGFuZSktPmZyb250YnVmZmVyX2JpdDsKIAotCXN3aXRjaCAocGxhbmUtPnR5
cGUpIHsKLQljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Ci0JCWludGVsX2NydGMtPmF0b21p
Yy51cGRhdGVfZmJjID0gdHJ1ZTsKLQotCQlicmVhazsKLQljYXNlIERSTV9QTEFORV9UWVBFX0NV
UlNPUjoKLQkJYnJlYWs7Ci0JY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgotCQkvKgotCQkg
KiBXYUN4U1JEaXNhYmxlZEZvclNwcml0ZVNjYWxpbmc6aXZiCi0JCSAqCi0JCSAqIGNzdGF0ZS0+
dXBkYXRlX3dtIHdhcyBhbHJlYWR5IHNldCBhYm92ZSwgc28gdGhpcyBmbGFnIHdpbGwKLQkJICog
dGFrZSBlZmZlY3Qgd2hlbiB3ZSBjb21taXQgYW5kIHByb2dyYW0gd2F0ZXJtYXJrcy4KLQkJICov
Ci0JCWlmIChJU19JVllCUklER0UoZGV2KSAmJgotCQkgICAgbmVlZHNfc2NhbGluZyh0b19pbnRl
bF9wbGFuZV9zdGF0ZShwbGFuZV9zdGF0ZSkpICYmCi0JCSAgICAhbmVlZHNfc2NhbGluZyhvbGRf
cGxhbmVfc3RhdGUpKQotCQkJcGlwZV9jb25maWctPmRpc2FibGVfbHBfd20gPSB0cnVlOworCS8q
CisJICogV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2FsaW5nOml2YgorCSAqCisJICogY3N0YXRl
LT51cGRhdGVfd20gd2FzIGFscmVhZHkgc2V0IGFib3ZlLCBzbyB0aGlzIGZsYWcgd2lsbAorCSAq
IHRha2UgZWZmZWN0IHdoZW4gd2UgY29tbWl0IGFuZCBwcm9ncmFtIHdhdGVybWFya3MuCisJICov
CisJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkgJiYgSVNfSVZZQlJJ
REdFKGRldikgJiYKKwkgICAgbmVlZHNfc2NhbGluZyh0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFu
ZV9zdGF0ZSkpICYmCisJICAgICFuZWVkc19zY2FsaW5nKG9sZF9wbGFuZV9zdGF0ZSkpCisJCXBp
cGVfY29uZmlnLT5kaXNhYmxlX2xwX3dtID0gdHJ1ZTsKIAotCQlicmVhazsKLQl9CiAJcmV0dXJu
IDA7CiB9CiAKQEAgLTEzMjQxLDkgKzEzMjI1LDYgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNf
Y2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJc3RydWN0IGludGVsX2NydGNfc3RhdGUg
KnBpcGVfY29uZmlnID0KIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSk7CiAKLQkJ
bWVtc2V0KCZ0b19pbnRlbF9jcnRjKGNydGMpLT5hdG9taWMsIDAsCi0JCSAgICAgICBzaXplb2Yo
c3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCkpOwotCiAJCS8qIENhdGNoIEk5MTVfTU9E
RV9GTEFHX0lOSEVSSVRFRCAqLwogCQlpZiAoY3J0Y19zdGF0ZS0+bW9kZS5wcml2YXRlX2ZsYWdz
ICE9IGNydGMtPnN0YXRlLT5tb2RlLnByaXZhdGVfZmxhZ3MpCiAJCQljcnRjX3N0YXRlLT5tb2Rl
X2NoYW5nZWQgPSB0cnVlOwpAQCAtMTM1MjgsMTIgKzEzNTA5LDEzIEBAIHN0YXRpYyBpbnQgaW50
ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoIW1vZGVzZXQp
CiAJCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0
ZSkpOwogCi0JCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlICYmIGludGVsX2NydGMtPmF0b21pYy51
cGRhdGVfZmJjKQorCQlpZiAoKG1vZGVzZXQgfHwgdXBkYXRlX3BpcGUpICYmIGNydGMtPnN0YXRl
LT5hY3RpdmUpCiAJCQlpbnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMpOwogCiAJCWlmIChjcnRj
LT5zdGF0ZS0+YWN0aXZlICYmCi0JCSAgICAoY3J0Yy0+c3RhdGUtPnBsYW5lc19jaGFuZ2VkIHx8
IHVwZGF0ZV9waXBlKSkKKwkJICAgIChjcnRjLT5zdGF0ZS0+cGxhbmVzX2NoYW5nZWQgfHwgdXBk
YXRlX3BpcGUpKSB7CiAJCQlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGMo
Y3J0Y19zdGF0ZSk7CisJCX0KIAogCQlpZiAocGlwZV9jb25maWctPmJhc2UuYWN0aXZlICYmCiAJ
CSAgICAocGlwZV9jb25maWctPndtX2NoYW5nZWQgfHwgcGlwZV9jb25maWctPmRpc2FibGVfY3hz
ciB8fApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA4MDM1OTFkMWU2MTMuLjhlZmZiOWVj
ZTIxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTUzOCwxOSArNTM4LDYgQEAgc3Ry
dWN0IGludGVsX21taW9fZmxpcCB7CiAJdW5zaWduZWQgaW50IHJvdGF0aW9uOwogfTsKIAotLyoK
LSAqIFRyYWNraW5nIG9mIG9wZXJhdGlvbnMgdGhhdCBuZWVkIHRvIGJlIHBlcmZvcm1lZCBhdCB0
aGUgYmVnaW5uaW5nL2VuZCBvZiBhbgotICogYXRvbWljIGNvbW1pdCwgb3V0c2lkZSB0aGUgYXRv
bWljIHNlY3Rpb24gd2hlcmUgaW50ZXJydXB0cyBhcmUgZGlzYWJsZWQuCi0gKiBUaGVzZSBhcmUg
Z2VuZXJhbGx5IG9wZXJhdGlvbnMgdGhhdCBncmFiIG11dGV4ZXMgb3IgbWlnaHQgb3RoZXJ3aXNl
IHNsZWVwCi0gKiBhbmQgdGh1cyBjYW4ndCBiZSBydW4gd2l0aCBpbnRlcnJ1cHRzIGRpc2FibGVk
LgotICovCi1zdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKLQkvKiBTbGVlcGFibGUg
b3BlcmF0aW9ucyB0byBwZXJmb3JtIGJlZm9yZSBjb21taXQgKi8KLQotCS8qIFNsZWVwYWJsZSBv
cGVyYXRpb25zIHRvIHBlcmZvcm0gYWZ0ZXIgY29tbWl0ICovCi0JYm9vbCB1cGRhdGVfZmJjOwot
fTsKLQogc3RydWN0IGludGVsX2NydGMgewogCXN0cnVjdCBkcm1fY3J0YyBiYXNlOwogCWVudW0g
cGlwZSBwaXBlOwpAQCAtNjEwLDggKzU5Nyw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAkJaW50
IHNjYW5saW5lX3N0YXJ0OwogCX0gZGVidWc7CiAKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNf
Y29tbWl0IGF0b21pYzsKLQogCS8qIHNjYWxlcnMgYXZhaWxhYmxlIG9uIHRoaXMgY3J0YyAqLwog
CWludCBudW1fc2NhbGVyczsKIAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp
c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2ludGVsLWdmeAo=