From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C124DC43387 for ; Fri, 11 Jan 2019 05:38:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9829820675 for ; Fri, 11 Jan 2019 05:38:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730661AbfAKFir (ORCPT ); Fri, 11 Jan 2019 00:38:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33652 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730105AbfAKFiA (ORCPT ); Fri, 11 Jan 2019 00:38:00 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE102A4056; Fri, 11 Jan 2019 05:38:00 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-203.ams2.redhat.com [10.36.116.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B9081E7; Fri, 11 Jan 2019 05:37:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 81BDE93E9; Fri, 11 Jan 2019 06:37:54 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org, David Airlie Cc: andr2000@gmail.com, noralf@tronnes.org, Gerd Hoffmann , David Airlie , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR BOCHS VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 14/16] drm/bochs: switch to generic drm fbdev emulation Date: Fri, 11 Jan 2019 06:37:50 +0100 Message-Id: <20190111053752.4004-15-kraxel@redhat.com> In-Reply-To: <20190111053752.4004-1-kraxel@redhat.com> References: <20190111053752.4004-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 11 Jan 2019 05:38:00 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Gerd Hoffmann Acked-by: Daniel Vetter --- drivers/gpu/drm/bochs/bochs_drv.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index a3f4e21078..cea42ac64d 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -16,10 +16,6 @@ static int bochs_modeset = -1; module_param_named(modeset, bochs_modeset, int, 0444); MODULE_PARM_DESC(modeset, "enable/disable kernel modesetting"); -static bool enable_fbdev = true; -module_param_named(fbdev, enable_fbdev, bool, 0444); -MODULE_PARM_DESC(fbdev, "register fbdev device"); - /* ---------------------------------------------------------------------- */ /* drm interface */ @@ -27,7 +23,6 @@ static void bochs_unload(struct drm_device *dev) { struct bochs_device *bochs = dev->dev_private; - bochs_fbdev_fini(bochs); bochs_kms_fini(bochs); bochs_mm_fini(bochs); bochs_hw_fini(dev); @@ -58,9 +53,6 @@ static int bochs_load(struct drm_device *dev) if (ret) goto err; - if (enable_fbdev) - bochs_fbdev_init(bochs); - return 0; err: @@ -110,9 +102,7 @@ static int bochs_pm_suspend(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = pci_get_drvdata(pdev); - struct bochs_device *bochs = drm_dev->dev_private; - drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 1); return drm_mode_config_helper_suspend(drm_dev); } @@ -120,9 +110,7 @@ static int bochs_pm_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = pci_get_drvdata(pdev); - struct bochs_device *bochs = drm_dev->dev_private; - drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 0); return drm_mode_config_helper_resume(drm_dev); } #endif @@ -167,6 +155,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, if (ret) goto err_unload; + drm_fbdev_generic_setup(dev, 32); return ret; err_unload: -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v4 14/16] drm/bochs: switch to generic drm fbdev emulation Date: Fri, 11 Jan 2019 06:37:50 +0100 Message-ID: <20190111053752.4004-15-kraxel@redhat.com> References: <20190111053752.4004-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DDFA6F55B for ; Fri, 11 Jan 2019 05:38:01 +0000 (UTC) In-Reply-To: <20190111053752.4004-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, David Airlie Cc: andr2000@gmail.com, open list , "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" , David Airlie , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CkFja2VkLWJ5 OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9ib2Nocy9ib2Noc19kcnYuYyB8IDEzICstLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2JvY2hzL2JvY2hzX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX2Ry di5jCmluZGV4IGEzZjRlMjEwNzguLmNlYTQyYWM2NGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9ib2Nocy9ib2Noc19kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNf ZHJ2LmMKQEAgLTE2LDEwICsxNiw2IEBAIHN0YXRpYyBpbnQgYm9jaHNfbW9kZXNldCA9IC0xOwog bW9kdWxlX3BhcmFtX25hbWVkKG1vZGVzZXQsIGJvY2hzX21vZGVzZXQsIGludCwgMDQ0NCk7CiBN T0RVTEVfUEFSTV9ERVNDKG1vZGVzZXQsICJlbmFibGUvZGlzYWJsZSBrZXJuZWwgbW9kZXNldHRp bmciKTsKIAotc3RhdGljIGJvb2wgZW5hYmxlX2ZiZGV2ID0gdHJ1ZTsKLW1vZHVsZV9wYXJhbV9u YW1lZChmYmRldiwgZW5hYmxlX2ZiZGV2LCBib29sLCAwNDQ0KTsKLU1PRFVMRV9QQVJNX0RFU0Mo ZmJkZXYsICJyZWdpc3RlciBmYmRldiBkZXZpY2UiKTsKLQogLyogLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwog LyogZHJtIGludGVyZmFjZSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAqLwogCkBAIC0yNyw3ICsyMyw2IEBAIHN0YXRpYyB2b2lkIGJvY2hz X3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBib2Noc19kZXZpY2Ug KmJvY2hzID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWJvY2hzX2ZiZGV2X2ZpbmkoYm9jaHMpOwog CWJvY2hzX2ttc19maW5pKGJvY2hzKTsKIAlib2Noc19tbV9maW5pKGJvY2hzKTsKIAlib2Noc19o d19maW5pKGRldik7CkBAIC01OCw5ICs1Myw2IEBAIHN0YXRpYyBpbnQgYm9jaHNfbG9hZChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwogCi0JaWYgKGVuYWJs ZV9mYmRldikKLQkJYm9jaHNfZmJkZXZfaW5pdChib2Nocyk7Ci0KIAlyZXR1cm4gMDsKIAogZXJy OgpAQCAtMTEwLDkgKzEwMiw3IEBAIHN0YXRpYyBpbnQgYm9jaHNfcG1fc3VzcGVuZChzdHJ1Y3Qg ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldik7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7Ci0J c3RydWN0IGJvY2hzX2RldmljZSAqYm9jaHMgPSBkcm1fZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWRy bV9mYl9oZWxwZXJfc2V0X3N1c3BlbmRfdW5sb2NrZWQoJmJvY2hzLT5mYi5oZWxwZXIsIDEpOwog CXJldHVybiBkcm1fbW9kZV9jb25maWdfaGVscGVyX3N1c3BlbmQoZHJtX2Rldik7CiB9CiAKQEAg LTEyMCw5ICsxMTAsNyBAQCBzdGF0aWMgaW50IGJvY2hzX3BtX3Jlc3VtZShzdHJ1Y3QgZGV2aWNl ICpkZXYpCiB7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldik7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7Ci0Jc3RydWN0 IGJvY2hzX2RldmljZSAqYm9jaHMgPSBkcm1fZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWRybV9mYl9o ZWxwZXJfc2V0X3N1c3BlbmRfdW5sb2NrZWQoJmJvY2hzLT5mYi5oZWxwZXIsIDApOwogCXJldHVy biBkcm1fbW9kZV9jb25maWdfaGVscGVyX3Jlc3VtZShkcm1fZGV2KTsKIH0KICNlbmRpZgpAQCAt MTY3LDYgKzE1NSw3IEBAIHN0YXRpYyBpbnQgYm9jaHNfcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2 ICpwZGV2LAogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3VubG9hZDsKIAorCWRybV9mYmRldl9nZW5l cmljX3NldHVwKGRldiwgMzIpOwogCXJldHVybiByZXQ7CiAKIGVycl91bmxvYWQ6Ci0tIAoyLjku MwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==