From: John.C.Harrison@Intel.com Subject: [PATCH 01/10] drm/i915: Rename 'flags' to 'dispatch_flags' for better code reading Date: Tue, 9 Dec 2014 12:59:04 +0000 Message-ID: <1418129953-1505-2-git-send-email-John.C.Harrison@Intel.com> References: <1418129953-1505-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 095F46F81F for ; Tue, 9 Dec 2014 04:59:16 -0800 (PST) In-Reply-To: <1418129953-1505-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZXJlIGlz IGEgZmxhZ3Mgd29yZCB0aGF0IGlzIHBhc3NlZCB0aHJvdWdoIHRoZSBleGVjYnVmZmVyIGNvZGUg cGF0aCBhbGwgdGhlCndheSBmcm9tIGluaXRpYWwgZGVjb2Rpbmcgb2YgdGhlIHVzZXIgcGFyYW1l dGVycyBkb3duIHRvIHRoZSB2ZXJ5IGZpbmFsIGRpc3BhdGNoCmJ1ZmZlciBjYWxsLiBJdCBpcyBz aW1wbHkgY2FsbGVkICdmbGFncycuIFVuZm9ydHVhbnRlbHksIHRoZXJlIGFyZSBtYW55IG90aGVy CmZsYWdzIHdvcmRzIGZsb2F0aW5nIGFyb3VuZCBpbiB0aGUgc2FtZSBibG9ja3Mgb2YgY29kZS4g RXZlbiBtb3JlIG9uY2UgdGhlIEdQVQpzY2hlZHVsZXIgYXJyaXZlcy4KClRoaXMgcGF0Y2ggbWFr ZXMgaXQgbW9yZSBvYnZpb3VzIGV4YWN0bHkgd2hpY2ggZmxhZ3Mgd29yZCBpcyB3aGljaCBieSBy ZW5hbWluZwonZmxhZ3MnIHRvICdkaXNwYXRjaF9mbGFncycuIE5vdGUgdGhhdCB0aGUgYml0IGRl ZmluaXRpb25zIGZvciB0aGlzIGZsYWdzIHdvcmQKYWxyZWFkeSBoYXZlIGFuICdJOTE1X0RJU1BB VENIXycgcHJlZml4IG9uIHRoZW0gYW5kIHNvIGFyZSBub3QgcXVpdGUgc28KYW1iaWd1b3VzLgoK Q2hhbmdlLUlkOiBJYmM4NTg5MzBjNGE2MDY3NjNmODQ3NTBjNTAwOGFmMDdjZjI0NWE5MApGb3I6 IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJ bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j IHwgICAyMyArKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgICAgICAgICAgIHwgICAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5oICAgICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaCAgICB8ICAgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9u cygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jCmluZGV4IDBjMjVmNjIuLmFhNDU2NmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEwNzEsNyArMTA3MSw3IEBAIGk5MTVfZ2VtX3Jp bmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUsCiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJn cywKIAkJCSAgICAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAogCQkJICAgICAgIHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpiYXRjaF9vYmosCi0JCQkgICAgICAgdTY0IGV4ZWNfc3RhcnQs IHUzMiBmbGFncykKKwkJCSAgICAgICB1NjQgZXhlY19zdGFydCwgdTMyIGRpc3BhdGNoX2ZsYWdz KQogewogCXN0cnVjdCBkcm1fY2xpcF9yZWN0ICpjbGlwcmVjdHMgPSBOVUxMOwogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xMTk5LDE5 ICsxMTk5LDE5IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAKIAkJCXJldCA9IHJpbmctPmRpc3Bh dGNoX2V4ZWNidWZmZXIocmluZywKIAkJCQkJCQlleGVjX3N0YXJ0LCBleGVjX2xlbiwKLQkJCQkJ CQlmbGFncyk7CisJCQkJCQkJZGlzcGF0Y2hfZmxhZ3MpOwogCQkJaWYgKHJldCkKIAkJCQlnb3Rv IGVycm9yOwogCQl9CiAJfSBlbHNlIHsKIAkJcmV0ID0gcmluZy0+ZGlzcGF0Y2hfZXhlY2J1ZmZl cihyaW5nLAogCQkJCQkJZXhlY19zdGFydCwgZXhlY19sZW4sCi0JCQkJCQlmbGFncyk7CisJCQkJ CQlkaXNwYXRjaF9mbGFncyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KIAotCXRy YWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2goaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKSwg ZmxhZ3MpOworCXRyYWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2goaW50ZWxfcmluZ19nZXRfcmVx dWVzdChyaW5nKSwgZGlzcGF0Y2hfZmxhZ3MpOwogCiAJaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3Zl X3RvX2FjdGl2ZSh2bWFzLCByaW5nKTsKIAlpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21t YW5kcyhkZXYsIGZpbGUsIHJpbmcsIGJhdGNoX29iaik7CkBAIC0xMjg1LDcgKzEyODUsNyBAQCBp OTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEs CiAJc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm07CiAJY29uc3QgdTMyIGN0eF9pZCA9IGk5 MTVfZXhlY2J1ZmZlcjJfZ2V0X2NvbnRleHRfaWQoKmFyZ3MpOwogCXU2NCBleGVjX3N0YXJ0ID0g YXJncy0+YmF0Y2hfc3RhcnRfb2Zmc2V0OwotCXUzMiBmbGFnczsKKwl1MzIgZGlzcGF0Y2hfZmxh Z3M7CiAJaW50IHJldDsKIAlib29sIG5lZWRfcmVsb2NzOwogCkBAIC0xMjk2LDE1ICsxMjk2LDE1 IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAq ZGF0YSwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JZmxhZ3MgPSAwOworCWRpc3BhdGNo X2ZsYWdzID0gMDsKIAlpZiAoYXJncy0+ZmxhZ3MgJiBJOTE1X0VYRUNfU0VDVVJFKSB7CiAJCWlm ICghZmlsZS0+aXNfbWFzdGVyIHx8ICFjYXBhYmxlKENBUF9TWVNfQURNSU4pKQogCQkgICAgcmV0 dXJuIC1FUEVSTTsKIAotCQlmbGFncyB8PSBJOTE1X0RJU1BBVENIX1NFQ1VSRTsKKwkJZGlzcGF0 Y2hfZmxhZ3MgfD0gSTkxNV9ESVNQQVRDSF9TRUNVUkU7CiAJfQogCWlmIChhcmdzLT5mbGFncyAm IEk5MTVfRVhFQ19JU19QSU5ORUQpCi0JCWZsYWdzIHw9IEk5MTVfRElTUEFUQ0hfUElOTkVEOwor CQlkaXNwYXRjaF9mbGFncyB8PSBJOTE1X0RJU1BBVENIX1BJTk5FRDsKIAogCWlmICgoYXJncy0+ ZmxhZ3MgJiBJOTE1X0VYRUNfUklOR19NQVNLKSA+IExBU1RfVVNFUl9SSU5HKSB7CiAJCURSTV9E RUJVRygiZXhlY2J1ZiB3aXRoIHVua25vd24gcmluZzogJWRcbiIsCkBAIC0xNDIxLDcgKzE0MjEs NyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJLyogc25iL2l2Yi92bHYgY29uZmxhdGUgdGhlICJiYXRjaCBpbiBwcGd0dCIgYml0 IHdpdGggdGhlICJub24tc2VjdXJlCiAJICogYmF0Y2giIGJpdC4gSGVuY2Ugd2UgbmVlZCB0byBw aW4gc2VjdXJlIGJhdGNoZXMgaW50byB0aGUgZ2xvYmFsIGd0dC4KIAkgKiBoc3cgc2hvdWxkIGhh dmUgdGhpcyBmaXhlZCwgYnV0IGJkdyBtdWNrcyBpdCB1cCBhZ2Fpbi4gKi8KLQlpZiAoZmxhZ3Mg JiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkgeworCWlmIChkaXNwYXRjaF9mbGFncyAmIEk5MTVfRElT UEFUQ0hfU0VDVVJFKSB7CiAJCS8qCiAJCSAqIFNvIG9uIGZpcnN0IGdsYW5jZSBpdCBsb29rcyBm cmVha3kgdGhhdCB3ZSBwaW4gdGhlIGJhdGNoIGhlcmUKIAkJICogb3V0c2lkZSBvZiB0aGUgcmVz ZXJ2YXRpb24gbG9vcC4gQnV0OgpAQCAtMTQ0MSw3ICsxNDQxLDggQEAgaTkxNV9nZW1fZG9fZXhl Y2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlleGVjX3N0YXJ0 ICs9IGk5MTVfZ2VtX29ial9vZmZzZXQoYmF0Y2hfb2JqLCB2bSk7CiAKIAlyZXQgPSBkZXZfcHJp di0+Z3QuZG9fZXhlY2J1ZihkZXYsIGZpbGUsIHJpbmcsIGN0eCwgYXJncywKLQkJCQkgICAgICAm ZWItPnZtYXMsIGJhdGNoX29iaiwgZXhlY19zdGFydCwgZmxhZ3MpOworCQkJCSAgICAgICZlYi0+ dm1hcywgYmF0Y2hfb2JqLCBleGVjX3N0YXJ0LAorCQkJCSAgICAgIGRpc3BhdGNoX2ZsYWdzKTsK IAogCS8qCiAJICogRklYTUU6IFdlIGNydWNpYWxseSByZWx5IHVwb24gdGhlIGFjdGl2ZSB0cmFj a2luZyBmb3IgdGhlIChwcGd0dCkKQEAgLTE0NDksNyArMTQ1MCw3IEBAIGk5MTVfZ2VtX2RvX2V4 ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkgKiBuZWVkcyB0 byBiZSBhZGp1c3RlZCB0byBhbHNvIHRyYWNrIHRoZSBnZ3R0IGJhdGNoIHZtYSBwcm9wZXJseSBh cwogCSAqIGFjdGl2ZS4KIAkgKi8KLQlpZiAoZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkK KwlpZiAoZGlzcGF0Y2hfZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkKIAkJaTkxNV9nZW1f b2JqZWN0X2dndHRfdW5waW4oYmF0Y2hfb2JqKTsKIGVycjoKIAkvKiB0aGUgcmVxdWVzdCBvd25z IHRoZSByZWYgbm93ICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGE4MjAyMGUuLmI4 YmFmMTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC02NDYsNyArNjQ2LDcgQEAgc3Rh dGljIGludCBleGVjbGlzdHNfbW92ZV90b19ncHUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYsCiAgKiBAdm1hczogbGlzdCBvZiB2bWFzLgogICogQGJhdGNoX29iajogdGhlIGJhdGNo YnVmZmVyIHRvIHN1Ym1pdC4KICAqIEBleGVjX3N0YXJ0OiBiYXRjaGJ1ZmZlciBzdGFydCB2aXJ0 dWFsIGFkZHJlc3MgcG9pbnRlci4KLSAqIEBmbGFnczogdHJhbnNsYXRlZCBleGVjYnVmZmVyIGNh bGwgZmxhZ3MuCisgKiBAZGlzcGF0Y2hfZmxhZ3M6IHRyYW5zbGF0ZWQgZXhlY2J1ZmZlciBjYWxs IGZsYWdzLgogICoKICAqIFRoaXMgaXMgdGhlIGV2aWwgdHdpbiB2ZXJzaW9uIG9mIGk5MTVfZ2Vt X3JpbmdidWZmZXJfc3VibWlzc2lvbi4gSXQgYWJzdHJhY3RzCiAgKiBhd2F5IHRoZSBzdWJtaXNz aW9uIGRldGFpbHMgb2YgdGhlIGV4ZWNidWZmZXIgaW9jdGwgY2FsbC4KQEAgLTY1OSw3ICs2NTks NyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRl diwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCQkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1f ZXhlY2J1ZmZlcjIgKmFyZ3MsCiAJCQkgICAgICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcywKIAkJ CSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqLAotCQkJICAgICAg IHU2NCBleGVjX3N0YXJ0LCB1MzIgZmxhZ3MpCisJCQkgICAgICAgdTY0IGV4ZWNfc3RhcnQsIHUz MiBkaXNwYXRjaF9mbGFncykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0g Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7CkBAIC03MzIsNyArNzMyLDcgQEAgaW50IGlu dGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSwKIAkJZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlID0gaW5z dHBfbW9kZTsKIAl9CiAKLQlyZXQgPSByaW5nLT5lbWl0X2JiX3N0YXJ0KHJpbmdidWYsIGV4ZWNf c3RhcnQsIGZsYWdzKTsKKwlyZXQgPSByaW5nLT5lbWl0X2JiX3N0YXJ0KHJpbmdidWYsIGV4ZWNf c3RhcnQsIGRpc3BhdGNoX2ZsYWdzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDE0YjIxNmIuLmI4ZDUzNjQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5oCkBAIC04MCw3ICs4MCw3IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlz c2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQkg ICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKIAkJCSAgICAgICBz dHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAogCQkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpiYXRjaF9vYmosCi0JCQkgICAgICAgdTY0IGV4ZWNfc3RhcnQsIHUzMiBmbGFncyk7CisJ CQkgICAgICAgdTY0IGV4ZWNfc3RhcnQsIHUzMiBkaXNwYXRjaF9mbGFncyk7CiB1MzIgaW50ZWxf ZXhlY2xpc3RzX2N0eF9pZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaik7CiAK IC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDZkYmI2ZjQu LjJlMGZhN2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTE2 OSw3ICsxNjksNyBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJCQkJICAgICB1MzIgc2Vx bm8pOwogCWludAkJKCpkaXNwYXRjaF9leGVjYnVmZmVyKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCQkJCQkgICAgICAgdTY0IG9mZnNldCwgdTMyIGxlbmd0aCwKLQkJCQkJICAgICAg IHVuc2lnbmVkIGZsYWdzKTsKKwkJCQkJICAgICAgIHVuc2lnbmVkIGRpc3BhdGNoX2ZsYWdzKTsK ICNkZWZpbmUgSTkxNV9ESVNQQVRDSF9TRUNVUkUgMHgxCiAjZGVmaW5lIEk5MTVfRElTUEFUQ0hf UElOTkVEIDB4MgogCXZvaWQJCSgqY2xlYW51cCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=