From: Maarten Lankhorst Subject: [PATCH 03/13] drm/i915: Make intel_set_pipe_timings/src_size take a pointer to crtc_state Date: Wed, 3 Oct 2018 15:37:05 +0200 Message-ID: <20181003133715.3713-4-maarten.lankhorst@linux.intel.com> References: <20181003133715.3713-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 061E56E4AE for ; Wed, 3 Oct 2018 13:37:18 +0000 (UTC) In-Reply-To: <20181003133715.3713-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0 MSArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0 aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDcwMWNhYWI0ZTM4Mi4uY2E1ZTRkNzJkNDc2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC0xNDIsOCArMTQyLDggQEAgc3RhdGljIGludCBpbnRlbF9mcmFtZWJ1 ZmZlcl9pbml0KHN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaWZiLAogCQkJCSAgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkgIHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICpt b2RlX2NtZCk7CiBzdGF0aWMgdm9pZCBpOXh4X3NldF9waXBlY29uZihzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7Ci1zdGF0aWMgdm9pZCBpbnRlbF9zZXRfcGlwZV90aW1pbmdz KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKTsKLXN0YXRpYyB2b2lkIGludGVsX3NldF9w aXBlX3NyY19zaXplKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKTsKK3N0YXRpYyB2b2lk IGludGVsX3NldF9waXBlX3RpbWluZ3MoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpOworc3RhdGljIHZvaWQgaW50ZWxfc2V0X3BpcGVfc3JjX3NpemUoY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwogc3RhdGljIHZvaWQgaW50ZWxfY3B1 X3RyYW5zY29kZXJfc2V0X21fbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCQkJIHN0cnVj dCBpbnRlbF9saW5rX21fbiAqbV9uLAogCQkJCQkgc3RydWN0IGludGVsX2xpbmtfbV9uICptMl9u Mik7CkBAIC01NTk2LDggKzU1OTYsOCBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2VuYWJs ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJaWYgKGludGVsX2NydGNf aGFzX2RwX2VuY29kZXIoaW50ZWxfY3J0Yy0+Y29uZmlnKSkKIAkJaW50ZWxfZHBfc2V0X21fbihp bnRlbF9jcnRjLCBNMV9OMSk7CiAKLQlpbnRlbF9zZXRfcGlwZV90aW1pbmdzKGludGVsX2NydGMp OwotCWludGVsX3NldF9waXBlX3NyY19zaXplKGludGVsX2NydGMpOworCWludGVsX3NldF9waXBl X3RpbWluZ3MocGlwZV9jb25maWcpOworCWludGVsX3NldF9waXBlX3NyY19zaXplKHBpcGVfY29u ZmlnKTsKIAogCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2RlcikgewogCQlp bnRlbF9jcHVfdHJhbnNjb2Rlcl9zZXRfbV9uKGludGVsX2NydGMsCkBAIC01NzIxLDkgKzU3MjEs OSBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZywKIAkJaW50ZWxfZHBfc2V0X21fbihpbnRlbF9jcnRjLCBNMV9OMSk7 CiAKIAlpZiAoIXRyYW5zY29kZXJfaXNfZHNpKGNwdV90cmFuc2NvZGVyKSkKLQkJaW50ZWxfc2V0 X3BpcGVfdGltaW5ncyhpbnRlbF9jcnRjKTsKKwkJaW50ZWxfc2V0X3BpcGVfdGltaW5ncyhwaXBl X2NvbmZpZyk7CiAKLQlpbnRlbF9zZXRfcGlwZV9zcmNfc2l6ZShpbnRlbF9jcnRjKTsKKwlpbnRl bF9zZXRfcGlwZV9zcmNfc2l6ZShwaXBlX2NvbmZpZyk7CiAKIAlpZiAoY3B1X3RyYW5zY29kZXIg IT0gVFJBTlNDT0RFUl9FRFAgJiYKIAkgICAgIXRyYW5zY29kZXJfaXNfZHNpKGNwdV90cmFuc2Nv ZGVyKSkgewpAQCAtNjA2MiwxMiArNjA2MiwxMCBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2Ny dGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAlpZiAoaW50 ZWxfY3J0Y19oYXNfZHBfZW5jb2RlcihpbnRlbF9jcnRjLT5jb25maWcpKQogCQlpbnRlbF9kcF9z ZXRfbV9uKGludGVsX2NydGMsIE0xX04xKTsKIAotCWludGVsX3NldF9waXBlX3RpbWluZ3MoaW50 ZWxfY3J0Yyk7Ci0JaW50ZWxfc2V0X3BpcGVfc3JjX3NpemUoaW50ZWxfY3J0Yyk7CisJaW50ZWxf c2V0X3BpcGVfdGltaW5ncyhwaXBlX2NvbmZpZyk7CisJaW50ZWxfc2V0X3BpcGVfc3JjX3NpemUo cGlwZV9jb25maWcpOwogCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYmIHBpcGUgPT0g UElQRV9CKSB7Ci0JCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKLQogCQlJOTE1X1dSSVRFKENIVl9CTEVORChwaXBlKSwgQ0hWX0JMRU5EX0xFR0FDWSk7 CiAJCUk5MTVfV1JJVEUoQ0hWX0NBTlZBUyhwaXBlKSwgMCk7CiAJfQpAQCAtNjEzNCw4ICs2MTMy LDggQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcsCiAJaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIoaW50ZWxfY3J0 Yy0+Y29uZmlnKSkKIAkJaW50ZWxfZHBfc2V0X21fbihpbnRlbF9jcnRjLCBNMV9OMSk7CiAKLQlp bnRlbF9zZXRfcGlwZV90aW1pbmdzKGludGVsX2NydGMpOwotCWludGVsX3NldF9waXBlX3NyY19z aXplKGludGVsX2NydGMpOworCWludGVsX3NldF9waXBlX3RpbWluZ3MocGlwZV9jb25maWcpOwor CWludGVsX3NldF9waXBlX3NyY19zaXplKHBpcGVfY29uZmlnKTsKIAogCWk5eHhfc2V0X3BpcGVj b25mKHBpcGVfY29uZmlnKTsKIApAQCAtNzMzMSwxMiArNzMyOSwxMyBAQCBzdGF0aWMgdm9pZCBp OHh4X2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAljcnRjX3N0YXRlLT5k cGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxsOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9zZXRfcGlw ZV90aW1pbmdzKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKQorc3RhdGljIHZvaWQgaW50 ZWxfc2V0X3BpcGVfdGltaW5ncyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSkKIHsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGludGVsX2NydGMtPmJhc2UuZGV2KTsKIAllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX2NydGMtPnBpcGU7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gaW50ZWxf Y3J0Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlcjsKLQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRf bW9kZTsKKwllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBjcnRjX3N0YXRlLT5jcHVf dHJhbnNjb2RlcjsKKwljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9k ZSA9ICZjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJdWludDMyX3QgY3J0Y192dG90 YWwsIGNydGNfdmJsYW5rX2VuZDsKIAlpbnQgdnN5bmNzaGlmdCA9IDA7CiAKQEAgLTczNTAsNyAr NzM0OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldF9waXBlX3RpbWluZ3Moc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMpCiAJCWNydGNfdnRvdGFsIC09IDE7CiAJCWNydGNfdmJsYW5rX2Vu ZCAtPSAxOwogCi0JCWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywg SU5URUxfT1VUUFVUX1NEVk8pKQorCQlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRl LCBJTlRFTF9PVVRQVVRfU0RWTykpCiAJCQl2c3luY3NoaWZ0ID0gKGFkanVzdGVkX21vZGUtPmNy dGNfaHRvdGFsIC0gMSkgLyAyOwogCQllbHNlCiAJCQl2c3luY3NoaWZ0ID0gYWRqdXN0ZWRfbW9k ZS0+Y3J0Y19oc3luY19zdGFydCAtCkBAIC03MzkyLDE4ICs3MzkxLDE4IEBAIHN0YXRpYyB2b2lk IGludGVsX3NldF9waXBlX3RpbWluZ3Moc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCiAK IH0KIAotc3RhdGljIHZvaWQgaW50ZWxfc2V0X3BpcGVfc3JjX3NpemUoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMpCitzdGF0aWMgdm9pZCBpbnRlbF9zZXRfcGlwZV9zcmNfc2l6ZShjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfY3J0Yy0+YmFzZS5kZXYpOwog CWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAogCS8qIHBpcGVzcmMgY29udHJv bHMgdGhlIHNpemUgdGhhdCBpcyBzY2FsZWQgZnJvbSwgd2hpY2ggc2hvdWxkCiAJICogYWx3YXlz IGJlIHRoZSB1c2VyJ3MgcmVxdWVzdGVkIHNpemUuCiAJICovCiAJSTkxNV9XUklURShQSVBFU1JD KHBpcGUpLAotCQkgICAoKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAtIDEpIDw8IDE2 KSB8Ci0JCSAgIChpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2ggLSAxKSk7CisJCSAgICgo Y3J0Y19zdGF0ZS0+cGlwZV9zcmNfdyAtIDEpIDw8IDE2KSB8CisJCSAgIChjcnRjX3N0YXRlLT5w aXBlX3NyY19oIC0gMSkpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9nZXRfcGlwZV90aW1pbmdz KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotLSAKMi4xOS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK