From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 30/42] drm/i915: Remove use of crtc->config in intel_hdmi.c Date: Mon, 11 May 2015 16:25:06 +0200 Message-ID: <1431354318-11995-31-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-1-git-send-email-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 ESMTP id 0F4016E423 for ; Mon, 11 May 2015 07:25:45 -0700 (PDT) In-Reply-To: <1431354318-11995-1-git-send-email-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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgfCA1OCAr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz NSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1p LmMKaW5kZXggNzY5OTRkYzAzM2EzLi45ZWZjM2RkNjJhMDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMKQEAgLTM0NSwxNCArMzQ1LDE1IEBAIHN0YXRpYyB2b2lkIGhzd193cml0ZV9pbmZv ZnJhbWUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAogCWNvbnN0IHVpbnQzMl90ICpkYXRh ID0gZnJhbWU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5jcnRjKTsK LQl1MzIgY3RsX3JlZyA9IEhTV19UVklERU9fRElQX0NUTChpbnRlbF9jcnRjLT5jb25maWctPmNw dV90cmFuc2NvZGVyKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQor CQl0b19pbnRlbF9jcnRjX3N0YXRlKGVuY29kZXItPmNydGMtPnN0YXRlKTsKKwl1MzIgY3RsX3Jl ZyA9IEhTV19UVklERU9fRElQX0NUTChwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXIpOwogCXUz MiBkYXRhX3JlZzsKIAlpbnQgaTsKIAl1MzIgdmFsID0gSTkxNV9SRUFEKGN0bF9yZWcpOwogCiAJ ZGF0YV9yZWcgPSBoc3dfaW5mb2ZyYW1lX2RhdGFfcmVnKHR5cGUsCi0JCQkJCSAgaW50ZWxfY3J0 Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlciwKKwkJCQkJICBwaXBlX2NvbmZpZy0+Y3B1X3RyYW5z Y29kZXIsCiAJCQkJCSAgZGV2X3ByaXYpOwogCWlmIChkYXRhX3JlZyA9PSAwKQogCQlyZXR1cm47 CkBAIC0zODAsNyArMzgxLDkgQEAgc3RhdGljIGJvb2wgaHN3X2luZm9mcmFtZV9lbmFibGVkKHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5j b2Rlci0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGVuY29kZXItPmNydGMpOwotCXUzMiBjdGxfcmVnID0gSFNXX1RWSURFT19ESVBfQ1RMKGludGVs X2NydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXIpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZyA9CisJCXRvX2ludGVsX2NydGNfc3RhdGUoaW50ZWxfY3J0Yy0+YmFzZS5z dGF0ZSk7CisJdTMyIGN0bF9yZWcgPSBIU1dfVFZJREVPX0RJUF9DVEwocGlwZV9jb25maWctPmNw dV90cmFuc2NvZGVyKTsKIAl1MzIgdmFsID0gSTkxNV9SRUFEKGN0bF9yZWcpOwogCiAJcmV0dXJu IHZhbCAmIChWSURFT19ESVBfRU5BQkxFX0FWSV9IU1cgfCBWSURFT19ESVBfRU5BQkxFX1NQRF9I U1cgfApAQCAtNDMwLDcgKzQzMyw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfc2V0X2F2aV9p bmZvZnJhbWUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAogCQkJCQkgc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUpCiB7CiAJc3RydWN0IGludGVsX2hkbWkgKmludGVs X2hkbWkgPSBlbmNfdG9faW50ZWxfaGRtaShlbmNvZGVyKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+Y3J0Yyk7CisJc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KKwkJdG9faW50ZWxfY3J0Y19zdGF0ZShlbmNvZGVy LT5jcnRjLT5zdGF0ZSk7CiAJdW5pb24gaGRtaV9pbmZvZnJhbWUgZnJhbWU7CiAJaW50IHJldDsK IApAQCAtNDQ1LDcgKzQ0OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfc2V0X2F2aV9pbmZv ZnJhbWUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAogCX0KIAogCWlmIChpbnRlbF9oZG1p LT5yZ2JfcXVhbnRfcmFuZ2Vfc2VsZWN0YWJsZSkgewotCQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmln LT5saW1pdGVkX2NvbG9yX3JhbmdlKQorCQlpZiAocGlwZV9jb25maWctPmxpbWl0ZWRfY29sb3Jf cmFuZ2UpCiAJCQlmcmFtZS5hdmkucXVhbnRpemF0aW9uX3JhbmdlID0KIAkJCQlIRE1JX1FVQU5U SVpBVElPTl9SQU5HRV9MSU1JVEVEOwogCQllbHNlCkBAIC02NzksOSArNjgzLDEwIEBAIHN0YXRp YyB2b2lkIGhzd19zZXRfaW5mb2ZyYW1lcyhzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJ CQkgICAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5jb2Rlci0+ZGV2LT5kZXZfcHJpdmF0 ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rl ci0+Y3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KKwkJdG9f aW50ZWxfY3J0Y19zdGF0ZShlbmNvZGVyLT5jcnRjLT5zdGF0ZSk7CiAJc3RydWN0IGludGVsX2hk bWkgKmludGVsX2hkbWkgPSBlbmNfdG9faW50ZWxfaGRtaShlbmNvZGVyKTsKLQl1MzIgcmVnID0g SFNXX1RWSURFT19ESVBfQ1RMKGludGVsX2NydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXIpOwor CXUzMiByZWcgPSBIU1dfVFZJREVPX0RJUF9DVEwocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVy KTsKIAl1MzIgdmFsID0gSTkxNV9SRUFEKHJlZyk7CiAKIAlhc3NlcnRfaGRtaV9wb3J0X2Rpc2Fi bGVkKGludGVsX2hkbWkpOwpAQCAtNzA5LDcgKzcxNCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX2hk bWlfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9j cnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwogCXN0cnVjdCBp bnRlbF9oZG1pICppbnRlbF9oZG1pID0gZW5jX3RvX2ludGVsX2hkbWkoJmVuY29kZXItPmJhc2Up OwotCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJmNydGMtPmNvbmZp Zy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv bmZpZyA9CisJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CisJc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmcGlwZV9jb25maWctPmJhc2UuYWRq dXN0ZWRfbW9kZTsKIAl1MzIgaGRtaV92YWw7CiAKIAloZG1pX3ZhbCA9IFNEVk9fRU5DT0RJTkdf SERNSTsKQEAgLTcyMCwxMiArNzI3LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfcHJlcGFy ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlpZiAoYWRqdXN0ZWRfbW9kZS0+Zmxh Z3MgJiBEUk1fTU9ERV9GTEFHX1BIU1lOQykKIAkJaGRtaV92YWwgfD0gU0RWT19IU1lOQ19BQ1RJ VkVfSElHSDsKIAotCWlmIChjcnRjLT5jb25maWctPnBpcGVfYnBwID4gMjQpCisJaWYgKHBpcGVf Y29uZmlnLT5waXBlX2JwcCA+IDI0KQogCQloZG1pX3ZhbCB8PSBIRE1JX0NPTE9SX0ZPUk1BVF8x MmJwYzsKIAllbHNlCiAJCWhkbWlfdmFsIHw9IFNEVk9fQ09MT1JfRk9STUFUXzhicGM7CiAKLQlp ZiAoY3J0Yy0+Y29uZmlnLT5oYXNfaGRtaV9zaW5rKQorCWlmIChwaXBlX2NvbmZpZy0+aGFzX2hk bWlfc2luaykKIAkJaGRtaV92YWwgfD0gSERNSV9NT0RFX1NFTEVDVF9IRE1JOwogCiAJaWYgKEhB U19QQ0hfQ1BUKGRldikpCkBAIC04MTksMTEgKzgyNiwxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9l bmFibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGludGVsX2Ny dGMtPmJhc2Uuc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9oZG1pICppbnRlbF9oZG1pID0gZW5jX3Rv X2ludGVsX2hkbWkoJmVuY29kZXItPmJhc2UpOwogCXUzMiB0ZW1wOwogCXUzMiBlbmFibGVfYml0 cyA9IFNEVk9fRU5BQkxFOwogCi0JaWYgKGludGVsX2NydGMtPmNvbmZpZy0+aGFzX2F1ZGlvKQor CWlmIChwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvKQogCQllbmFibGVfYml0cyB8PSBTRFZPX0FVRElP X0VOQUJMRTsKIAogCXRlbXAgPSBJOTE1X1JFQUQoaW50ZWxfaGRtaS0+aGRtaV9yZWcpOwpAQCAt ODU0LDggKzg2Myw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyKQogCQlQT1NUSU5HX1JFQUQoaW50ZWxfaGRtaS0+aGRtaV9yZWcp OwogCX0KIAotCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19hdWRpbykgewotCQlXQVJOX09O KCFpbnRlbF9jcnRjLT5jb25maWctPmhhc19oZG1pX3NpbmspOworCWlmIChwaXBlX2NvbmZpZy0+ aGFzX2F1ZGlvKSB7CisJCVdBUk5fT04oIXBpcGVfY29uZmlnLT5oYXNfaGRtaV9zaW5rKTsKIAkJ RFJNX0RFQlVHX0RSSVZFUigiRW5hYmxpbmcgSERNSSBhdWRpbyBvbiBwaXBlICVjXG4iLAogCQkJ CSBwaXBlX25hbWUoaW50ZWxfY3J0Yy0+cGlwZSkpOwogCQlpbnRlbF9hdWRpb19jb2RlY19lbmFi bGUoZW5jb2Rlcik7CkBAIC0xMjY3LDE0ICsxMjc2LDE1IEBAIGRvbmU6CiBzdGF0aWMgdm9pZCBp bnRlbF9oZG1pX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiB7CiAJ c3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBlbmNfdG9faW50ZWxfaGRtaSgmZW5jb2Rl ci0+YmFzZSk7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGVuY29kZXItPmJhc2UuY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnID0KKwkJdG9faW50ZWxfY3J0Y19zdGF0ZShlbmNvZGVyLT5iYXNlLmNydGMtPnN0YXRlKTsK IAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9Ci0JCSZpbnRlbF9jcnRj LT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKKwkJJnBpcGVfY29uZmlnLT5iYXNlLmFkanVz dGVkX21vZGU7CiAKIAlpbnRlbF9oZG1pX3ByZXBhcmUoZW5jb2Rlcik7CiAKIAlpbnRlbF9oZG1p LT5zZXRfaW5mb2ZyYW1lcygmZW5jb2Rlci0+YmFzZSwKLQkJCQkgICBpbnRlbF9jcnRjLT5jb25m aWctPmhhc19oZG1pX3NpbmssCisJCQkJICAgcGlwZV9jb25maWctPmhhc19oZG1pX3NpbmssCiAJ CQkJICAgYWRqdXN0ZWRfbW9kZSk7CiB9CiAKQEAgLTEyODYsOCArMTI5NiwxMCBAQCBzdGF0aWMg dm9pZCB2bHZfaGRtaV9wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPQogCQl0b19pbnRlbF9jcnRjKGVuY29kZXIt PmJhc2UuY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KKwkJ dG9faW50ZWxfY3J0Y19zdGF0ZShpbnRlbF9jcnRjLT5iYXNlLnN0YXRlKTsKIAlzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9Ci0JCSZpbnRlbF9jcnRjLT5jb25maWctPmJh c2UuYWRqdXN0ZWRfbW9kZTsKKwkJJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJ ZW51bSBkcGlvX2NoYW5uZWwgcG9ydCA9IHZsdl9kcG9ydF90b19jaGFubmVsKGRwb3J0KTsKIAlp bnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJdTMyIHZhbDsKQEAgLTEzMTksNyArMTMzMSw3 IEBAIHN0YXRpYyB2b2lkIHZsdl9oZG1pX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIpCiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHBpb19sb2NrKTsKIAogCWludGVs X2hkbWktPnNldF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLAotCQkJCSAgIGludGVsX2NydGMt PmNvbmZpZy0+aGFzX2hkbWlfc2luaywKKwkJCQkgICBwaXBlX2NvbmZpZy0+aGFzX2hkbWlfc2lu aywKIAkJCQkgICBhZGp1c3RlZF9tb2RlKTsKIAogCWludGVsX2VuYWJsZV9oZG1pKGVuY29kZXIp OwpAQCAtMTUzMSwxMyArMTU0MywxMyBAQCBzdGF0aWMgdm9pZCBjaHZfaGRtaV9wcmVfZW5hYmxl KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCX0KIAogCS8qIERhdGEgbGFuZSBzdGFn Z2VyIHByb2dyYW1taW5nICovCi0JaWYgKGludGVsX2NydGMtPmNvbmZpZy0+cG9ydF9jbG9jayA+ IDI3MDAwMCkKKwlpZiAocGlwZV9jb25maWctPnBvcnRfY2xvY2sgPiAyNzAwMDApCiAJCXN0YWdn ZXIgPSAweDE4OwotCWVsc2UgaWYgKGludGVsX2NydGMtPmNvbmZpZy0+cG9ydF9jbG9jayA+IDEz NTAwMCkKKwllbHNlIGlmIChwaXBlX2NvbmZpZy0+cG9ydF9jbG9jayA+IDEzNTAwMCkKIAkJc3Rh Z2dlciA9IDB4ZDsKLQllbHNlIGlmIChpbnRlbF9jcnRjLT5jb25maWctPnBvcnRfY2xvY2sgPiA2 NzUwMCkKKwllbHNlIGlmIChwaXBlX2NvbmZpZy0+cG9ydF9jbG9jayA+IDY3NTAwKQogCQlzdGFn Z2VyID0gMHg3OwotCWVsc2UgaWYgKGludGVsX2NydGMtPmNvbmZpZy0+cG9ydF9jbG9jayA+IDMz NzUwKQorCWVsc2UgaWYgKHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrID4gMzM3NTApCiAJCXN0YWdn ZXIgPSAweDQ7CiAJZWxzZQogCQlzdGFnZ2VyID0gMHgyOwotLSAKMi4xLjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==