From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH v3 12/13] drm/sun4i: use simpler remove_conflicting_framebuffers(NULL) Date: Sat, 01 Sep 2018 16:08:51 +0200 Message-ID: <7d6d5bc4deac322b1351533c989cb3583e91be49.1535810304.git.mirq-linux@rere.qmqm.pl> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org, linux-tegra@vger.kernel.org, Bartlomiej Zolnierkiewicz , Maxime Ripard , Eric Anholt , amd-gfx@lists.freedesktop.org, Jonathan Hunter , David Airlie , Thierry Reding , Gerd Hoffmann , Alex Deucher , Dave Airlie , virtualization@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org List-Id: linux-tegra@vger.kernel.org VXNlIHJlbW92ZV9jb25mbGljdGluZ19mcmFtZWJ1ZmZlcnMoTlVMTCkgaW5zdGVhZCBvZiBkdXBs aWNhdGluZyBpdC4KClNpZ25lZC1vZmYtYnk6IE1pY2hhxYIgTWlyb3PFgmF3IDxtaXJxLWxpbnV4 QHJlcmUucW1xbS5wbD4KQWNrZWQtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRAZnJl ZS1lbGVjdHJvbnMuY29tPgpBY2tlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBm ZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMgfCAxOCArLS0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMTcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N1bjRpL3N1bjRpX2Rydi5jIGIv ZHJpdmVycy9ncHUvZHJtL3N1bjRpL3N1bjRpX2Rydi5jCmluZGV4IDUwZDE5NjA1YzM4Zi4uNTU1 YjVkYjgwMzZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL3N1bjRpL3N1bjRpX2Rydi5jCkBAIC02MCwyMiArNjAsNiBA QCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgc3VuNGlfZHJ2X2RyaXZlciA9IHsKIAkvKiBGcmFt ZSBCdWZmZXIgT3BlcmF0aW9ucyAqLwogfTsKIAotc3RhdGljIHZvaWQgc3VuNGlfcmVtb3ZlX2Zy YW1lYnVmZmVycyh2b2lkKQotewotCXN0cnVjdCBhcGVydHVyZXNfc3RydWN0ICphcDsKLQotCWFw ID0gYWxsb2NfYXBlcnR1cmVzKDEpOwotCWlmICghYXApCi0JCXJldHVybjsKLQotCS8qIFRoZSBm cmFtZWJ1ZmZlciBjYW4gYmUgbG9jYXRlZCBhbnl3aGVyZSBpbiBSQU0gKi8KLQlhcC0+cmFuZ2Vz WzBdLmJhc2UgPSAwOwotCWFwLT5yYW5nZXNbMF0uc2l6ZSA9IH4wOwotCi0JZHJtX2ZiX2hlbHBl cl9yZW1vdmVfY29uZmxpY3RpbmdfZnJhbWVidWZmZXJzKGFwLCAic3VuNGktZHJtLWZiIiwgZmFs c2UpOwotCWtmcmVlKGFwKTsKLX0KLQogc3RhdGljIGludCBzdW40aV9kcnZfYmluZChzdHJ1Y3Qg ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRybTsKQEAgLTExOCw3ICsxMDIs NyBAQCBzdGF0aWMgaW50IHN1bjRpX2Rydl9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldikKIAlkcm0t PmlycV9lbmFibGVkID0gdHJ1ZTsKIAogCS8qIFJlbW92ZSBlYXJseSBmcmFtZWJ1ZmZlcnMgKGll LiBzaW1wbGVmYikgKi8KLQlzdW40aV9yZW1vdmVfZnJhbWVidWZmZXJzKCk7CisJZHJtX2ZiX2hl bHBlcl9yZW1vdmVfY29uZmxpY3RpbmdfZnJhbWVidWZmZXJzKE5VTEwsICJzdW40aS1kcm0tZmIi LCBmYWxzZSk7CiAKIAkvKiBDcmVhdGUgb3VyIGZyYW1lYnVmZmVyICovCiAJcmV0ID0gc3VuNGlf ZnJhbWVidWZmZXJfaW5pdChkcm0pOwotLSAKMi4xOC4wCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Sat, 01 Sep 2018 14:08:51 +0000 Subject: [PATCH v3 12/13] drm/sun4i: use simpler remove_conflicting_framebuffers(NULL) Message-Id: <7d6d5bc4deac322b1351533c989cb3583e91be49.1535810304.git.mirq-linux@rere.qmqm.pl> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org, linux-tegra@vger.kernel.org, Bartlomiej Zolnierkiewicz , Maxime Ripard , Eric Anholt , amd-gfx@lists.freedesktop.org, Jonathan Hunter , David Airlie , Thierry Reding , Gerd Hoffmann , Alex Deucher , Dave Airlie , virtualization@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org Use remove_conflicting_framebuffers(NULL) instead of duplicating it. Signed-off-by: Michał Mirosław Acked-by: Maxime Ripard Acked-by: Daniel Vetter --- drivers/gpu/drm/sun4i/sun4i_drv.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 50d19605c38f..555b5db8036f 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -60,22 +60,6 @@ static struct drm_driver sun4i_drv_driver = { /* Frame Buffer Operations */ }; -static void sun4i_remove_framebuffers(void) -{ - struct apertures_struct *ap; - - ap = alloc_apertures(1); - if (!ap) - return; - - /* The framebuffer can be located anywhere in RAM */ - ap->ranges[0].base = 0; - ap->ranges[0].size = ~0; - - drm_fb_helper_remove_conflicting_framebuffers(ap, "sun4i-drm-fb", false); - kfree(ap); -} - static int sun4i_drv_bind(struct device *dev) { struct drm_device *drm; @@ -118,7 +102,7 @@ static int sun4i_drv_bind(struct device *dev) drm->irq_enabled = true; /* Remove early framebuffers (ie. simplefb) */ - sun4i_remove_framebuffers(); + drm_fb_helper_remove_conflicting_framebuffers(NULL, "sun4i-drm-fb", false); /* Create our framebuffer */ ret = sun4i_framebuffer_init(drm); -- 2.18.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: mirq-linux@rere.qmqm.pl (=?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?=) Date: Sat, 01 Sep 2018 16:08:51 +0200 Subject: [PATCH v3 12/13] drm/sun4i: use simpler remove_conflicting_framebuffers(NULL) In-Reply-To: References: Message-ID: <7d6d5bc4deac322b1351533c989cb3583e91be49.1535810304.git.mirq-linux@rere.qmqm.pl> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Use remove_conflicting_framebuffers(NULL) instead of duplicating it. Signed-off-by: Micha? Miros?aw Acked-by: Maxime Ripard Acked-by: Daniel Vetter --- drivers/gpu/drm/sun4i/sun4i_drv.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 50d19605c38f..555b5db8036f 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -60,22 +60,6 @@ static struct drm_driver sun4i_drv_driver = { /* Frame Buffer Operations */ }; -static void sun4i_remove_framebuffers(void) -{ - struct apertures_struct *ap; - - ap = alloc_apertures(1); - if (!ap) - return; - - /* The framebuffer can be located anywhere in RAM */ - ap->ranges[0].base = 0; - ap->ranges[0].size = ~0; - - drm_fb_helper_remove_conflicting_framebuffers(ap, "sun4i-drm-fb", false); - kfree(ap); -} - static int sun4i_drv_bind(struct device *dev) { struct drm_device *drm; @@ -118,7 +102,7 @@ static int sun4i_drv_bind(struct device *dev) drm->irq_enabled = true; /* Remove early framebuffers (ie. simplefb) */ - sun4i_remove_framebuffers(); + drm_fb_helper_remove_conflicting_framebuffers(NULL, "sun4i-drm-fb", false); /* Create our framebuffer */ ret = sun4i_framebuffer_init(drm); -- 2.18.0