From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v4.1 6/8] drm/i915: Nuke fbc members from
 intel_crtc->atomic, v3.
Date: Mon, 29 Feb 2016 10:58:39 +0100
Message-ID: <56D4164F.4080205@linux.intel.com>
References: <1455108583-29227-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <1455108583-29227-7-git-send-email-maarten.lankhorst@linux.intel.com>
 <1455285409.2594.81.camel@intel.com> <56C1E135.20406@linux.intel.com>
 <1455815836.2576.64.camel@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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 3057A893AB
 for <intel-gfx@lists.freedesktop.org>; Mon, 29 Feb 2016 09:58:41 +0000 (UTC)
In-Reply-To: <1455815836.2576.64.camel@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: "Zanoni, Paulo R" <paulo.r.zanoni@intel.com>, "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

V2hlbmV2ZXIgdGhlcmUncyBhbiB1cGRhdGUgdG8gdGhlIHByaW1hcnkgcGxhbmUsCmZiY19wcmVf
dXBkYXRlIGFuZCBmYmNfcG9zdF91cGRhdGUgYXJlIGNhbGxlZC4gS2lsbCBvZmYKaW50ZWxfY3J0
Yy0+YXRvbWljLnVwZGF0ZV9mYmMgYW5kIG5vdyB0aGF0IGludGVsX2NydGMtPmF0b21pYwppcyBl
bXB0eSwga2lsbCBpdCBvZmYgdG9vLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBBZGQgYSBpbnRlbF9m
YmNfc3VwcG9ydHNfcm90YXRpb24gaGVscGVyLgpDaGFuZ2VzIHNpbmVjIHYyOgotIFJlbW92ZSBp
bnRlbF9mYmNfc3VwcG9ydHNfcm90YXRpb25faGVscGVyLgotIFJlbW92ZSB1bnJlbGF0ZWQgY2hh
bmdlcy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz
dEBsaW51eC5pbnRlbC5jb20+Ci0tLQpUaGlzIHZlcnNpb24gZG9lc24ndCBjaGFuZ2UgaW50ZWxf
ZmJjX2VuYWJsZSBhbnkgbW9yZSEKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k
ZXggNzhmNzJiZWYyNWFhLi5jODQwNDA5MmFlZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMKQEAgLTQ3ODksMTEgKzQ3ODksOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3Bs
YW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CiAJ
c3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRlLT5i
YXNlLmNydGMpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUgPSBvbGRfY3J0
Y19zdGF0ZS0+YmFzZS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICph
dG9taWMgPSAmY3J0Yy0+YXRvbWljOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv
bmZpZyA9CiAJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0
IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9wbGFuZSAqcHJp
bWFyeSA9IGNydGMtPmJhc2UucHJpbWFyeTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRf
cHJpX3N0YXRlID0KIAkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUob2xkX3N0
YXRlLCBwcmltYXJ5KTsKQEAgLTQ4MDUsMjIgKzQ4MDMsMTkgQEAgc3RhdGljIHZvaWQgaW50ZWxf
cG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl
KQogCWlmIChwaXBlX2NvbmZpZy0+d21fY2hhbmdlZCAmJiBwaXBlX2NvbmZpZy0+YmFzZS5hY3Rp
dmUpCiAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRjLT5iYXNlKTsKIAotCWlmIChhdG9t
aWMtPnVwZGF0ZV9mYmMpCi0JCWludGVsX2ZiY19wb3N0X3VwZGF0ZShjcnRjKTsKLQogCWlmIChv
bGRfcHJpX3N0YXRlKSB7CiAJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpbWFyeV9zdGF0
ZSA9CiAJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7CiAJCXN0cnVjdCBp
bnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3ByaW1hcnlfc3RhdGUgPQogCQkJdG9faW50ZWxfcGxhbmVf
c3RhdGUob2xkX3ByaV9zdGF0ZSk7CiAKKwkJaW50ZWxfZmJjX3Bvc3RfdXBkYXRlKGNydGMpOwor
CiAJCWlmIChwcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCiAJCSAgICAobmVlZHNfbW9kZXNldCgm
cGlwZV9jb25maWctPmJhc2UpIHx8CiAJCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxl
KSkKIAkJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwogCX0KLQotCW1l
bXNldChhdG9taWMsIDAsIHNpemVvZigqYXRvbWljKSk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVs
X3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl
KQpAQCAtNDgyOCw3ICs0ODIzLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0
ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJc3RydWN0IGludGVs
X2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRlLT5iYXNlLmNydGMpOwog
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9j
cnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CiAJc3RydWN0IGludGVs
X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5i
YXNlLnN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlID0gb2xkX2Ny
dGNfc3RhdGUtPmJhc2Uuc3RhdGU7CkBAIC00ODM3LDE1ICs0ODMxLDE0IEBAIHN0YXRpYyB2b2lk
IGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRj
X3N0YXRlKQogCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUs
IHByaW1hcnkpOwogCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5i
YXNlKTsKIAotCWlmIChhdG9taWMtPnVwZGF0ZV9mYmMpCi0JCWludGVsX2ZiY19wcmVfdXBkYXRl
KGNydGMpOwotCiAJaWYgKG9sZF9wcmlfc3RhdGUpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0
YXRlICpwcmltYXJ5X3N0YXRlID0KIAkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0
YXRlKTsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcHJpbWFyeV9zdGF0ZSA9CiAJ
CQl0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfcHJpX3N0YXRlKTsKIAorCQlpbnRlbF9mYmNfcHJl
X3VwZGF0ZShjcnRjKTsKKwogCQlpZiAob2xkX3ByaW1hcnlfc3RhdGUtPnZpc2libGUgJiYKIAkJ
ICAgIChtb2Rlc2V0IHx8ICFwcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkKIAkJCWludGVsX3ByZV9k
aXNhYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwpAQCAtMTE4NzcsMjcgKzExODcwLDE3IEBAIGlu
dCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq
Y3J0Y19zdGF0ZSwKIAlpZiAodmlzaWJsZSB8fCB3YXNfdmlzaWJsZSkKIAkJcGlwZV9jb25maWct
PmZiX2JpdHMgfD0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5mcm9udGJ1ZmZlcl9iaXQ7CiAKLQlz
d2l0Y2ggKHBsYW5lLT50eXBlKSB7Ci0JY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgotCQlp
bnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2ZiYyA9IHRydWU7Ci0KLQkJYnJlYWs7Ci0JY2FzZSBE
Uk1fUExBTkVfVFlQRV9DVVJTT1I6Ci0JCWJyZWFrOwotCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZF
UkxBWToKLQkJLyoKLQkJICogV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2FsaW5nOml2YgotCQkg
KgotCQkgKiBjc3RhdGUtPnVwZGF0ZV93bSB3YXMgYWxyZWFkeSBzZXQgYWJvdmUsIHNvIHRoaXMg
ZmxhZyB3aWxsCi0JCSAqIHRha2UgZWZmZWN0IHdoZW4gd2UgY29tbWl0IGFuZCBwcm9ncmFtIHdh
dGVybWFya3MuCi0JCSAqLwotCQlpZiAoSVNfSVZZQlJJREdFKGRldikgJiYKLQkJICAgIG5lZWRz
X3NjYWxpbmcodG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSAmJgotCQkgICAgIW5l
ZWRzX3NjYWxpbmcob2xkX3BsYW5lX3N0YXRlKSkKLQkJCXBpcGVfY29uZmlnLT5kaXNhYmxlX2xw
X3dtID0gdHJ1ZTsKKwkvKgorCSAqIFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIK
KwkgKgorCSAqIGNzdGF0ZS0+dXBkYXRlX3dtIHdhcyBhbHJlYWR5IHNldCBhYm92ZSwgc28gdGhp
cyBmbGFnIHdpbGwKKwkgKiB0YWtlIGVmZmVjdCB3aGVuIHdlIGNvbW1pdCBhbmQgcHJvZ3JhbSB3
YXRlcm1hcmtzLgorCSAqLworCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVS
TEFZICYmIElTX0lWWUJSSURHRShkZXYpICYmCisJICAgIG5lZWRzX3NjYWxpbmcodG9faW50ZWxf
cGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSAmJgorCSAgICAhbmVlZHNfc2NhbGluZyhvbGRfcGxh
bmVfc3RhdGUpKQorCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9scF93bSA9IHRydWU7CiAKLQkJYnJl
YWs7Ci0JfQogCXJldHVybiAwOwogfQogCkBAIC0xMzI5Niw5ICsxMzI3OSw2IEBAIHN0YXRpYyBp
bnQgaW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBp
bnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CiAJCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNy
dGNfc3RhdGUpOwogCi0JCW1lbXNldCgmdG9faW50ZWxfY3J0YyhjcnRjKS0+YXRvbWljLCAwLAot
CQkgICAgICAgc2l6ZW9mKHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQpKTsKLQogCQkv
KiBDYXRjaCBJOTE1X01PREVfRkxBR19JTkhFUklURUQgKi8KIAkJaWYgKGNydGNfc3RhdGUtPm1v
ZGUucHJpdmF0ZV9mbGFncyAhPSBjcnRjLT5zdGF0ZS0+bW9kZS5wcml2YXRlX2ZsYWdzKQogCQkJ
Y3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKQEAgLTEzNjA2LDcgKzEzNTg2LDggQEAg
c3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ
CWlmICghbW9kZXNldCkKIAkJCWludGVsX3ByZV9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19z
dGF0ZShjcnRjX3N0YXRlKSk7CiAKLQkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUgJiYgaW50ZWxf
Y3J0Yy0+YXRvbWljLnVwZGF0ZV9mYmMpCisJCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlICYmCisJ
CSAgICBkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0Yy0+cHJp
bWFyeSkpCiAJCQlpbnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMpOwogCiAJCWlmIChjcnRjLT5z
dGF0ZS0+YWN0aXZlICYmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDA1OGJiMTBlNTNh
ZS4uNWU1YjY0ZmZmMzBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTM4LDE5ICs1
MzgsNiBAQCBzdHJ1Y3QgaW50ZWxfbW1pb19mbGlwIHsKIAl1bnNpZ25lZCBpbnQgcm90YXRpb247
CiB9OwogCi0vKgotICogVHJhY2tpbmcgb2Ygb3BlcmF0aW9ucyB0aGF0IG5lZWQgdG8gYmUgcGVy
Zm9ybWVkIGF0IHRoZSBiZWdpbm5pbmcvZW5kIG9mIGFuCi0gKiBhdG9taWMgY29tbWl0LCBvdXRz
aWRlIHRoZSBhdG9taWMgc2VjdGlvbiB3aGVyZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KLSAq
IFRoZXNlIGFyZSBnZW5lcmFsbHkgb3BlcmF0aW9ucyB0aGF0IGdyYWIgbXV0ZXhlcyBvciBtaWdo
dCBvdGhlcndpc2Ugc2xlZXAKLSAqIGFuZCB0aHVzIGNhbid0IGJlIHJ1biB3aXRoIGludGVycnVw
dHMgZGlzYWJsZWQuCi0gKi8KLXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewotCS8q
IFNsZWVwYWJsZSBvcGVyYXRpb25zIHRvIHBlcmZvcm0gYmVmb3JlIGNvbW1pdCAqLwotCi0JLyog
U2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBhZnRlciBjb21taXQgKi8KLQlib29sIHVw
ZGF0ZV9mYmM7Ci19OwotCiBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJc3RydWN0IGRybV9jcnRjIGJh
c2U7CiAJZW51bSBwaXBlIHBpcGU7CkBAIC02MTAsOCArNTk3LDYgQEAgc3RydWN0IGludGVsX2Ny
dGMgewogCQlpbnQgc2NhbmxpbmVfc3RhcnQ7CiAJfSBkZWJ1ZzsKIAotCXN0cnVjdCBpbnRlbF9j
cnRjX2F0b21pY19jb21taXQgYXRvbWljOwotCiAJLyogc2NhbGVycyBhdmFpbGFibGUgb24gdGhp
cyBjcnRjICovCiAJaW50IG51bV9zY2FsZXJzOwogCgpfX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs
aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK