From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 4/9] drm/i915: Use enum old_plane_id for the .get_fifo_size() hooks Date: Thu, 12 Oct 2017 21:08:48 +0200 Message-ID: <20171012190848.xtedacldzhfiwvte@phenom.ffwll.local> References: <20171011160455.1874-1-ville.syrjala@linux.intel.com> <20171011160455.1874-5-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83A4D6E8F1 for ; Thu, 12 Oct 2017 19:08:53 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id i124so15934152wmf.3 for ; Thu, 12 Oct 2017 12:08:53 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20171011160455.1874-5-ville.syrjala@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: Ville Syrjala Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBPY3QgMTEsIDIwMTcgYXQgMDc6MDQ6NTBQTSArMDMwMCwgVmlsbGUgU3lyamFsYSB3 cm90ZToKPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgo+IAo+IFJlcGxhY2UgdGhlIDAgYW5kIDEgd2l0aCBQTEFORV9BIGFuZCBQTEFORV9CIGlu IHRoZSBwcmUtZzR4IHdtIGNvZGUuCj4gCj4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldpdGggdGhlIGJpa2VzaGVkIGZyb20g dGhlIHByZWNlZWRpbmcgcGF0Y2ggYXBwbGllZCBoZXJlIHRvbzoKClJldmlld2VkLWJ5OiBEYW5p ZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgoKPiAtLS0KPiAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAzICsrLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jIHwgMzYgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCj4gIDIgZmls ZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCj4gaW5kZXggNzI4MGY5ZWIyZTk1Li5kZjEyMGEzOGFlNDIgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBAQCAtNjk5LDcgKzY5OSw4IEBAIHN0cnVjdCBkcm1f aTkxNV9kaXNwbGF5X2Z1bmNzIHsKPiAgCQkJICBzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgKmNk Y2xrX3N0YXRlKTsKPiAgCXZvaWQgKCpzZXRfY2RjbGspKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKPiAgCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgKmNkY2xr X3N0YXRlKTsKPiAtCWludCAoKmdldF9maWZvX3NpemUpKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgaW50IHBsYW5lKTsKPiArCWludCAoKmdldF9maWZvX3NpemUpKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiArCQkJICAgICBlbnVtIG9sZF9wbGFuZV9pZCBw bGFuZV9pZCk7Cj4gIAlpbnQgKCpjb21wdXRlX3BpcGVfd20pKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUpOwo+ICAJaW50ICgqY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20pKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCj4gIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMsCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gaW5kZXggMmZjZmY5Nzg4YjZmLi4xM2YxMDEw ZWVhNzcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBAQCAtNTIxLDM4ICs1MjEsNDEg QEAgc3RhdGljIHZvaWQgdmx2X2dldF9maWZvX3NpemUoc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCj4gIAlmaWZvX3N0YXRlLT5wbGFuZVtQTEFORV9DVVJTT1JdID0gNjM7Cj4g IH0KPiAgCj4gLXN0YXRpYyBpbnQgaTl4eF9nZXRfZmlmb19zaXplKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgaW50IHBsYW5lKQo+ICtzdGF0aWMgaW50IGk5eHhfZ2V0X2ZpZm9f c2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gKwkJCSAgICAgIGVudW0g b2xkX3BsYW5lX2lkIHBsYW5lX2lkKQo+ICB7Cj4gIAl1aW50MzJfdCBkc3BhcmIgPSBJOTE1X1JF QUQoRFNQQVJCKTsKPiAgCWludCBzaXplOwo+ICAKPiAgCXNpemUgPSBkc3BhcmIgJiAweDdmOwo+ IC0JaWYgKHBsYW5lKQo+ICsJaWYgKHBsYW5lX2lkID09IFBMQU5FX0IpCj4gIAkJc2l6ZSA9ICgo ZHNwYXJiID4+IERTUEFSQl9DU1RBUlRfU0hJRlQpICYgMHg3ZikgLSBzaXplOwo+ICAKPiAtCURS TV9ERUJVR19LTVMoIkZJRk8gc2l6ZSAtICgweCUwOHgpICVzOiAlZFxuIiwgZHNwYXJiLAo+IC0J CSAgICAgIHBsYW5lID8gIkIiIDogIkEiLCBzaXplKTsKPiArCURSTV9ERUJVR19LTVMoIkZJRk8g c2l6ZSAtICgweCUwOHgpICVjOiAlZFxuIiwKPiArCQkgICAgICBkc3BhcmIsIHBsYW5lX25hbWUo cGxhbmVfaWQpLCBzaXplKTsKPiAgCj4gIAlyZXR1cm4gc2l6ZTsKPiAgfQo+ICAKPiAtc3RhdGlj IGludCBpODMwX2dldF9maWZvX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCBpbnQgcGxhbmUpCj4gK3N0YXRpYyBpbnQgaTgzMF9nZXRfZmlmb19zaXplKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiArCQkJICAgICAgZW51bSBvbGRfcGxhbmVfaWQgcGxh bmVfaWQpCj4gIHsKPiAgCXVpbnQzMl90IGRzcGFyYiA9IEk5MTVfUkVBRChEU1BBUkIpOwo+ICAJ aW50IHNpemU7Cj4gIAo+ICAJc2l6ZSA9IGRzcGFyYiAmIDB4MWZmOwo+IC0JaWYgKHBsYW5lKQo+ ICsJaWYgKHBsYW5lX2lkID09IFBMQU5FX0IpCj4gIAkJc2l6ZSA9ICgoZHNwYXJiID4+IERTUEFS Ql9CRU5EX1NISUZUKSAmIDB4MWZmKSAtIHNpemU7Cj4gIAlzaXplID4+PSAxOyAvKiBDb252ZXJ0 IHRvIGNhY2hlbGluZXMgKi8KPiAgCj4gLQlEUk1fREVCVUdfS01TKCJGSUZPIHNpemUgLSAoMHgl MDh4KSAlczogJWRcbiIsIGRzcGFyYiwKPiAtCQkgICAgICBwbGFuZSA/ICJCIiA6ICJBIiwgc2l6 ZSk7Cj4gKwlEUk1fREVCVUdfS01TKCJGSUZPIHNpemUgLSAoMHglMDh4KSAlYzogJWRcbiIsCj4g KwkJICAgICAgZHNwYXJiLCBwbGFuZV9uYW1lKHBsYW5lX2lkKSwgc2l6ZSk7Cj4gIAo+ICAJcmV0 dXJuIHNpemU7Cj4gIH0KPiAgCj4gLXN0YXRpYyBpbnQgaTg0NV9nZXRfZmlmb19zaXplKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHBsYW5lKQo+ICtzdGF0aWMgaW50IGk4 NDVfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gKwkJ CSAgICAgIGVudW0gb2xkX3BsYW5lX2lkIHBsYW5lX2lkKQo+ICB7Cj4gIAl1aW50MzJfdCBkc3Bh cmIgPSBJOTE1X1JFQUQoRFNQQVJCKTsKPiAgCWludCBzaXplOwo+IEBAIC01NjAsOSArNTYzLDgg QEAgc3RhdGljIGludCBpODQ1X2dldF9maWZvX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBpbnQgcGxhbmUpCj4gIAlzaXplID0gZHNwYXJiICYgMHg3ZjsKPiAgCXNpemUg Pj49IDI7IC8qIENvbnZlcnQgdG8gY2FjaGVsaW5lcyAqLwo+ICAKPiAtCURSTV9ERUJVR19LTVMo IkZJRk8gc2l6ZSAtICgweCUwOHgpICVzOiAlZFxuIiwgZHNwYXJiLAo+IC0JCSAgICAgIHBsYW5l ID8gIkIiIDogIkEiLAo+IC0JCSAgICAgIHNpemUpOwo+ICsJRFJNX0RFQlVHX0tNUygiRklGTyBz aXplIC0gKDB4JTA4eCkgJWM6ICVkXG4iLAo+ICsJCSAgICAgIGRzcGFyYiwgcGxhbmVfbmFtZShw bGFuZV9pZCksIHNpemUpOwo+ICAKPiAgCXJldHVybiBzaXplOwo+ICB9Cj4gQEAgLTIyNjEsOCAr MjI2Myw4IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1 bnVzZWRfY3J0YykKPiAgCWVsc2UKPiAgCQl3bV9pbmZvID0gJmk4MzBfYV93bV9pbmZvOwo+ICAK PiAtCWZpZm9fc2l6ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2X3ByaXYs IDApOwo+IC0JY3J0YyA9IGludGVsX2dldF9jcnRjX2Zvcl9wbGFuZShkZXZfcHJpdiwgMCk7Cj4g KwlmaWZvX3NpemUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplKGRldl9wcml2LCBQ TEFORV9BKTsKPiArCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2X3ByaXYsIFBM QU5FX0EpOwo+ICAJaWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7Cj4gIAkJY29uc3Qgc3Ry dWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPQo+ICAJCQkmY3J0Yy0+Y29uZmln LT5iYXNlLmFkanVzdGVkX21vZGU7Cj4gQEAgLTIyODgsOCArMjI5MCw4IEBAIHN0YXRpYyB2b2lk IGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1bnVzZWRfY3J0YykKPiAgCWlmIChJ U19HRU4yKGRldl9wcml2KSkKPiAgCQl3bV9pbmZvID0gJmk4MzBfYmNfd21faW5mbzsKPiAgCj4g LQlmaWZvX3NpemUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplKGRldl9wcml2LCAx KTsKPiAtCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2X3ByaXYsIDEpOwo+ICsJ Zmlmb19zaXplID0gZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2ZpZm9fc2l6ZShkZXZfcHJpdiwgUExB TkVfQik7Cj4gKwljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldl9wcml2LCBQTEFO RV9CKTsKPiAgCWlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkgewo+ICAJCWNvbnN0IHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KPiAgCQkJJmNydGMtPmNvbmZpZy0+ YmFzZS5hZGp1c3RlZF9tb2RlOwo+IEBAIC0yNDAxLDcgKzI0MDMsNyBAQCBzdGF0aWMgdm9pZCBp ODQ1X3VwZGF0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqdW51c2VkX2NydGMpCj4gIAlhZGp1c3Rl ZF9tb2RlID0gJmNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwo+ICAJcGxhbmVhX3dt ID0gaW50ZWxfY2FsY3VsYXRlX3dtKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCj4gIAkJCQkg ICAgICAgJmk4NDVfd21faW5mbywKPiAtCQkJCSAgICAgICBkZXZfcHJpdi0+ZGlzcGxheS5nZXRf Zmlmb19zaXplKGRldl9wcml2LCAwKSwKPiArCQkJCSAgICAgICBkZXZfcHJpdi0+ZGlzcGxheS5n ZXRfZmlmb19zaXplKGRldl9wcml2LCBQTEFORV9BKSwKPiAgCQkJCSAgICAgICA0LCBwZXNzaW1h bF9sYXRlbmN5X25zKTsKPiAgCWZ3YXRlcl9sbyA9IEk5MTVfUkVBRChGV19CTEMpICYgfjB4ZmZm Owo+ICAJZndhdGVyX2xvIHw9ICgzPDw4KSB8IHBsYW5lYV93bTsKPiAtLSAKPiAyLjEzLjYKPiAK PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVs LWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0t IApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRw Oi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK