From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepak Rawat Subject: [PATCH i-g-t 3/5] lib: Don't call igt_require_fb_modifiers() when no modifier Date: Tue, 16 Oct 2018 15:23:39 -0700 Message-ID: <20181016222341.1537-3-drawat@vmware.com> References: <20181016222341.1537-1-drawat@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181016222341.1537-1-drawat@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-graphics-maintainer@vmware.com Cc: Leo Li , Deepak Rawat List-Id: intel-gfx@lists.freedesktop.org dm13Z2Z4IGFuZCBhbWRncHUgZG9lc24ndCBzdXBwb3J0IGZiIG1vZGlmaWVycywgeWV0IGttc19h ZGRmYigpIHJlcXVpcmVzCm1vZGlmaWVyIHN1cHBvcnQuIFNpbmNlIG1hbnkgdGVzdHMgZG9uJ3Qg bmVlZCB0aGlzIHRvIHJ1biwgdGhlCnJlcXVpcmVtZW50IGNhbiBiZSBtYWRlIGxlc3MgYnJvYWQu CgpUaGVyZWZvcmUsIHRpZ2h0ZW4gdGhlIHJlcXVpcmVtZW50IHRvIGNhc2VzIHdoZXJlIG1vZGlm aWVycyBhcmUgYWN0dWFsbHkKbmVlZGVkLgoKdjI6CiogSW4gY3JlYXRlX2ZiKCkgY2FsbHMgdG8g a21zX2FkZGZiKCksIHJlbW92ZSB0aGUgbW9kaWZpZXIgZmxhZyBpZmYgdGhlCiAgZHJpdmVyIGRv ZXNuJ3Qgc3VwcG9ydCBtb2RpZmllcnMgYW5kIHRoZSBtb2RpZmVyIGlzIDAKKiBEb24ndCBtb2Rp ZnkgdGhlIGZsYWcgaW4ga21zX2FkZGZiKCkuCgpTaWduZWQtb2ZmLWJ5OiBEZWVwYWsgUmF3YXQg PGRyYXdhdEB2bXdhcmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBMZW8gTGkgPHN1bnBlbmcubGlAYW1k LmNvbT4KLS0tCiBsaWIvaWd0X2ZiLmMgICAgICAgICB8ICA3ICsrKysrLS0KIGxpYi9pb2N0bF93 cmFwcGVycy5jIHwgMjQgKysrKysrKysrKysrKysrLS0tLS0tLS0tCiBsaWIvaW9jdGxfd3JhcHBl cnMuaCB8ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9mYi5jIGIvbGliL2lndF9mYi5jCmluZGV4IDFi YjZkMzI0Li41ZGNhMWNmYSAxMDA2NDQKLS0tIGEvbGliL2lndF9mYi5jCisrKyBiL2xpYi9pZ3Rf ZmIuYwpAQCAtOTEzLDYgKzkxMyw3IEBAIGlndF9jcmVhdGVfZmJfd2l0aF9ib19zaXplKGludCBm ZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCS8qIEZJWE1FIGFsbG93IHRoZSBjYWxsZXIgdG8g cGFzcyB0aGVzZSBpbiAqLwogCWVudW0gaWd0X2NvbG9yX2VuY29kaW5nIGNvbG9yX2VuY29kaW5n ID0gSUdUX0NPTE9SX1lDQkNSX0JUNzA5OwogCWVudW0gaWd0X2NvbG9yX3JhbmdlIGNvbG9yX3Jh bmdlID0gSUdUX0NPTE9SX1lDQkNSX0xJTUlURURfUkFOR0U7CisJdWludDMyX3QgZmxhZ3MgPSAw OwogCiAJZmJfaW5pdChmYiwgZmQsIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwgdGlsaW5nLAogCQlj b2xvcl9lbmNvZGluZywgY29sb3JfcmFuZ2UpOwpAQCAtOTMxLDExICs5MzIsMTMgQEAgaWd0X2Ny ZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCiAJaWd0 X2RlYnVnKCIlcyhoYW5kbGU9JWQsIHBpdGNoPSVkKVxuIiwKIAkJICBfX2Z1bmNfXywgZmItPmdl bV9oYW5kbGUsIGZiLT5zdHJpZGVzWzBdKTsKIAorCWlmIChmYi0+dGlsaW5nIHx8IGlndF9oYXNf ZmJfbW9kaWZpZXJzKGZkKSkKKwkJZmxhZ3MgPSBMT0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlM7 CisKIAlkb19vcl9kaWUoX19rbXNfYWRkZmIoZmItPmZkLCBmYi0+Z2VtX2hhbmRsZSwKIAkJCSAg ICAgIGZiLT53aWR0aCwgZmItPmhlaWdodCwKIAkJCSAgICAgIGZiLT5kcm1fZm9ybWF0LCBmYi0+ dGlsaW5nLAotCQkJICAgICAgZmItPnN0cmlkZXMsIGZiLT5vZmZzZXRzLCBmYi0+bnVtX3BsYW5l cywKLQkJCSAgICAgIExPQ0FMX0RSTV9NT0RFX0ZCX01PRElGSUVSUywKKwkJCSAgICAgIGZiLT5z dHJpZGVzLCBmYi0+b2Zmc2V0cywgZmItPm51bV9wbGFuZXMsIGZsYWdzLAogCQkJICAgICAgJmZi LT5mYl9pZCkpOwogCiAJcmV0dXJuIGZiLT5mYl9pZDsKZGlmZiAtLWdpdCBhL2xpYi9pb2N0bF93 cmFwcGVycy5jIGIvbGliL2lvY3RsX3dyYXBwZXJzLmMKaW5kZXggMDkyOWM0M2YuLjEwZDMyYmVj IDEwMDY0NAotLS0gYS9saWIvaW9jdGxfd3JhcHBlcnMuYworKysgYi9saWIvaW9jdGxfd3JhcHBl cnMuYwpAQCAtMTY0NiwxMyArMTY0Niw3IEBAIHZvaWQgcHJpbWVfc3luY19lbmQoaW50IGRtYV9i dWZfZmQsIGJvb2wgd3JpdGUpCiAJZG9faW9jdGwoZG1hX2J1Zl9mZCwgTE9DQUxfRE1BX0JVRl9J T0NUTF9TWU5DLCAmc3luY19lbmQpOwogfQogCi0vKioKLSAqIGlndF9yZXF1aXJlX2ZiX21vZGlm aWVyczoKLSAqIEBmZDogT3BlbiBEUk0gZmlsZSBkZXNjcmlwdG9yLgotICoKLSAqIFJlcXVpcmVz IHByZXNlbmNlIG9mIERSTV9DQVBfQURERkIyX01PRElGSUVSUy4KLSAqLwotdm9pZCBpZ3RfcmVx dWlyZV9mYl9tb2RpZmllcnMoaW50IGZkKQorYm9vbCBpZ3RfaGFzX2ZiX21vZGlmaWVycyhpbnQg ZmQpCiB7CiAJc3RhdGljIGJvb2wgaGFzX21vZGlmaWVycywgY2FwX21vZGlmaWVyc190ZXN0ZWQ7 CiAKQEAgLTE2NjYsNyArMTY2MCwxOCBAQCB2b2lkIGlndF9yZXF1aXJlX2ZiX21vZGlmaWVycyhp bnQgZmQpCiAJCWNhcF9tb2RpZmllcnNfdGVzdGVkID0gdHJ1ZTsKIAl9CiAKLQlpZ3RfcmVxdWly ZShoYXNfbW9kaWZpZXJzKTsKKwlyZXR1cm4gaGFzX21vZGlmaWVyczsKK30KKworLyoqCisgKiBp Z3RfcmVxdWlyZV9mYl9tb2RpZmllcnM6CisgKiBAZmQ6IE9wZW4gRFJNIGZpbGUgZGVzY3JpcHRv ci4KKyAqCisgKiBSZXF1aXJlcyBwcmVzZW5jZSBvZiBEUk1fQ0FQX0FEREZCMl9NT0RJRklFUlMu CisgKi8KK3ZvaWQgaWd0X3JlcXVpcmVfZmJfbW9kaWZpZXJzKGludCBmZCkKK3sKKwlpZ3RfcmVx dWlyZShpZ3RfaGFzX2ZiX21vZGlmaWVycyhmZCkpOwogfQogCiBpbnQgX19rbXNfYWRkZmIoaW50 IGZkLCB1aW50MzJfdCBoYW5kbGUsCkBAIC0xNjc4LDcgKzE2ODMsOCBAQCBpbnQgX19rbXNfYWRk ZmIoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsCiAJc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgZjsK IAlpbnQgcmV0LCBpOwogCi0JaWd0X3JlcXVpcmVfZmJfbW9kaWZpZXJzKGZkKTsKKwlpZiAoZmxh Z3MgJiBEUk1fTU9ERV9GQl9NT0RJRklFUlMpCisJCWlndF9yZXF1aXJlX2ZiX21vZGlmaWVycyhm ZCk7CiAKIAltZW1zZXQoJmYsIDAsIHNpemVvZihmKSk7CiAKZGlmZiAtLWdpdCBhL2xpYi9pb2N0 bF93cmFwcGVycy5oIGIvbGliL2lvY3RsX3dyYXBwZXJzLmgKaW5kZXggYzRlMTk1NmMuLmIyMmIz NmIwIDEwMDY0NAotLS0gYS9saWIvaW9jdGxfd3JhcHBlcnMuaAorKysgYi9saWIvaW9jdGxfd3Jh cHBlcnMuaApAQCAtMjI3LDYgKzIyNyw3IEBAIHN0cnVjdCBsb2NhbF9kcm1fbW9kZV9mYl9jbWQy IHsKIAogI2RlZmluZSBMT0NBTF9EUk1fQ0FQX0FEREZCMl9NT0RJRklFUlMJMHgxMAogCitib29s IGlndF9oYXNfZmJfbW9kaWZpZXJzKGludCBmZCk7CiB2b2lkIGlndF9yZXF1aXJlX2ZiX21vZGlm aWVycyhpbnQgZmQpOwogCiAvKioKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Deepak Rawat Date: Tue, 16 Oct 2018 15:23:39 -0700 Message-ID: <20181016222341.1537-3-drawat@vmware.com> In-Reply-To: <20181016222341.1537-1-drawat@vmware.com> References: <20181016222341.1537-1-drawat@vmware.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 3/5] lib: Don't call igt_require_fb_modifiers() when no modifier List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-graphics-maintainer@vmware.com Cc: Deepak Rawat , petri.latvala@intel.com List-ID: dm13Z2Z4IGFuZCBhbWRncHUgZG9lc24ndCBzdXBwb3J0IGZiIG1vZGlmaWVycywgeWV0IGttc19h ZGRmYigpIHJlcXVpcmVzCm1vZGlmaWVyIHN1cHBvcnQuIFNpbmNlIG1hbnkgdGVzdHMgZG9uJ3Qg bmVlZCB0aGlzIHRvIHJ1biwgdGhlCnJlcXVpcmVtZW50IGNhbiBiZSBtYWRlIGxlc3MgYnJvYWQu CgpUaGVyZWZvcmUsIHRpZ2h0ZW4gdGhlIHJlcXVpcmVtZW50IHRvIGNhc2VzIHdoZXJlIG1vZGlm aWVycyBhcmUgYWN0dWFsbHkKbmVlZGVkLgoKdjI6CiogSW4gY3JlYXRlX2ZiKCkgY2FsbHMgdG8g a21zX2FkZGZiKCksIHJlbW92ZSB0aGUgbW9kaWZpZXIgZmxhZyBpZmYgdGhlCiAgZHJpdmVyIGRv ZXNuJ3Qgc3VwcG9ydCBtb2RpZmllcnMgYW5kIHRoZSBtb2RpZmVyIGlzIDAKKiBEb24ndCBtb2Rp ZnkgdGhlIGZsYWcgaW4ga21zX2FkZGZiKCkuCgpTaWduZWQtb2ZmLWJ5OiBEZWVwYWsgUmF3YXQg PGRyYXdhdEB2bXdhcmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBMZW8gTGkgPHN1bnBlbmcubGlAYW1k LmNvbT4KLS0tCiBsaWIvaWd0X2ZiLmMgICAgICAgICB8ICA3ICsrKysrLS0KIGxpYi9pb2N0bF93 cmFwcGVycy5jIHwgMjQgKysrKysrKysrKysrKysrLS0tLS0tLS0tCiBsaWIvaW9jdGxfd3JhcHBl cnMuaCB8ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9mYi5jIGIvbGliL2lndF9mYi5jCmluZGV4IDFi YjZkMzI0Li41ZGNhMWNmYSAxMDA2NDQKLS0tIGEvbGliL2lndF9mYi5jCisrKyBiL2xpYi9pZ3Rf ZmIuYwpAQCAtOTEzLDYgKzkxMyw3IEBAIGlndF9jcmVhdGVfZmJfd2l0aF9ib19zaXplKGludCBm ZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCS8qIEZJWE1FIGFsbG93IHRoZSBjYWxsZXIgdG8g cGFzcyB0aGVzZSBpbiAqLwogCWVudW0gaWd0X2NvbG9yX2VuY29kaW5nIGNvbG9yX2VuY29kaW5n ID0gSUdUX0NPTE9SX1lDQkNSX0JUNzA5OwogCWVudW0gaWd0X2NvbG9yX3JhbmdlIGNvbG9yX3Jh bmdlID0gSUdUX0NPTE9SX1lDQkNSX0xJTUlURURfUkFOR0U7CisJdWludDMyX3QgZmxhZ3MgPSAw OwogCiAJZmJfaW5pdChmYiwgZmQsIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwgdGlsaW5nLAogCQlj b2xvcl9lbmNvZGluZywgY29sb3JfcmFuZ2UpOwpAQCAtOTMxLDExICs5MzIsMTMgQEAgaWd0X2Ny ZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCiAJaWd0 X2RlYnVnKCIlcyhoYW5kbGU9JWQsIHBpdGNoPSVkKVxuIiwKIAkJICBfX2Z1bmNfXywgZmItPmdl bV9oYW5kbGUsIGZiLT5zdHJpZGVzWzBdKTsKIAorCWlmIChmYi0+dGlsaW5nIHx8IGlndF9oYXNf ZmJfbW9kaWZpZXJzKGZkKSkKKwkJZmxhZ3MgPSBMT0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlM7 CisKIAlkb19vcl9kaWUoX19rbXNfYWRkZmIoZmItPmZkLCBmYi0+Z2VtX2hhbmRsZSwKIAkJCSAg ICAgIGZiLT53aWR0aCwgZmItPmhlaWdodCwKIAkJCSAgICAgIGZiLT5kcm1fZm9ybWF0LCBmYi0+ dGlsaW5nLAotCQkJICAgICAgZmItPnN0cmlkZXMsIGZiLT5vZmZzZXRzLCBmYi0+bnVtX3BsYW5l cywKLQkJCSAgICAgIExPQ0FMX0RSTV9NT0RFX0ZCX01PRElGSUVSUywKKwkJCSAgICAgIGZiLT5z dHJpZGVzLCBmYi0+b2Zmc2V0cywgZmItPm51bV9wbGFuZXMsIGZsYWdzLAogCQkJICAgICAgJmZi LT5mYl9pZCkpOwogCiAJcmV0dXJuIGZiLT5mYl9pZDsKZGlmZiAtLWdpdCBhL2xpYi9pb2N0bF93 cmFwcGVycy5jIGIvbGliL2lvY3RsX3dyYXBwZXJzLmMKaW5kZXggMDkyOWM0M2YuLjEwZDMyYmVj IDEwMDY0NAotLS0gYS9saWIvaW9jdGxfd3JhcHBlcnMuYworKysgYi9saWIvaW9jdGxfd3JhcHBl cnMuYwpAQCAtMTY0NiwxMyArMTY0Niw3IEBAIHZvaWQgcHJpbWVfc3luY19lbmQoaW50IGRtYV9i dWZfZmQsIGJvb2wgd3JpdGUpCiAJZG9faW9jdGwoZG1hX2J1Zl9mZCwgTE9DQUxfRE1BX0JVRl9J T0NUTF9TWU5DLCAmc3luY19lbmQpOwogfQogCi0vKioKLSAqIGlndF9yZXF1aXJlX2ZiX21vZGlm aWVyczoKLSAqIEBmZDogT3BlbiBEUk0gZmlsZSBkZXNjcmlwdG9yLgotICoKLSAqIFJlcXVpcmVz IHByZXNlbmNlIG9mIERSTV9DQVBfQURERkIyX01PRElGSUVSUy4KLSAqLwotdm9pZCBpZ3RfcmVx dWlyZV9mYl9tb2RpZmllcnMoaW50IGZkKQorYm9vbCBpZ3RfaGFzX2ZiX21vZGlmaWVycyhpbnQg ZmQpCiB7CiAJc3RhdGljIGJvb2wgaGFzX21vZGlmaWVycywgY2FwX21vZGlmaWVyc190ZXN0ZWQ7 CiAKQEAgLTE2NjYsNyArMTY2MCwxOCBAQCB2b2lkIGlndF9yZXF1aXJlX2ZiX21vZGlmaWVycyhp bnQgZmQpCiAJCWNhcF9tb2RpZmllcnNfdGVzdGVkID0gdHJ1ZTsKIAl9CiAKLQlpZ3RfcmVxdWly ZShoYXNfbW9kaWZpZXJzKTsKKwlyZXR1cm4gaGFzX21vZGlmaWVyczsKK30KKworLyoqCisgKiBp Z3RfcmVxdWlyZV9mYl9tb2RpZmllcnM6CisgKiBAZmQ6IE9wZW4gRFJNIGZpbGUgZGVzY3JpcHRv ci4KKyAqCisgKiBSZXF1aXJlcyBwcmVzZW5jZSBvZiBEUk1fQ0FQX0FEREZCMl9NT0RJRklFUlMu CisgKi8KK3ZvaWQgaWd0X3JlcXVpcmVfZmJfbW9kaWZpZXJzKGludCBmZCkKK3sKKwlpZ3RfcmVx dWlyZShpZ3RfaGFzX2ZiX21vZGlmaWVycyhmZCkpOwogfQogCiBpbnQgX19rbXNfYWRkZmIoaW50 IGZkLCB1aW50MzJfdCBoYW5kbGUsCkBAIC0xNjc4LDcgKzE2ODMsOCBAQCBpbnQgX19rbXNfYWRk ZmIoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsCiAJc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgZjsK IAlpbnQgcmV0LCBpOwogCi0JaWd0X3JlcXVpcmVfZmJfbW9kaWZpZXJzKGZkKTsKKwlpZiAoZmxh Z3MgJiBEUk1fTU9ERV9GQl9NT0RJRklFUlMpCisJCWlndF9yZXF1aXJlX2ZiX21vZGlmaWVycyhm ZCk7CiAKIAltZW1zZXQoJmYsIDAsIHNpemVvZihmKSk7CiAKZGlmZiAtLWdpdCBhL2xpYi9pb2N0 bF93cmFwcGVycy5oIGIvbGliL2lvY3RsX3dyYXBwZXJzLmgKaW5kZXggYzRlMTk1NmMuLmIyMmIz NmIwIDEwMDY0NAotLS0gYS9saWIvaW9jdGxfd3JhcHBlcnMuaAorKysgYi9saWIvaW9jdGxfd3Jh cHBlcnMuaApAQCAtMjI3LDYgKzIyNyw3IEBAIHN0cnVjdCBsb2NhbF9kcm1fbW9kZV9mYl9jbWQy IHsKIAogI2RlZmluZSBMT0NBTF9EUk1fQ0FQX0FEREZCMl9NT0RJRklFUlMJMHgxMAogCitib29s IGlndF9oYXNfZmJfbW9kaWZpZXJzKGludCBmZCk7CiB2b2lkIGlndF9yZXF1aXJlX2ZiX21vZGlm aWVycyhpbnQgZmQpOwogCiAvKioKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pZ3QtZGV2Cg==