From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 05/13] drm/i915: Make skl_detach_scalers take crtc_state Date: Thu, 4 Oct 2018 11:45:56 +0200 Message-ID: <20181004094604.2646-6-maarten.lankhorst@linux.intel.com> References: <20181004094604.2646-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 D3BB56E58C for ; Thu, 4 Oct 2018 09:46:09 +0000 (UTC) In-Reply-To: <20181004094604.2646-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 UmVuYW1lIGludGVsX2NydGMgdG8gY3J0YywgYW5kIHBhc3MgY3J0Y19zdGF0ZSBpbnN0ZWFkIG9m IGxvb2tpbmcgYXQKY3J0Yy0+Y29uZmlnLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTIgKysrKysrLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCA2ZjJiNjEzYmUzY2IuLmJjMTIzODYyODEzOCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzUwMiwxMyArMzUwMiwxMyBAQCBzdGF0aWMg dm9pZCBza2xfZGV0YWNoX3NjYWxlcihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywgaW50 IGlkKQogLyoKICAqIFRoaXMgZnVuY3Rpb24gZGV0YWNoZXMgKGFrYS4gdW5iaW5kcykgdW51c2Vk IHNjYWxlcnMgaW4gaGFyZHdhcmUKICAqLwotc3RhdGljIHZvaWQgc2tsX2RldGFjaF9zY2FsZXJz KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKQorc3RhdGljIHZvaWQgc2tsX2RldGFjaF9z Y2FsZXJzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0 cnVjdCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSAqc2NhbGVyX3N0YXRlOworCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMp OworCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSAqc2NhbGVyX3N0YXRlID0K KwkJJmNydGNfc3RhdGUtPnNjYWxlcl9zdGF0ZTsKIAlpbnQgaTsKIAotCXNjYWxlcl9zdGF0ZSA9 ICZpbnRlbF9jcnRjLT5jb25maWctPnNjYWxlcl9zdGF0ZTsKLQogCS8qIGxvb3AgdGhyb3VnaCBh bmQgZGlzYWJsZSBzY2FsZXJzIHRoYXQgYXJlbid0IGluIHVzZSAqLwogCWZvciAoaSA9IDA7IGkg PCBpbnRlbF9jcnRjLT5udW1fc2NhbGVyczsgaSsrKSB7CiAJCWlmICghc2NhbGVyX3N0YXRlLT5z Y2FsZXJzW2ldLmluX3VzZSkKQEAgLTM5MTYsNyArMzkxNiw3IEBAIHN0YXRpYyB2b2lkIGludGVs X3VwZGF0ZV9waXBlX2NvbmZpZyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhCiAKIAkvKiBvbiBza3lsYWtlIHRoaXMgaXMgZG9uZSBieSBkZXRhY2hpbmcgc2NhbGVy cyAqLwogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKLQkJc2tsX2RldGFjaF9zY2Fs ZXJzKGNydGMpOworCQlza2xfZGV0YWNoX3NjYWxlcnMobmV3X2NydGNfc3RhdGUpOwogCiAJCWlm IChuZXdfY3J0Y19zdGF0ZS0+cGNoX3BmaXQuZW5hYmxlZCkKIAkJCXNreWxha2VfcGZpdF9lbmFi bGUobmV3X2NydGNfc3RhdGUpOwpAQCAtMTMzMzUsNyArMTMzMzUsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKGludGVs X2NzdGF0ZS0+dXBkYXRlX3BpcGUpCiAJCWludGVsX3VwZGF0ZV9waXBlX2NvbmZpZyhvbGRfaW50 ZWxfY3N0YXRlLCBpbnRlbF9jc3RhdGUpOwogCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOSkKLQkJc2tsX2RldGFjaF9zY2FsZXJzKGludGVsX2NydGMpOworCQlza2xfZGV0YWNoX3Nj YWxlcnMoaW50ZWxfY3N0YXRlKTsKIAogb3V0OgogCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5hdG9t aWNfdXBkYXRlX3dhdGVybWFya3MpCi0tIAoyLjE5LjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=