From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 4/9] drm: Remove drm_mode_object->atomic_count Date: Wed, 17 Aug 2016 22:56:01 +0200 Message-ID: <1471467366-26444-4-git-send-email-daniel.vetter@ffwll.ch> References: <1471467366-26444-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471467366-26444-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: DRI Development Cc: Daniel Vetter , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org SXQncyBvbmx5IHVzZWQgaW4gZHJtX21vZGVfb2JqZWN0X2dldF9wcm9wZXJ0aWVzLCBhbmQgd2Ug Y2FuIGNvbXB1dGUKaXQgdGhlcmUgZGlyZWN0bHkgd2l0aCBhIGJpdCBvZiBjb2RlIHNodWZmbGlu Zy4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jIHwgMzEgKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX21vZGVfb2JqZWN0LmggICAgIHwg IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jCmluZGV4IGNlZjkxMDRlODI4NS4uYTkyYWVlZDUx MTU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVjdC5jCkBAIC0yMDksOCArMjA5LDYgQEAgdm9p ZCBkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmos CiAJb2JqLT5wcm9wZXJ0aWVzLT5wcm9wZXJ0aWVzW2NvdW50XSA9IHByb3BlcnR5OwogCW9iai0+ cHJvcGVydGllcy0+dmFsdWVzW2NvdW50XSA9IGluaXRfdmFsOwogCW9iai0+cHJvcGVydGllcy0+ Y291bnQrKzsKLQlpZiAocHJvcGVydHktPmZsYWdzICYgRFJNX01PREVfUFJPUF9BVE9NSUMpCi0J CW9iai0+cHJvcGVydGllcy0+YXRvbWljX2NvdW50Kys7CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9v YmplY3RfYXR0YWNoX3Byb3BlcnR5KTsKIApAQCAtMjg4LDM1ICsyODYsMzAgQEAgaW50IGRybV9t b2RlX29iamVjdF9nZXRfcHJvcGVydGllcyhzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmosIGJv b2wgYXRvbWljLAogCQkJCSAgIHVpbnQ2NF90IF9fdXNlciAqcHJvcF92YWx1ZXMsCiAJCQkJICAg dWludDMyX3QgKmFyZ19jb3VudF9wcm9wcykKIHsKLQlpbnQgcHJvcHNfY291bnQ7Ci0JaW50IGks IHJldCwgY29waWVkOworCWludCBpLCByZXQsIGNvdW50OwogCi0JcHJvcHNfY291bnQgPSBvYmot PnByb3BlcnRpZXMtPmNvdW50OwotCWlmICghYXRvbWljKQotCQlwcm9wc19jb3VudCAtPSBvYmot PnByb3BlcnRpZXMtPmF0b21pY19jb3VudDsKKwlmb3IgKGkgPSAwLCBjb3VudCA9IDA7IGkgPCBv YmotPnByb3BlcnRpZXMtPmNvdW50OyBpKyspIHsKKwkJc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJv cCA9IG9iai0+cHJvcGVydGllcy0+cHJvcGVydGllc1tpXTsKKwkJdWludDY0X3QgdmFsOwogCi0J aWYgKCgqYXJnX2NvdW50X3Byb3BzID49IHByb3BzX2NvdW50KSAmJiBwcm9wc19jb3VudCkgewot CQlmb3IgKGkgPSAwLCBjb3BpZWQgPSAwOyBjb3BpZWQgPCBwcm9wc19jb3VudDsgaSsrKSB7Ci0J CQlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wID0gb2JqLT5wcm9wZXJ0aWVzLT5wcm9wZXJ0aWVz W2ldOwotCQkJdWludDY0X3QgdmFsOwotCi0JCQlpZiAoKHByb3AtPmZsYWdzICYgRFJNX01PREVf UFJPUF9BVE9NSUMpICYmICFhdG9taWMpCi0JCQkJY29udGludWU7CisJCWlmICgocHJvcC0+Zmxh Z3MgJiBEUk1fTU9ERV9QUk9QX0FUT01JQykgJiYgIWF0b21pYykKKwkJCWNvbnRpbnVlOwogCisJ CWlmICgqYXJnX2NvdW50X3Byb3BzID4gY291bnQpIHsKIAkJCXJldCA9IGRybV9vYmplY3RfcHJv cGVydHlfZ2V0X3ZhbHVlKG9iaiwgcHJvcCwgJnZhbCk7CiAJCQlpZiAocmV0KQogCQkJCXJldHVy biByZXQ7CiAKLQkJCWlmIChwdXRfdXNlcihwcm9wLT5iYXNlLmlkLCBwcm9wX3B0ciArIGNvcGll ZCkpCisJCQlpZiAocHV0X3VzZXIocHJvcC0+YmFzZS5pZCwgcHJvcF9wdHIgKyBjb3VudCkpCiAJ CQkJcmV0dXJuIC1FRkFVTFQ7CiAKLQkJCWlmIChwdXRfdXNlcih2YWwsIHByb3BfdmFsdWVzICsg Y29waWVkKSkKKwkJCWlmIChwdXRfdXNlcih2YWwsIHByb3BfdmFsdWVzICsgY291bnQpKQogCQkJ CXJldHVybiAtRUZBVUxUOwotCi0JCQljb3BpZWQrKzsKIAkJfQorCisJCWNvdW50Kys7CiAJfQot CSphcmdfY291bnRfcHJvcHMgPSBwcm9wc19jb3VudDsKKwkqYXJnX2NvdW50X3Byb3BzID0gY291 bnQ7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9tb2RlX29i amVjdC5oIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfb2JqZWN0LmgKaW5kZXggYzBlNDQxNDI5OWY3 Li5iOGFkYjY0MjVmMmEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9tb2RlX29iamVjdC5o CisrKyBiL2luY2x1ZGUvZHJtL2RybV9tb2RlX29iamVjdC5oCkBAIC0zNyw3ICszNyw3IEBAIHN0 cnVjdCBkcm1fbW9kZV9vYmplY3QgewogCiAjZGVmaW5lIERSTV9PQkpFQ1RfTUFYX1BST1BFUlRZ IDI0CiBzdHJ1Y3QgZHJtX29iamVjdF9wcm9wZXJ0aWVzIHsKLQlpbnQgY291bnQsIGF0b21pY19j b3VudDsKKwlpbnQgY291bnQ7CiAJLyogTk9URTogaWYgd2UgZXZlciBzdGFydCBkeW5hbWljYWxs eSBkZXN0cm95aW5nIHByb3BlcnRpZXMgKGllLgogCSAqIG5vdCBhdCBkcm1fbW9kZV9jb25maWdf Y2xlYW51cCgpIHRpbWUpLCB0aGVuIHdlJ2QgaGF2ZSB0byBkbwogCSAqIGEgYmV0dGVyIGpvYiBv ZiBkZXRhY2hpbmcgcHJvcGVydHkgZnJvbSBtb2RlIG9iamVjdHMgdG8gYXZvaWQKLS0gCjIuOC4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK