From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville Syrjala <ville.syrjala@linux.intel.com>
Subject: [PATCH 10/13] drm/i915: Move skl plane fb related
 checks into a better place
Date: Fri,  7 Sep 2018 18:24:10 +0300
Message-ID: <20180907152413.15761-11-ville.syrjala@linux.intel.com>
References: <20180907152413.15761-1-ville.syrjala@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 mga05.intel.com (mga05.intel.com [192.55.52.43])
 by gabe.freedesktop.org (Postfix) with ESMTPS id CAEB06E955
 for <intel-gfx@lists.freedesktop.org>; Fri,  7 Sep 2018 15:25:06 +0000 (UTC)
In-Reply-To: <20180907152413.15761-1-ville.syrjala@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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v
dmUgdGhlIHNrbCsgc3BlY2lmaWMgZnJhbWVidWZmZXIgcmVsYXRlZCBjaGVja3MgZnJvbQppbnRl
bF9wbGFuZV9hdG9taWNfY2hlY2tfd2l0aF9zdGF0ZSgpIGludG8gYSBuZXcgZnVuY3Rpb24KKHNr
bF9wbGFuZV9jaGVja19mYigpKSB3aGljaCB3ZSdsbCBzaW1wbHkgY2FsbCBmcm9tIHRoZSBza2wK
cGxhbmUtPmNoZWNrKCkgaG9vay4KCnYyOiBTcGxpdCBvdXQgdGhlIFkvWWYrQ0NTIHZzLiBpbnRl
cmxhY2VkIGNoYW5nZSAoSm9zw6kpCgpSZXZpZXdlZC1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6
YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8
dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfYXRvbWljX3BsYW5lLmMgfCA0NCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgIHwgMTIgLS0tLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgICAgICB8IDY2ICsrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs
YW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCBm
YTdkZjVmZTE1NGIuLjdjMDg3MzA2MDkzNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
YXRvbWljX3BsYW5lLmMKQEAgLTExNiw0MCArMTE2LDExIEBAIGludCBpbnRlbF9wbGFuZV9hdG9t
aWNfY2hlY2tfd2l0aF9zdGF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2Ny
dGNfCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+
ZGV2KTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSA9ICZpbnRlbF9zdGF0ZS0+YmFz
ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxh
bmUpOwotCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KLQkJ
JmNydGNfc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAlpbnQgcmV0OwogCiAJaWYgKCFpbnRl
bF9zdGF0ZS0+YmFzZS5jcnRjICYmICFvbGRfcGxhbmVfc3RhdGUtPmJhc2UuY3J0YykKIAkJcmV0
dXJuIDA7CiAKLQlpZiAoc3RhdGUtPmZiICYmIGRybV9yb3RhdGlvbl85MF9vcl8yNzAoc3RhdGUt
PnJvdGF0aW9uKSkgewotCQlzdHJ1Y3QgZHJtX2Zvcm1hdF9uYW1lX2J1ZiBmb3JtYXRfbmFtZTsK
LQotCQlpZiAoc3RhdGUtPmZiLT5tb2RpZmllciAhPSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCAm
JgotCQkgICAgc3RhdGUtPmZiLT5tb2RpZmllciAhPSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQp
IHsKLQkJCURSTV9ERUJVR19LTVMoIlkvWWYgdGlsaW5nIHJlcXVpcmVkIGZvciA5MC8yNzAhXG4i
KTsKLQkJCXJldHVybiAtRUlOVkFMOwotCQl9Ci0KLQkJLyoKLQkJICogOTAvMjcwIGlzIG5vdCBh
bGxvd2VkIHdpdGggUkdCNjQgMTY6MTY6MTY6MTYsCi0JCSAqIFJHQiAxNi1iaXQgNTo2OjUsIGFu
ZCBJbmRleGVkIDgtYml0LgotCQkgKiBUQkQ6IEFkZCBSR0I2NCBjYXNlIG9uY2UgaXRzIGFkZGVk
IGluIHN1cHBvcnRlZCBmb3JtYXQgbGlzdC4KLQkJICovCi0JCXN3aXRjaCAoc3RhdGUtPmZiLT5m
b3JtYXQtPmZvcm1hdCkgewotCQljYXNlIERSTV9GT1JNQVRfQzg6Ci0JCWNhc2UgRFJNX0ZPUk1B
VF9SR0I1NjU6Ci0JCQlEUk1fREVCVUdfS01TKCJVbnN1cHBvcnRlZCBwaXhlbCBmb3JtYXQgJXMg
Zm9yIDkwLzI3MCFcbiIsCi0JCQkgICAgICAgICAgICAgIGRybV9nZXRfZm9ybWF0X25hbWUoc3Rh
dGUtPmZiLT5mb3JtYXQtPmZvcm1hdCwKLQkJCSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAmZm9ybWF0X25hbWUpKTsKLQkJCXJldHVybiAtRUlOVkFMOwotCi0JCWRlZmF1bHQ6Ci0J
CQlicmVhazsKLQkJfQotCX0KLQogCS8qIENIViBpZ25vcmVzIHRoZSBtaXJyb3IgYml0IHdoZW4g
dGhlIHJvdGF0ZSBiaXQgaXMgc2V0IDooICovCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYp
ICYmCiAJICAgIHN0YXRlLT5yb3RhdGlvbiAmIERSTV9NT0RFX1JPVEFURV8xODAgJiYKQEAgLTE2
MywyMSArMTM0LDYgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKGNv
bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y18KIAlpZiAocmV0KQogCQlyZXR1
cm4gcmV0OwogCi0JLyoKLQkgKiBZLXRpbGluZyBpcyBub3Qgc3VwcG9ydGVkIGluIElGLUlEIElu
dGVybGFjZSBtb2RlIGluCi0JICogR0VOOSBhbmQgYWJvdmUuCi0JICovCi0JaWYgKHN0YXRlLT5m
YiAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkgJiYgY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUg
JiYKLQkgICAgYWRqdXN0ZWRfbW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSkg
ewotCQlpZiAoc3RhdGUtPmZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8
fAotCQkgICAgc3RhdGUtPmZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQg
fHwKLQkJICAgIHN0YXRlLT5mYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRURf
Q0NTIHx8Ci0JCSAgICBzdGF0ZS0+ZmItPm1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZZl9U
SUxFRF9DQ1MpIHsKLQkJCURSTV9ERUJVR19LTVMoIlkvWWYgdGlsaW5nIG5vdCBzdXBwb3J0ZWQg
aW4gSUYtSUQgbW9kZVxuIik7Ci0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCX0KLQogCS8qIEZJ
WE1FIHByZS1nNHggZG9uJ3Qgd29yayBsaWtlIHRoaXMgKi8KIAlpZiAoc3RhdGUtPnZpc2libGUp
CiAJCWNydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMgfD0gQklUKGludGVsX3BsYW5lLT5pZCk7CmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYWRiYjhlNmQ4ZDM5Li5hODA3MmM3
OGMxNzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMxNTUsMTIgKzMx
NTUsNiBAQCBzdGF0aWMgaW50IHNrbF9jaGVja19jY3NfYXV4X3N1cmZhY2Uoc3RydWN0IGludGVs
X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAlpbnQgeSA9IHNyY195IC8gdnN1YjsKIAl1MzIg
b2Zmc2V0OwogCi0JaWYgKHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uICYgfihEUk1fTU9ERV9S
T1RBVEVfMCB8IERSTV9NT0RFX1JPVEFURV8xODApKSB7Ci0JCURSTV9ERUJVR19LTVMoIlJDIHN1
cHBvcnQgb25seSB3aXRoIDAvMTgwIGRlZ3JlZSByb3RhdGlvbiAleFxuIiwKLQkJCSAgICAgIHBs
YW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uKTsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQotCiAJaW50
ZWxfYWRkX2ZiX29mZnNldHMoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMSk7CiAJb2Zmc2V0ID0gaW50
ZWxfcGxhbmVfY29tcHV0ZV9hbGlnbmVkX29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRlLCAxKTsK
IApAQCAtMzE4MiwxMiArMzE3Niw2IEBAIGludCBza2xfY2hlY2tfcGxhbmVfc3VyZmFjZShjb25z
dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlwbGFuZV9zdGF0ZS0+Y29s
b3JfcGxhbmVbMF0uc3RyaWRlID0gaW50ZWxfZmJfcGl0Y2goZmIsIDAsIHJvdGF0aW9uKTsKIAlw
bGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMV0uc3RyaWRlID0gaW50ZWxfZmJfcGl0Y2goZmIsIDEs
IHJvdGF0aW9uKTsKIAotCWlmIChyb3RhdGlvbiAmIERSTV9NT0RFX1JFRkxFQ1RfWCAmJgotCSAg
ICBmYi0+bW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSKSB7Ci0JCURSTV9ERUJVR19L
TVMoImhvcml6b250YWwgZmxpcCBpcyBub3Qgc3VwcG9ydGVkIHdpdGggbGluZWFyIHN1cmZhY2Ug
Zm9ybWF0c1xuIik7Ci0JCXJldHVybiAtRUlOVkFMOwotCX0KLQogCWlmICghcGxhbmVfc3RhdGUt
PmJhc2UudmlzaWJsZSkKIAkJcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl
LmMKaW5kZXggNTA1ZDg1MjkxZWU2Li41ZmQ0MjVhYzFiM2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3Nwcml0ZS5jCkBAIC0xMTU4LDYgKzExNTgsNjggQEAgdmx2X3Nwcml0ZV9jaGVjayhzdHJ1
Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGlj
IGludCBza2xfcGxhbmVfY2hlY2tfZmIoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy
dGNfc3RhdGUsCisJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5l
X3N0YXRlKQoreworCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3Rh
dGUtPmJhc2UuZmI7CisJdW5zaWduZWQgaW50IHJvdGF0aW9uID0gcGxhbmVfc3RhdGUtPmJhc2Uu
cm90YXRpb247CisJc3RydWN0IGRybV9mb3JtYXRfbmFtZV9idWYgZm9ybWF0X25hbWU7CisKKwlp
ZiAoIWZiKQorCQlyZXR1cm4gMDsKKworCWlmIChyb3RhdGlvbiAmIH4oRFJNX01PREVfUk9UQVRF
XzAgfCBEUk1fTU9ERV9ST1RBVEVfMTgwKSAmJgorCSAgICAoZmItPm1vZGlmaWVyID09IEk5MTVf
Rk9STUFUX01PRF9ZX1RJTEVEX0NDUyAmJgorCSAgICAgZmItPm1vZGlmaWVyID09IEk5MTVfRk9S
TUFUX01PRF9ZZl9USUxFRF9DQ1MpKSB7CisJCURSTV9ERUJVR19LTVMoIlJDIHN1cHBvcnQgb25s
eSB3aXRoIDAvMTgwIGRlZ3JlZSByb3RhdGlvbiAoJXgpXG4iLAorCQkJICAgICAgcm90YXRpb24p
OworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlpZiAocm90YXRpb24gJiBEUk1fTU9ERV9SRUZM
RUNUX1ggJiYKKwkgICAgZmItPm1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUikgewor
CQlEUk1fREVCVUdfS01TKCJob3Jpem9udGFsIGZsaXAgaXMgbm90IHN1cHBvcnRlZCB3aXRoIGxp
bmVhciBzdXJmYWNlIGZvcm1hdHNcbiIpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlpZiAo
ZHJtX3JvdGF0aW9uXzkwX29yXzI3MChyb3RhdGlvbikpIHsKKwkJaWYgKGZiLT5tb2RpZmllciAh
PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCAmJgorCQkgICAgZmItPm1vZGlmaWVyICE9IEk5MTVf
Rk9STUFUX01PRF9ZZl9USUxFRCkgeworCQkJRFJNX0RFQlVHX0tNUygiWS9ZZiB0aWxpbmcgcmVx
dWlyZWQgZm9yIDkwLzI3MCFcbiIpOworCQkJcmV0dXJuIC1FSU5WQUw7CisJCX0KKworCQkvKgor
CQkgKiA5MC8yNzAgaXMgbm90IGFsbG93ZWQgd2l0aCBSR0I2NCAxNjoxNjoxNjoxNiwKKwkJICog
UkdCIDE2LWJpdCA1OjY6NSwgYW5kIEluZGV4ZWQgOC1iaXQuCisJCSAqIFRCRDogQWRkIFJHQjY0
IGNhc2Ugb25jZSBpdHMgYWRkZWQgaW4gc3VwcG9ydGVkIGZvcm1hdCBsaXN0LgorCQkgKi8KKwkJ
c3dpdGNoIChmYi0+Zm9ybWF0LT5mb3JtYXQpIHsKKwkJY2FzZSBEUk1fRk9STUFUX0M4OgorCQlj
YXNlIERSTV9GT1JNQVRfUkdCNTY1OgorCQkJRFJNX0RFQlVHX0tNUygiVW5zdXBwb3J0ZWQgcGl4
ZWwgZm9ybWF0ICVzIGZvciA5MC8yNzAhXG4iLAorCQkJCSAgICAgIGRybV9nZXRfZm9ybWF0X25h
bWUoZmItPmZvcm1hdC0+Zm9ybWF0LAorCQkJCQkJCSAgJmZvcm1hdF9uYW1lKSk7CisJCQlyZXR1
cm4gLUVJTlZBTDsKKwkJZGVmYXVsdDoKKwkJCWJyZWFrOworCQl9CisJfQorCisJLyogWS10aWxp
bmcgaXMgbm90IHN1cHBvcnRlZCBpbiBJRi1JRCBJbnRlcmxhY2UgbW9kZSAqLworCWlmIChjcnRj
X3N0YXRlLT5iYXNlLmVuYWJsZSAmJgorCSAgICBjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21v
ZGUuZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSAmJgorCSAgICAoZmItPm1vZGlmaWVy
ID09IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEIHx8CisJICAgICBmYi0+bW9kaWZpZXIgPT0gSTkx
NV9GT1JNQVRfTU9EX1lmX1RJTEVEIHx8CisJICAgICBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JN
QVRfTU9EX1lfVElMRURfQ0NTIHx8CisJICAgICBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRf
TU9EX1lmX1RJTEVEX0NDUykpIHsKKwkJRFJNX0RFQlVHX0tNUygiWS9ZZiB0aWxpbmcgbm90IHN1
cHBvcnRlZCBpbiBJRi1JRCBtb2RlXG4iKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJcmV0
dXJuIDA7Cit9CisKIGludCBza2xfcGxhbmVfY2hlY2soc3RydWN0IGludGVsX2NydGNfc3RhdGUg
KmNydGNfc3RhdGUsCiAJCSAgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRl
KQogewpAQCAtMTE2Niw2ICsxMjI4LDEwIEBAIGludCBza2xfcGxhbmVfY2hlY2soc3RydWN0IGlu
dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJaW50IG1heF9zY2FsZSwgbWluX3NjYWxlOwog
CWludCByZXQ7CiAKKwlyZXQgPSBza2xfcGxhbmVfY2hlY2tfZmIoY3J0Y19zdGF0ZSwgcGxhbmVf
c3RhdGUpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKIAkvKiB1c2Ugc2NhbGVyIHdoZW4g
Y29sb3JrZXkgaXMgbm90IHJlcXVpcmVkICovCiAJaWYgKCFwbGFuZV9zdGF0ZS0+Y2tleS5mbGFn
cykgewogCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5i
YXNlLmZiOwotLSAKMi4xNi40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK