From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sinan Kaya Subject: [PATCH V3 27/29] video: fbdev: riva: deprecate pci_get_bus_and_slot() Date: Mon, 27 Nov 2017 11:58:04 -0500 Message-ID: <1511801886-6753-28-git-send-email-okaya@codeaurora.org> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: "open list:NVIDIA rivafb and nvidiafb FRAMEBUFFER DRIVER" , Antonino Daplas , Bartlomiej Zolnierkiewicz , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, open list , linux-arm-kernel@lists.infradead.org List-Id: linux-arm-msm@vger.kernel.org cGNpX2dldF9idXNfYW5kX3Nsb3QoKSBpcyByZXN0cmljdGl2ZSBzdWNoIHRoYXQgaXQgYXNzdW1l cyBkb21haW49MCBhcwp3aGVyZSBhIFBDSSBkZXZpY2UgaXMgcHJlc2VudC4gVGhpcyByZXN0cmlj dHMgdGhlIGRldmljZSBkcml2ZXJzIHRvIGJlCnJldXNlZCBmb3Igb3RoZXIgZG9tYWluIG51bWJl cnMuCgpHZXR0aW5nIHJlYWR5IHRvIHJlbW92ZSBwY2lfZ2V0X2J1c19hbmRfc2xvdCgpIGZ1bmN0 aW9uIGluIGZhdm9yIG9mCnBjaV9nZXRfZG9tYWluX2J1c19hbmRfc2xvdCgpLgoKc3RydWN0IHJp dmFfcGFyIGhhcyBhIHBvaW50ZXIgdG8gc3RydWN0IHBjaV9kZXYuIFVzZSB0aGUgcGNpX2RldiBt ZW1iZXIKdG8gZXh0cmFjdCB0aGUgZG9tYWluIGluZm9ybWF0aW9uLgoKQ2hhbmdlIHRoZSBmdW5j dGlvbiBzaWduYXR1cmUgZm9yIENhbGNTdGF0ZUV4dCBhbmQgUml2YUdldENvbmZpZyB0byBwYXNz CmluIHN0cnVjdCBwY2lfZGV2IGluIGFkZGl0aW9uIHRvIFJJVkFfSFdfSU5TVCBzbyB0aGF0IGNv ZGUgaW5zaWRlIHRoZQpyaXZhX2h3LmMgY2FuIGFsc28gY2FsY3VsYXRlIGRvbWFpbiBudW1iZXIg YW5kIHBhc3MgaXQgdG8KcGNpX2dldF9kb21haW5fYnVzX2FuZF9zbG90KCkuCgpTaWduZWQtb2Zm LWJ5OiBTaW5hbiBLYXlhIDxva2F5YUBjb2RlYXVyb3JhLm9yZz4KLS0tCiBkcml2ZXJzL3ZpZGVv L2ZiZGV2L3JpdmEvZmJkZXYuYyAgICAgfCAgMiArLQogZHJpdmVycy92aWRlby9mYmRldi9yaXZh L252X2RyaXZlci5jIHwgIDcgKysrKy0tLQogZHJpdmVycy92aWRlby9mYmRldi9yaXZhL3JpdmFf aHcuYyAgIHwgMjAgKysrKysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvcml2 YS9yaXZhX2h3LmggICB8ICAzICsrLQogNCBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCsp LCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3JpdmEv ZmJkZXYuYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvcml2YS9mYmRldi5jCmluZGV4IDFlYTc4YmIu LmZmODI4MjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvcml2YS9mYmRldi5jCisr KyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvcml2YS9mYmRldi5jCkBAIC03ODAsNyArNzgwLDcgQEAg c3RhdGljIGludCByaXZhX2xvYWRfdmlkZW9fbW9kZShzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIAll bHNlCiAJCW5ld21vZGUubWlzY19vdXRwdXQgfD0gMHg4MDsJCiAKLQlyYyA9IENhbGNTdGF0ZUV4 dCgmcGFyLT5yaXZhLCAmbmV3bW9kZS5leHQsIGJwcCwgd2lkdGgsCisJcmMgPSBDYWxjU3RhdGVF eHQoJnBhci0+cml2YSwgJm5ld21vZGUuZXh0LCBwYXItPnBkZXYsIGJwcCwgd2lkdGgsCiAJCQkg IGhEaXNwbGF5U2l6ZSwgaGVpZ2h0LCBkb3RDbG9jayk7CiAJaWYgKHJjKQogCQlnb3RvIG91dDsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvcml2YS9udl9kcml2ZXIuYyBiL2RyaXZl cnMvdmlkZW8vZmJkZXYvcml2YS9udl9kcml2ZXIuYwppbmRleCBmMzY5NGNmLi5hM2Q5YzY2IDEw MDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3JpdmEvbnZfZHJpdmVyLmMKKysrIGIvZHJp dmVycy92aWRlby9mYmRldi9yaXZhL252X2RyaXZlci5jCkBAIC0xNTksNiArMTU5LDcgQEAgdW5z aWduZWQgbG9uZyByaXZhX2dldF9tZW1sZW4oc3RydWN0IHJpdmFfcGFyICpwYXIpCiAJdW5zaWdu ZWQgaW50IGNoaXBzZXQgPSBwYXItPkNoaXBzZXQ7CiAJc3RydWN0IHBjaV9kZXYqIGRldjsKIAl1 MzIgYW10OworCWludCBkb21haW4gPSBwY2lfZG9tYWluX25yKHBhci0+cGRldi0+YnVzKTsKIAog CXN3aXRjaCAoY2hpcC0+QXJjaGl0ZWN0dXJlKSB7CiAJY2FzZSBOVl9BUkNIXzAzOgpAQCAtMjI2 LDEyICsyMjcsMTIgQEAgdW5zaWduZWQgbG9uZyByaXZhX2dldF9tZW1sZW4oc3RydWN0IHJpdmFf cGFyICpwYXIpCiAJY2FzZSBOVl9BUkNIXzMwOgogCQlpZihjaGlwc2V0ID09IE5WX0NISVBfSUdF Rk9SQ0UyKSB7CiAKLQkJCWRldiA9IHBjaV9nZXRfYnVzX2FuZF9zbG90KDAsIDEpOworCQkJZGV2 ID0gcGNpX2dldF9kb21haW5fYnVzX2FuZF9zbG90KGRvbWFpbiwgMCwgMSk7CiAJCQlwY2lfcmVh ZF9jb25maWdfZHdvcmQoZGV2LCAweDdDLCAmYW10KTsKIAkJCXBjaV9kZXZfcHV0KGRldik7CiAJ CQltZW1sZW4gPSAoKChhbXQgPj4gNikgJiAzMSkgKyAxKSAqIDEwMjQ7CiAJCX0gZWxzZSBpZiAo Y2hpcHNldCA9PSBOVl9DSElQXzB4MDFGMCkgewotCQkJZGV2ID0gcGNpX2dldF9idXNfYW5kX3Ns b3QoMCwgMSk7CisJCQlkZXYgPSBwY2lfZ2V0X2RvbWFpbl9idXNfYW5kX3Nsb3QoZG9tYWluLCAw LCAxKTsKIAkJCXBjaV9yZWFkX2NvbmZpZ19kd29yZChkZXYsIDB4ODQsICZhbXQpOwogCQkJcGNp X2Rldl9wdXQoZGV2KTsKIAkJCW1lbWxlbiA9ICgoKGFtdCA+PiA0KSAmIDEyNykgKyAxKSAqIDEw MjQ7CkBAIC00MTcsNiArNDE4LDYgQEAgdW5zaWduZWQgbG9uZyByaXZhX2dldF9tYXhkY2xrKHN0 cnVjdCByaXZhX3BhciAqcGFyKQogCX0KIAlwYXItPnJpdmEuZmxhdFBhbmVsID0gKHBhci0+Rmxh dFBhbmVsID4gMCkgPyBUUlVFIDogRkFMU0U7CiAKLQlSaXZhR2V0Q29uZmlnKCZwYXItPnJpdmEs IHBhci0+Q2hpcHNldCk7CisJUml2YUdldENvbmZpZygmcGFyLT5yaXZhLCBwYXItPnBkZXYsIHBh ci0+Q2hpcHNldCk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvcml2YS9y aXZhX2h3LmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3JpdmEvcml2YV9ody5jCmluZGV4IDhiZGYz N2YuLjA2MDFjMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvcml2YS9yaXZhX2h3 LmMKKysrIGIvZHJpdmVycy92aWRlby9mYmRldi9yaXZhL3JpdmFfaHcuYwpAQCAtMTEwOCw3ICsx MTA4LDggQEAgc3RhdGljIGNoYXIgbnYzX2dldF9wYXJhbShudjNfZmlmb19pbmZvICpyZXNfaW5m bywgbnYzX3NpbV9zdGF0ZSAqIHN0YXRlLCBudjNfYXIKICAgICB1bnNpZ25lZCAgICAgIHBpeGVs RGVwdGgsCiAgICAgdW5zaWduZWQgICAgICpidXJzdCwKICAgICB1bnNpZ25lZCAgICAgKmx3bSwK LSAgICBSSVZBX0hXX0lOU1QgKmNoaXAKKyAgICBSSVZBX0hXX0lOU1QgKmNoaXAsCisgICAgc3Ry dWN0IHBjaV9kZXYgKnBkZXYKICkKIHsKICAgICBudjEwX2ZpZm9faW5mbyBmaWZvX2RhdGE7CkBA IC0xMTE2LDggKzExMTcsOSBAQCBzdGF0aWMgY2hhciBudjNfZ2V0X3BhcmFtKG52M19maWZvX2lu Zm8gKnJlc19pbmZvLCBudjNfc2ltX3N0YXRlICogc3RhdGUsIG52M19hcgogICAgIHVuc2lnbmVk IGludCBNLCBOLCBQLCBwbGwsIE1DbGssIE5WQ2xrOwogICAgIHVuc2lnbmVkIGludCB1TUNsa1Bv c3REaXY7CiAgICAgc3RydWN0IHBjaV9kZXYgKmRldjsKKyAgICBpbnQgZG9tYWluID0gcGNpX2Rv bWFpbl9ucihwZGV2LT5idXMpOwogCi0gICAgZGV2ID0gcGNpX2dldF9idXNfYW5kX3Nsb3QoMCwg Myk7CisgICAgZGV2ID0gcGNpX2dldF9kb21haW5fYnVzX2FuZF9zbG90KGRvbWFpbiwgMCwgMyk7 CiAgICAgcGNpX3JlYWRfY29uZmlnX2R3b3JkKGRldiwgMHg2QywgJnVNQ2xrUG9zdERpdik7CiAg ICAgcGNpX2Rldl9wdXQoZGV2KTsKICAgICB1TUNsa1Bvc3REaXYgPSAodU1DbGtQb3N0RGl2ID4+ IDgpICYgMHhmOwpAQCAtMTEzMiw3ICsxMTM0LDcgQEAgc3RhdGljIGNoYXIgbnYzX2dldF9wYXJh bShudjNfZmlmb19pbmZvICpyZXNfaW5mbywgbnYzX3NpbV9zdGF0ZSAqIHN0YXRlLCBudjNfYXIK ICAgICBzaW1fZGF0YS5lbmFibGVfdmlkZW8gICA9IDA7CiAgICAgc2ltX2RhdGEuZW5hYmxlX21w ICAgICAgPSAwOwogCi0gICAgZGV2ID0gcGNpX2dldF9idXNfYW5kX3Nsb3QoMCwgMSk7CisgICAg ZGV2ID0gcGNpX2dldF9kb21haW5fYnVzX2FuZF9zbG90KGRvbWFpbiwgMCwgMSk7CiAgICAgcGNp X3JlYWRfY29uZmlnX2R3b3JkKGRldiwgMHg3QywgJnNpbV9kYXRhLm1lbW9yeV90eXBlKTsKICAg ICBwY2lfZGV2X3B1dChkZXYpOwogICAgIHNpbV9kYXRhLm1lbW9yeV90eXBlICAgID0gKHNpbV9k YXRhLm1lbW9yeV90eXBlID4+IDEyKSAmIDE7CkBAIC0xMjM0LDYgKzEyMzYsNyBAQCBzdGF0aWMg Y2hhciBudjNfZ2V0X3BhcmFtKG52M19maWZvX2luZm8gKnJlc19pbmZvLCBudjNfc2ltX3N0YXRl ICogc3RhdGUsIG52M19hcgogKAogICAgIFJJVkFfSFdfSU5TVCAgKmNoaXAsCiAgICAgUklWQV9I V19TVEFURSAqc3RhdGUsCisgICAgc3RydWN0IHBjaV9kZXYgKnBkZXYsCiAgICAgaW50ICAgICAg ICAgICAgYnBwLAogICAgIGludCAgICAgICAgICAgIHdpZHRoLAogICAgIGludCAgICAgICAgICAg IGhEaXNwbGF5U2l6ZSwKQEAgLTEzMDAsNyArMTMwMyw3IEBAIHN0YXRpYyBjaGFyIG52M19nZXRf cGFyYW0obnYzX2ZpZm9faW5mbyAqcmVzX2luZm8sIG52M19zaW1fc3RhdGUgKiBzdGF0ZSwgbnYz X2FyCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwaXhlbERlcHRo ICogOCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJihzdGF0ZS0+ YXJiaXRyYXRpb24wKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JihzdGF0ZS0+YXJiaXRyYXRpb24xKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNoaXApOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY2hpcCwgcGRldik7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIG52 MTBVcGRhdGVBcmJpdHJhdGlvblNldHRpbmdzKFZDbGssIAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGl4ZWxEZXB0aCAqIDgsIApAQCAtMjEwMiwxMCArMjEwNSwx MiBAQCBzdGF0aWMgY2hhciBudjNfZ2V0X3BhcmFtKG52M19maWZvX2luZm8gKnJlc19pbmZvLCBu djNfc2ltX3N0YXRlICogc3RhdGUsIG52M19hcgogc3RhdGljIHZvaWQgbnYxMEdldENvbmZpZwog KAogICAgIFJJVkFfSFdfSU5TVCAqY2hpcCwKKyAgICBzdHJ1Y3QgcGNpX2RldiAqcGRldiwKICAg ICB1bnNpZ25lZCBpbnQgY2hpcHNldAogKQogewogICAgIHN0cnVjdCBwY2lfZGV2KiBkZXY7Cisg ICAgaW50IGRvbWFpbiA9IHBjaV9kb21haW5fbnIocGRldi0+YnVzKTsKICAgICB1MzIgYW10Owog CiAjaWZkZWYgX19CSUdfRU5ESUFOCkBAIC0yMTE4LDEyICsyMTIzLDEyIEBAIHN0YXRpYyBjaGFy IG52M19nZXRfcGFyYW0obnYzX2ZpZm9faW5mbyAqcmVzX2luZm8sIG52M19zaW1fc3RhdGUgKiBz dGF0ZSwgbnYzX2FyCiAgICAgICogRmlsbCBpbiBjaGlwIGNvbmZpZ3VyYXRpb24uCiAgICAgICov CiAgICAgaWYoY2hpcHNldCA9PSBOVl9DSElQX0lHRUZPUkNFMikgewotICAgICAgICBkZXYgPSBw Y2lfZ2V0X2J1c19hbmRfc2xvdCgwLCAxKTsKKyAgICAgICAgZGV2ID0gcGNpX2dldF9kb21haW5f YnVzX2FuZF9zbG90KGRvbWFpbiwgMCwgMSk7CiAgICAgICAgIHBjaV9yZWFkX2NvbmZpZ19kd29y ZChkZXYsIDB4N0MsICZhbXQpOwogICAgICAgICBwY2lfZGV2X3B1dChkZXYpOwogICAgICAgICBj aGlwLT5SYW1BbW91bnRLQnl0ZXMgPSAoKChhbXQgPj4gNikgJiAzMSkgKyAxKSAqIDEwMjQ7CiAg ICAgfSBlbHNlIGlmKGNoaXBzZXQgPT0gTlZfQ0hJUF8weDAxRjApIHsKLSAgICAgICAgZGV2ID0g cGNpX2dldF9idXNfYW5kX3Nsb3QoMCwgMSk7CisgICAgICAgIGRldiA9IHBjaV9nZXRfZG9tYWlu X2J1c19hbmRfc2xvdChkb21haW4sIDAsIDEpOwogICAgICAgICBwY2lfcmVhZF9jb25maWdfZHdv cmQoZGV2LCAweDg0LCAmYW10KTsKICAgICAgICAgcGNpX2Rldl9wdXQoZGV2KTsKICAgICAgICAg Y2hpcC0+UmFtQW1vdW50S0J5dGVzID0gKCgoYW10ID4+IDQpICYgMTI3KSArIDEpICogMTAyNDsK QEAgLTIyMjQsNiArMjIyOSw3IEBAIHN0YXRpYyBjaGFyIG52M19nZXRfcGFyYW0obnYzX2ZpZm9f aW5mbyAqcmVzX2luZm8sIG52M19zaW1fc3RhdGUgKiBzdGF0ZSwgbnYzX2FyCiBpbnQgUml2YUdl dENvbmZpZwogKAogICAgIFJJVkFfSFdfSU5TVCAqY2hpcCwKKyAgICBzdHJ1Y3QgcGNpX2RldiAq cGRldiwKICAgICB1bnNpZ25lZCBpbnQgY2hpcHNldAogKQogewpAQCAtMjI0NSw3ICsyMjUxLDcg QEAgc3RhdGljIGNoYXIgbnYzX2dldF9wYXJhbShudjNfZmlmb19pbmZvICpyZXNfaW5mbywgbnYz X3NpbV9zdGF0ZSAqIHN0YXRlLCBudjNfYXIKICAgICAgICAgY2FzZSBOVl9BUkNIXzEwOgogICAg ICAgICBjYXNlIE5WX0FSQ0hfMjA6CiAgICAgICAgIGNhc2UgTlZfQVJDSF8zMDoKLSAgICAgICAg ICAgIG52MTBHZXRDb25maWcoY2hpcCwgY2hpcHNldCk7CisgICAgICAgICAgICBudjEwR2V0Q29u ZmlnKGNoaXAsIHBkZXYsIGNoaXBzZXQpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRl ZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gKC0xKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlk ZW8vZmJkZXYvcml2YS9yaXZhX2h3LmggYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3JpdmEvcml2YV9o dy5oCmluZGV4IGMyNzY5ZjcuLjVlN2IzNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJk ZXYvcml2YS9yaXZhX2h3LmgKKysrIGIvZHJpdmVycy92aWRlby9mYmRldi9yaXZhL3JpdmFfaHcu aApAQCAtNTM2LDYgKzUzNiw3IEBACiAoCiAgICAgUklWQV9IV19JTlNUICAqY2hpcCwKICAgICBS SVZBX0hXX1NUQVRFICpzdGF0ZSwKKyAgICBzdHJ1Y3QgcGNpX2RldiAqcGRldiwKICAgICBpbnQg ICAgICAgICAgICBicHAsCiAgICAgaW50ICAgICAgICAgICAgd2lkdGgsCiAgICAgaW50ICAgICAg ICAgICAgaERpc3BsYXlTaXplLApAQCAtNTQ2LDcgKzU0Nyw3IEBACiAvKgogICogRXh0ZXJuYWwg cm91dGluZXMuCiAgKi8KLWludCBSaXZhR2V0Q29uZmlnKFJJVkFfSFdfSU5TVCAqLCB1bnNpZ25l ZCBpbnQpOworaW50IFJpdmFHZXRDb25maWcoUklWQV9IV19JTlNUICpjaGlwLCBzdHJ1Y3QgcGNp X2RldiAqcGRldiwgdW5zaWduZWQgaW50IGMpOwogLyoKICAqIEZJRk8gRnJlZSBDb3VudC4gU2hv dWxkIGF0dGVtcHQgdG8geWllbGQgcHJvY2Vzc29yIGlmIFJJVkEgaXMgYnVzeS4KICAqLwotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774AbdK0RAK (ORCPT ); Mon, 27 Nov 2017 12:00:10 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:33518 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932313AbdK0RAF (ORCPT ); Mon, 27 Nov 2017 12:00:05 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 39C946A6D8 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, intel-gfx@lists.freedesktop.org, Sinan Kaya , Antonino Daplas , Bartlomiej Zolnierkiewicz , linux-fbdev@vger.kernel.org (open list:NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 27/29] video: fbdev: riva: deprecate pci_get_bus_and_slot() Date: Mon, 27 Nov 2017 11:58:04 -0500 Message-Id: <1511801886-6753-28-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). struct riva_par has a pointer to struct pci_dev. Use the pci_dev member to extract the domain information. Change the function signature for CalcStateExt and RivaGetConfig to pass in struct pci_dev in addition to RIVA_HW_INST so that code inside the riva_hw.c can also calculate domain number and pass it to pci_get_domain_bus_and_slot(). Signed-off-by: Sinan Kaya --- drivers/video/fbdev/riva/fbdev.c | 2 +- drivers/video/fbdev/riva/nv_driver.c | 7 ++++--- drivers/video/fbdev/riva/riva_hw.c | 20 +++++++++++++------- drivers/video/fbdev/riva/riva_hw.h | 3 ++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c index 1ea78bb..ff82823 100644 --- a/drivers/video/fbdev/riva/fbdev.c +++ b/drivers/video/fbdev/riva/fbdev.c @@ -780,7 +780,7 @@ static int riva_load_video_mode(struct fb_info *info) else newmode.misc_output |= 0x80; - rc = CalcStateExt(&par->riva, &newmode.ext, bpp, width, + rc = CalcStateExt(&par->riva, &newmode.ext, par->pdev, bpp, width, hDisplaySize, height, dotClock); if (rc) goto out; diff --git a/drivers/video/fbdev/riva/nv_driver.c b/drivers/video/fbdev/riva/nv_driver.c index f3694cf..a3d9c66 100644 --- a/drivers/video/fbdev/riva/nv_driver.c +++ b/drivers/video/fbdev/riva/nv_driver.c @@ -159,6 +159,7 @@ unsigned long riva_get_memlen(struct riva_par *par) unsigned int chipset = par->Chipset; struct pci_dev* dev; u32 amt; + int domain = pci_domain_nr(par->pdev->bus); switch (chip->Architecture) { case NV_ARCH_03: @@ -226,12 +227,12 @@ unsigned long riva_get_memlen(struct riva_par *par) case NV_ARCH_30: if(chipset == NV_CHIP_IGEFORCE2) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &amt); pci_dev_put(dev); memlen = (((amt >> 6) & 31) + 1) * 1024; } else if (chipset == NV_CHIP_0x01F0) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x84, &amt); pci_dev_put(dev); memlen = (((amt >> 4) & 127) + 1) * 1024; @@ -417,6 +418,6 @@ unsigned long riva_get_maxdclk(struct riva_par *par) } par->riva.flatPanel = (par->FlatPanel > 0) ? TRUE : FALSE; - RivaGetConfig(&par->riva, par->Chipset); + RivaGetConfig(&par->riva, par->pdev, par->Chipset); } diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c index 8bdf37f..0601c13 100644 --- a/drivers/video/fbdev/riva/riva_hw.c +++ b/drivers/video/fbdev/riva/riva_hw.c @@ -1108,7 +1108,8 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar unsigned pixelDepth, unsigned *burst, unsigned *lwm, - RIVA_HW_INST *chip + RIVA_HW_INST *chip, + struct pci_dev *pdev ) { nv10_fifo_info fifo_data; @@ -1116,8 +1117,9 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar unsigned int M, N, P, pll, MClk, NVClk; unsigned int uMClkPostDiv; struct pci_dev *dev; + int domain = pci_domain_nr(pdev->bus); - dev = pci_get_bus_and_slot(0, 3); + dev = pci_get_domain_bus_and_slot(domain, 0, 3); pci_read_config_dword(dev, 0x6C, &uMClkPostDiv); pci_dev_put(dev); uMClkPostDiv = (uMClkPostDiv >> 8) & 0xf; @@ -1132,7 +1134,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar sim_data.enable_video = 0; sim_data.enable_mp = 0; - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &sim_data.memory_type); pci_dev_put(dev); sim_data.memory_type = (sim_data.memory_type >> 12) & 1; @@ -1234,6 +1236,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar ( RIVA_HW_INST *chip, RIVA_HW_STATE *state, + struct pci_dev *pdev, int bpp, int width, int hDisplaySize, @@ -1300,7 +1303,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar pixelDepth * 8, &(state->arbitration0), &(state->arbitration1), - chip); + chip, pdev); } else { nv10UpdateArbitrationSettings(VClk, pixelDepth * 8, @@ -2102,10 +2105,12 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar static void nv10GetConfig ( RIVA_HW_INST *chip, + struct pci_dev *pdev, unsigned int chipset ) { struct pci_dev* dev; + int domain = pci_domain_nr(pdev->bus); u32 amt; #ifdef __BIG_ENDIAN @@ -2118,12 +2123,12 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar * Fill in chip configuration. */ if(chipset == NV_CHIP_IGEFORCE2) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &amt); pci_dev_put(dev); chip->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024; } else if(chipset == NV_CHIP_0x01F0) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x84, &amt); pci_dev_put(dev); chip->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024; @@ -2224,6 +2229,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar int RivaGetConfig ( RIVA_HW_INST *chip, + struct pci_dev *pdev, unsigned int chipset ) { @@ -2245,7 +2251,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar case NV_ARCH_10: case NV_ARCH_20: case NV_ARCH_30: - nv10GetConfig(chip, chipset); + nv10GetConfig(chip, pdev, chipset); break; default: return (-1); diff --git a/drivers/video/fbdev/riva/riva_hw.h b/drivers/video/fbdev/riva/riva_hw.h index c2769f7..5e7b354 100644 --- a/drivers/video/fbdev/riva/riva_hw.h +++ b/drivers/video/fbdev/riva/riva_hw.h @@ -536,6 +536,7 @@ ( RIVA_HW_INST *chip, RIVA_HW_STATE *state, + struct pci_dev *pdev, int bpp, int width, int hDisplaySize, @@ -546,7 +547,7 @@ /* * External routines. */ -int RivaGetConfig(RIVA_HW_INST *, unsigned int); +int RivaGetConfig(RIVA_HW_INST *chip, struct pci_dev *pdev, unsigned int c); /* * FIFO Free Count. Should attempt to yield processor if RIVA is busy. */ -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sinan Kaya Date: Mon, 27 Nov 2017 16:58:04 +0000 Subject: [PATCH V3 27/29] video: fbdev: riva: deprecate pci_get_bus_and_slot() Message-Id: <1511801886-6753-28-git-send-email-okaya@codeaurora.org> List-Id: References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: "open list:NVIDIA rivafb and nvidiafb FRAMEBUFFER DRIVER" , Antonino Daplas , Bartlomiej Zolnierkiewicz , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, open list , linux-arm-kernel@lists.infradead.org pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). struct riva_par has a pointer to struct pci_dev. Use the pci_dev member to extract the domain information. Change the function signature for CalcStateExt and RivaGetConfig to pass in struct pci_dev in addition to RIVA_HW_INST so that code inside the riva_hw.c can also calculate domain number and pass it to pci_get_domain_bus_and_slot(). Signed-off-by: Sinan Kaya --- drivers/video/fbdev/riva/fbdev.c | 2 +- drivers/video/fbdev/riva/nv_driver.c | 7 ++++--- drivers/video/fbdev/riva/riva_hw.c | 20 +++++++++++++------- drivers/video/fbdev/riva/riva_hw.h | 3 ++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c index 1ea78bb..ff82823 100644 --- a/drivers/video/fbdev/riva/fbdev.c +++ b/drivers/video/fbdev/riva/fbdev.c @@ -780,7 +780,7 @@ static int riva_load_video_mode(struct fb_info *info) else newmode.misc_output |= 0x80; - rc = CalcStateExt(&par->riva, &newmode.ext, bpp, width, + rc = CalcStateExt(&par->riva, &newmode.ext, par->pdev, bpp, width, hDisplaySize, height, dotClock); if (rc) goto out; diff --git a/drivers/video/fbdev/riva/nv_driver.c b/drivers/video/fbdev/riva/nv_driver.c index f3694cf..a3d9c66 100644 --- a/drivers/video/fbdev/riva/nv_driver.c +++ b/drivers/video/fbdev/riva/nv_driver.c @@ -159,6 +159,7 @@ unsigned long riva_get_memlen(struct riva_par *par) unsigned int chipset = par->Chipset; struct pci_dev* dev; u32 amt; + int domain = pci_domain_nr(par->pdev->bus); switch (chip->Architecture) { case NV_ARCH_03: @@ -226,12 +227,12 @@ unsigned long riva_get_memlen(struct riva_par *par) case NV_ARCH_30: if(chipset = NV_CHIP_IGEFORCE2) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &amt); pci_dev_put(dev); memlen = (((amt >> 6) & 31) + 1) * 1024; } else if (chipset = NV_CHIP_0x01F0) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x84, &amt); pci_dev_put(dev); memlen = (((amt >> 4) & 127) + 1) * 1024; @@ -417,6 +418,6 @@ unsigned long riva_get_maxdclk(struct riva_par *par) } par->riva.flatPanel = (par->FlatPanel > 0) ? TRUE : FALSE; - RivaGetConfig(&par->riva, par->Chipset); + RivaGetConfig(&par->riva, par->pdev, par->Chipset); } diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c index 8bdf37f..0601c13 100644 --- a/drivers/video/fbdev/riva/riva_hw.c +++ b/drivers/video/fbdev/riva/riva_hw.c @@ -1108,7 +1108,8 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar unsigned pixelDepth, unsigned *burst, unsigned *lwm, - RIVA_HW_INST *chip + RIVA_HW_INST *chip, + struct pci_dev *pdev ) { nv10_fifo_info fifo_data; @@ -1116,8 +1117,9 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar unsigned int M, N, P, pll, MClk, NVClk; unsigned int uMClkPostDiv; struct pci_dev *dev; + int domain = pci_domain_nr(pdev->bus); - dev = pci_get_bus_and_slot(0, 3); + dev = pci_get_domain_bus_and_slot(domain, 0, 3); pci_read_config_dword(dev, 0x6C, &uMClkPostDiv); pci_dev_put(dev); uMClkPostDiv = (uMClkPostDiv >> 8) & 0xf; @@ -1132,7 +1134,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar sim_data.enable_video = 0; sim_data.enable_mp = 0; - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &sim_data.memory_type); pci_dev_put(dev); sim_data.memory_type = (sim_data.memory_type >> 12) & 1; @@ -1234,6 +1236,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar ( RIVA_HW_INST *chip, RIVA_HW_STATE *state, + struct pci_dev *pdev, int bpp, int width, int hDisplaySize, @@ -1300,7 +1303,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar pixelDepth * 8, &(state->arbitration0), &(state->arbitration1), - chip); + chip, pdev); } else { nv10UpdateArbitrationSettings(VClk, pixelDepth * 8, @@ -2102,10 +2105,12 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar static void nv10GetConfig ( RIVA_HW_INST *chip, + struct pci_dev *pdev, unsigned int chipset ) { struct pci_dev* dev; + int domain = pci_domain_nr(pdev->bus); u32 amt; #ifdef __BIG_ENDIAN @@ -2118,12 +2123,12 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar * Fill in chip configuration. */ if(chipset = NV_CHIP_IGEFORCE2) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &amt); pci_dev_put(dev); chip->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024; } else if(chipset = NV_CHIP_0x01F0) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x84, &amt); pci_dev_put(dev); chip->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024; @@ -2224,6 +2229,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar int RivaGetConfig ( RIVA_HW_INST *chip, + struct pci_dev *pdev, unsigned int chipset ) { @@ -2245,7 +2251,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar case NV_ARCH_10: case NV_ARCH_20: case NV_ARCH_30: - nv10GetConfig(chip, chipset); + nv10GetConfig(chip, pdev, chipset); break; default: return (-1); diff --git a/drivers/video/fbdev/riva/riva_hw.h b/drivers/video/fbdev/riva/riva_hw.h index c2769f7..5e7b354 100644 --- a/drivers/video/fbdev/riva/riva_hw.h +++ b/drivers/video/fbdev/riva/riva_hw.h @@ -536,6 +536,7 @@ ( RIVA_HW_INST *chip, RIVA_HW_STATE *state, + struct pci_dev *pdev, int bpp, int width, int hDisplaySize, @@ -546,7 +547,7 @@ /* * External routines. */ -int RivaGetConfig(RIVA_HW_INST *, unsigned int); +int RivaGetConfig(RIVA_HW_INST *chip, struct pci_dev *pdev, unsigned int c); /* * FIFO Free Count. Should attempt to yield processor if RIVA is busy. */ -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: okaya@codeaurora.org (Sinan Kaya) Date: Mon, 27 Nov 2017 11:58:04 -0500 Subject: [PATCH V3 27/29] video: fbdev: riva: deprecate pci_get_bus_and_slot() In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> Message-ID: <1511801886-6753-28-git-send-email-okaya@codeaurora.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). struct riva_par has a pointer to struct pci_dev. Use the pci_dev member to extract the domain information. Change the function signature for CalcStateExt and RivaGetConfig to pass in struct pci_dev in addition to RIVA_HW_INST so that code inside the riva_hw.c can also calculate domain number and pass it to pci_get_domain_bus_and_slot(). Signed-off-by: Sinan Kaya --- drivers/video/fbdev/riva/fbdev.c | 2 +- drivers/video/fbdev/riva/nv_driver.c | 7 ++++--- drivers/video/fbdev/riva/riva_hw.c | 20 +++++++++++++------- drivers/video/fbdev/riva/riva_hw.h | 3 ++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c index 1ea78bb..ff82823 100644 --- a/drivers/video/fbdev/riva/fbdev.c +++ b/drivers/video/fbdev/riva/fbdev.c @@ -780,7 +780,7 @@ static int riva_load_video_mode(struct fb_info *info) else newmode.misc_output |= 0x80; - rc = CalcStateExt(&par->riva, &newmode.ext, bpp, width, + rc = CalcStateExt(&par->riva, &newmode.ext, par->pdev, bpp, width, hDisplaySize, height, dotClock); if (rc) goto out; diff --git a/drivers/video/fbdev/riva/nv_driver.c b/drivers/video/fbdev/riva/nv_driver.c index f3694cf..a3d9c66 100644 --- a/drivers/video/fbdev/riva/nv_driver.c +++ b/drivers/video/fbdev/riva/nv_driver.c @@ -159,6 +159,7 @@ unsigned long riva_get_memlen(struct riva_par *par) unsigned int chipset = par->Chipset; struct pci_dev* dev; u32 amt; + int domain = pci_domain_nr(par->pdev->bus); switch (chip->Architecture) { case NV_ARCH_03: @@ -226,12 +227,12 @@ unsigned long riva_get_memlen(struct riva_par *par) case NV_ARCH_30: if(chipset == NV_CHIP_IGEFORCE2) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &amt); pci_dev_put(dev); memlen = (((amt >> 6) & 31) + 1) * 1024; } else if (chipset == NV_CHIP_0x01F0) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x84, &amt); pci_dev_put(dev); memlen = (((amt >> 4) & 127) + 1) * 1024; @@ -417,6 +418,6 @@ unsigned long riva_get_maxdclk(struct riva_par *par) } par->riva.flatPanel = (par->FlatPanel > 0) ? TRUE : FALSE; - RivaGetConfig(&par->riva, par->Chipset); + RivaGetConfig(&par->riva, par->pdev, par->Chipset); } diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c index 8bdf37f..0601c13 100644 --- a/drivers/video/fbdev/riva/riva_hw.c +++ b/drivers/video/fbdev/riva/riva_hw.c @@ -1108,7 +1108,8 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar unsigned pixelDepth, unsigned *burst, unsigned *lwm, - RIVA_HW_INST *chip + RIVA_HW_INST *chip, + struct pci_dev *pdev ) { nv10_fifo_info fifo_data; @@ -1116,8 +1117,9 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar unsigned int M, N, P, pll, MClk, NVClk; unsigned int uMClkPostDiv; struct pci_dev *dev; + int domain = pci_domain_nr(pdev->bus); - dev = pci_get_bus_and_slot(0, 3); + dev = pci_get_domain_bus_and_slot(domain, 0, 3); pci_read_config_dword(dev, 0x6C, &uMClkPostDiv); pci_dev_put(dev); uMClkPostDiv = (uMClkPostDiv >> 8) & 0xf; @@ -1132,7 +1134,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar sim_data.enable_video = 0; sim_data.enable_mp = 0; - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &sim_data.memory_type); pci_dev_put(dev); sim_data.memory_type = (sim_data.memory_type >> 12) & 1; @@ -1234,6 +1236,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar ( RIVA_HW_INST *chip, RIVA_HW_STATE *state, + struct pci_dev *pdev, int bpp, int width, int hDisplaySize, @@ -1300,7 +1303,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar pixelDepth * 8, &(state->arbitration0), &(state->arbitration1), - chip); + chip, pdev); } else { nv10UpdateArbitrationSettings(VClk, pixelDepth * 8, @@ -2102,10 +2105,12 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar static void nv10GetConfig ( RIVA_HW_INST *chip, + struct pci_dev *pdev, unsigned int chipset ) { struct pci_dev* dev; + int domain = pci_domain_nr(pdev->bus); u32 amt; #ifdef __BIG_ENDIAN @@ -2118,12 +2123,12 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar * Fill in chip configuration. */ if(chipset == NV_CHIP_IGEFORCE2) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x7C, &amt); pci_dev_put(dev); chip->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024; } else if(chipset == NV_CHIP_0x01F0) { - dev = pci_get_bus_and_slot(0, 1); + dev = pci_get_domain_bus_and_slot(domain, 0, 1); pci_read_config_dword(dev, 0x84, &amt); pci_dev_put(dev); chip->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024; @@ -2224,6 +2229,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar int RivaGetConfig ( RIVA_HW_INST *chip, + struct pci_dev *pdev, unsigned int chipset ) { @@ -2245,7 +2251,7 @@ static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar case NV_ARCH_10: case NV_ARCH_20: case NV_ARCH_30: - nv10GetConfig(chip, chipset); + nv10GetConfig(chip, pdev, chipset); break; default: return (-1); diff --git a/drivers/video/fbdev/riva/riva_hw.h b/drivers/video/fbdev/riva/riva_hw.h index c2769f7..5e7b354 100644 --- a/drivers/video/fbdev/riva/riva_hw.h +++ b/drivers/video/fbdev/riva/riva_hw.h @@ -536,6 +536,7 @@ ( RIVA_HW_INST *chip, RIVA_HW_STATE *state, + struct pci_dev *pdev, int bpp, int width, int hDisplaySize, @@ -546,7 +547,7 @@ /* * External routines. */ -int RivaGetConfig(RIVA_HW_INST *, unsigned int); +int RivaGetConfig(RIVA_HW_INST *chip, struct pci_dev *pdev, unsigned int c); /* * FIFO Free Count. Should attempt to yield processor if RIVA is busy. */ -- 1.9.1