From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 5/9] drm/i915: Pass primary plane size to
	.update_primary_plane()
Date: Tue, 10 Mar 2015 13:15:25 +0200
Message-ID: <1425986129-15547-6-git-send-email-ville.syrjala@linux.intel.com>
References: <1425986129-15547-1-git-send-email-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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 0FF987208F
 for <intel-gfx@lists.freedesktop.org>; Tue, 10 Mar 2015 04:15:50 -0700 (PDT)
In-Reply-To: <1425986129-15547-1-git-send-email-ville.syrjala@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
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklu
IHByZXBhcmF0aW9uIHRvIG1vdmFibGUvcmVzaXphYmxlIHByaW1hcnkgcGxhbmVzIHBhc3MgdGhl
IGNsaXBwZWQKcGxhbmUgc2l6ZSB0byAudXBkYXRlX3ByaW1hcnlfcGxhbmUoKS4KCkNjOiBTb25p
a2EgSmluZGFsIDxzb25pa2EuamluZGFsQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUg
U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jIHwgNjMgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t
CiAyIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGIxNmMwYTcuLmU5OWVlZjAgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaApAQCAtNTc4LDcgKzU3OCw4IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1
bmNzIHsKIAkJCSAgdWludDMyX3QgZmxhZ3MpOwogCXZvaWQgKCp1cGRhdGVfcHJpbWFyeV9wbGFu
ZSkoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZl
ciAqZmIsCi0JCQkJICAgICBpbnQgeCwgaW50IHkpOworCQkJCSAgICAgaW50IHgsIGludCB5LAor
CQkJCSAgICAgaW50IGNydGNfdywgaW50IGNydGNfaCk7CiAJdm9pZCAoKmhwZF9pcnFfc2V0dXAp
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCS8qIGNsb2NrIHVwZGF0ZXMgZm9yIG1vZGUgc2V0
ICovCiAJLyogY3Vyc29yIHVwZGF0ZXMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwppbmRleCBmZGM4M2YxLi4xYTc4OWYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCkBAIC0yNDgyLDcgKzI0ODIsOCBAQCBpbnRlbF9maW5kX3BsYW5lX29iaihzdHJ1Y3QgaW50
ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAogc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9w
bGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgICAgc3RydWN0IGRybV9mcmFtZWJ1
ZmZlciAqZmIsCi0JCQkJICAgICAgaW50IHgsIGludCB5KQorCQkJCSAgICAgIGludCB4LCBpbnQg
eSwKKwkJCQkgICAgICBpbnQgY3J0Y193LCBpbnQgY3J0Y19oKQogewogCXN0cnVjdCBkcm1fZGV2
aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTI1MTcsMjAgKzI1MTgsMTYgQEAgc3RhdGljIHZvaWQg
aTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKElO
VEVMX0lORk8oZGV2KS0+Z2VuIDwgNCkgewogCQlpZiAoaW50ZWxfY3J0Yy0+cGlwZSA9PSBQSVBF
X0IpCiAJCQlkc3BjbnRyIHw9IERJU1BQTEFORV9TRUxfUElQRV9COwotCi0JCS8qIHBpcGVzcmMg
YW5kIGRzcHNpemUgY29udHJvbCB0aGUgc2l6ZSB0aGF0IGlzIHNjYWxlZCBmcm9tLAotCQkgKiB3
aGljaCBzaG91bGQgYWx3YXlzIGJlIHRoZSB1c2VyJ3MgcmVxdWVzdGVkIHNpemUuCi0JCSAqLwot
CQlJOTE1X1dSSVRFKERTUFNJWkUocGxhbmUpLAotCQkJICAgKChpbnRlbF9jcnRjLT5jb25maWct
PnBpcGVfc3JjX2ggLSAxKSA8PCAxNikgfAotCQkJICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGlw
ZV9zcmNfdyAtIDEpKTsKKwkJSTkxNV9XUklURShEU1BTSVpFKHBsYW5lKSwgKChjcnRjX2ggLSAx
KSA8PCAxNikgfCAoY3J0Y193IC0gMSkpOwogCQlJOTE1X1dSSVRFKERTUFBPUyhwbGFuZSksIDAp
OwogCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpICYmIHBsYW5lID09IFBMQU5FX0IpIHsK
LQkJSTkxNV9XUklURShQUklNU0laRShwbGFuZSksCi0JCQkgICAoKGludGVsX2NydGMtPmNvbmZp
Zy0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2KSB8Ci0JCQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5w
aXBlX3NyY193IC0gMSkpOworCQlJOTE1X1dSSVRFKFBSSU1TSVpFKHBsYW5lKSwgKChjcnRjX2gg
LSAxKSA8PCAxNikgfCAoY3J0Y193IC0gMSkpOwogCQlJOTE1X1dSSVRFKFBSSU1QT1MocGxhbmUp
LCAwKTsKIAkJSTkxNV9XUklURShQUklNQ05TVEFMUEhBKHBsYW5lKSwgMCk7CisJfSBlbHNlIHsK
KwkJV0FSTl9PTkNFKGNydGNfdyAhPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3cgfHwK
KwkJCSAgY3J0Y19oICE9IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCwKKwkJCSAgInBy
aW1hcnkgcGxhbmUgc2l6ZSBkb2Vzbid0IG1hdGNoIHBpcGUgc2l6ZVxuIik7CiAJfQogCiAJc3dp
dGNoIChmYi0+cGl4ZWxfZm9ybWF0KSB7CkBAIC0yNTg2LDE0ICsyNTgzLDE0IEBAIHN0YXRpYyB2
b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlm
IChjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkg
ewogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9ST1RBVEVfMTgwOwogCi0JCXggKz0gKGludGVsX2Ny
dGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAtIDEpOwotCQl5ICs9IChpbnRlbF9jcnRjLT5jb25maWct
PnBpcGVfc3JjX2ggLSAxKTsKKwkJeCArPSAoY3J0Y193IC0gMSk7CisJCXkgKz0gKGNydGNfaCAt
IDEpOwogCiAJCS8qIEZpbmRpbmcgdGhlIGxhc3QgcGl4ZWwgb2YgdGhlIGxhc3QgbGluZSBvZiB0
aGUgZGlzcGxheQogCQlkYXRhIGFuZCBhZGRpbmcgdG8gbGluZWFyX29mZnNldCovCiAJCWxpbmVh
cl9vZmZzZXQgKz0KLQkJCShpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2ggLSAxKSAqIGZi
LT5waXRjaGVzWzBdICsKLQkJCShpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3cgLSAxKSAq
IHBpeGVsX3NpemU7CisJCQkoY3J0Y19oIC0gMSkgKiBmYi0+cGl0Y2hlc1swXSArCisJCQkoY3J0
Y193IC0gMSkgKiBwaXhlbF9zaXplOwogCX0KIAogCUk5MTVfV1JJVEUocmVnLCBkc3BjbnRyKTsK
QEAgLTI2MTEsNyArMjYwOCw4IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxh
bmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVf
cHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJCSAgc3RydWN0IGRybV9m
cmFtZWJ1ZmZlciAqZmIsCi0JCQkJCSAgaW50IHgsIGludCB5KQorCQkJCQkgIGludCB4LCBpbnQg
eSwKKwkJCQkJICBpbnQgY3J0Y193LCBpbnQgY3J0Y19oKQogewogCXN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g
ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTI2NDMsNiArMjY0MSwxMCBAQCBzdGF0aWMgdm9pZCBpcm9u
bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKElT
X0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKIAkJZHNwY250ciB8PSBESVNQUExB
TkVfUElQRV9DU0NfRU5BQkxFOwogCisJV0FSTl9PTkNFKGNydGNfdyAhPSBpbnRlbF9jcnRjLT5j
b25maWctPnBpcGVfc3JjX3cgfHwKKwkJICBjcnRjX2ggIT0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5w
aXBlX3NyY19oLAorCQkgICJwcmltYXJ5IHBsYW5lIHNpemUgZG9lc24ndCBtYXRjaCBwaXBlIHNp
emVcbiIpOworCiAJc3dpdGNoIChmYi0+cGl4ZWxfZm9ybWF0KSB7CiAJY2FzZSBEUk1fRk9STUFU
X0M4OgogCQlkc3BjbnRyIHw9IERJU1BQTEFORV84QlBQOwpAQCAtMjY4NiwxNCArMjY4OCwxNCBA
QCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2Ny
dGMgKmNydGMsCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1JPVEFURV8xODA7CiAKIAkJaWYgKCFJ
U19IQVNXRUxMKGRldikgJiYgIUlTX0JST0FEV0VMTChkZXYpKSB7Ci0JCQl4ICs9IChpbnRlbF9j
cnRjLT5jb25maWctPnBpcGVfc3JjX3cgLSAxKTsKLQkJCXkgKz0gKGludGVsX2NydGMtPmNvbmZp
Zy0+cGlwZV9zcmNfaCAtIDEpOworCQkJeCArPSAoY3J0Y193IC0gMSk7CisJCQl5ICs9IChjcnRj
X2ggLSAxKTsKIAogCQkJLyogRmluZGluZyB0aGUgbGFzdCBwaXhlbCBvZiB0aGUgbGFzdCBsaW5l
IG9mIHRoZSBkaXNwbGF5CiAJCQlkYXRhIGFuZCBhZGRpbmcgdG8gbGluZWFyX29mZnNldCovCiAJ
CQlsaW5lYXJfb2Zmc2V0ICs9Ci0JCQkJKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCAt
IDEpICogZmItPnBpdGNoZXNbMF0gKwotCQkJCShpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3Jj
X3cgLSAxKSAqIHBpeGVsX3NpemU7CisJCQkJKGNydGNfaCAtIDEpICogZmItPnBpdGNoZXNbMF0g
KworCQkJCShjcnRjX3cgLSAxKSAqIHBpeGVsX3NpemU7CiAJCX0KIAl9CiAKQEAgLTI3NDcsNyAr
Mjc0OSw4IEBAIHUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsIHVpbnQ2NF90IGZiX21vZGlmaWVyLAogCiBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0
ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkJIHN0cnVjdCBkcm1f
ZnJhbWVidWZmZXIgKmZiLAotCQkJCQkgaW50IHgsIGludCB5KQorCQkJCQkgaW50IHgsIGludCB5
LAorCQkJCQkgaW50IGNydGNfdywgaW50IGNydGNfaCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl
di0+ZGV2X3ByaXZhdGU7CkBAIC0yODI2LDkgKzI4MjksNyBAQCBzdGF0aWMgdm9pZCBza3lsYWtl
X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCUk5MTVfV1JJ
VEUoUExBTkVfUE9TKHBpcGUsIDApLCAwKTsKIAlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBl
LCAwKSwgKHkgPDwgMTYpIHwgeCk7Ci0JSTkxNV9XUklURShQTEFORV9TSVpFKHBpcGUsIDApLAot
CQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oIC0gMSkgPDwgMTYgfAotCQkgICAo
aW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193IC0gMSkpOworCUk5MTVfV1JJVEUoUExBTkVf
U0laRShwaXBlLCAwKSwgKChjcnRjX2ggLSAxKSA8PCAxNikgfCAoY3J0Y193IC0gMSkpOwogCUk5
MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIDApLCBmYi0+cGl0Y2hlc1swXSAvIHN0cmlkZV9k
aXYpOwogCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCAwKSwgaTkxNV9nZW1fb2JqX2dndHRf
b2Zmc2V0KG9iaikpOwogCkBAIC0yODQ1LDEyICsyODQ2LDE2IEBAIGludGVsX3BpcGVfc2V0X2Jh
c2VfYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq
ZmIsCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpbnRl
bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAogCWlmIChkZXZfcHJp
di0+ZGlzcGxheS5kaXNhYmxlX2ZiYykKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZGlzYWJsZV9mYmMo
ZGV2KTsKIAorCS8qIEZJWE1FOiB0aGlzIHdpbGwgZ28gYmFkbHkgaWYgdGhlIGZiIGlzbid0IGJp
ZyBlbm91Z2ggKi8KIAl0b19pbnRlbF9jcnRjKGNydGMpLT5wcmltYXJ5X2VuYWJsZWQgPSB0cnVl
OwotCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIGZiLCB4LCB5
KTsKKwlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfcHJpbWFyeV9wbGFuZShjcnRjLCBmYiwgeCwg
eSwKKwkJCQkJICAgICAgIGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdywKKwkJCQkJICAg
ICAgIGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCk7CiAKIAlyZXR1cm4gMDsKIH0KQEAg
LTI4ODUsNyArMjg5MCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5l
cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3By
aW1hcnlfcGxhbmUoY3J0YywKIAkJCQkJCQkgICAgICAgc3RhdGUtPmJhc2UuZmIsCiAJCQkJCQkJ
ICAgICAgIHN0YXRlLT5zcmMueDEgPj4gMTYsCi0JCQkJCQkJICAgICAgIHN0YXRlLT5zcmMueTEg
Pj4gMTYpOworCQkJCQkJCSAgICAgICBzdGF0ZS0+c3JjLnkxID4+IDE2LAorCQkJCQkJCSAgICAg
ICBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPmRzdCksCisJCQkJCQkJICAgICAgIGRybV9yZWN0X2hl
aWdodCgmc3RhdGUtPmRzdCkpOwogCQl9CiAKIAkJZHJtX21vZGVzZXRfdW5sb2NrKCZjcnRjLT5t
dXRleCk7CkBAIC0xMjAxOSw3ICsxMjAyNiw5IEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5l
KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfcHJp
bWFyeV9wbGFuZShjcnRjLAogCQkJCQkJICAgICAgIHN0YXRlLT5iYXNlLmZiLAogCQkJCQkJICAg
ICAgIHN0YXRlLT5zcmMueDEgPj4gMTYsCi0JCQkJCQkgICAgICAgc3RhdGUtPnNyYy55MSA+PiAx
Nik7CisJCQkJCQkgICAgICAgc3RhdGUtPnNyYy55MSA+PiAxNiwKKwkJCQkJCSAgICAgICBkcm1f
cmVjdF93aWR0aCgmc3RhdGUtPmRzdCksCisJCQkJCQkgICAgICAgZHJtX3JlY3RfaGVpZ2h0KCZz
dGF0ZS0+ZHN0KSk7CiAJfQogfQogCi0tIAoyLjAuNQoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK