From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752269AbdDNMD0 (ORCPT ); Fri, 14 Apr 2017 08:03:26 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:36798 "EHLO epoutp02.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752239AbdDNMDM (ORCPT ); Fri, 14 Apr 2017 08:03:12 -0400 X-AuditID: b6c32a59-f79166d0000017ce-e0-58f0ba7ecc42 From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [GIT PULL] fbdev fixes for v4.11-rc6 Date: Fri, 14 Apr 2017 14:03:03 +0200 Message-id: <2635631.Mn9kkJb8Ue@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset="us-ascii" X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7bCmpm7drg8RBm2LWSyufH3PZnGi7wOr xeVdc9gsHvW9ZXdg8Tgx4zeLx/3u40wenzfJBTBHcdmkpOZklqUW6dslcGUsXHiCqWCLasWe Zr8Gxm9yXYycHBICJhKrnh1jhbDFJC7cW8/WxcjFISSwlFGiaddKRginnUli9dXVQBkOsI6t N1Qg4ssZJZ7Pv8AO4XxllLi2+B0jyCg2ASuJie2rwGwRASOJzy+ugK1gFkiQ+H9+JxOILSyg KzFn1jIWkKEsAqoS72Ybg4R5BTQlNly8yAxiiwp4SWzZ184EEReU+DH5HgvEGHmJffunQo3U kTh7bB3YoRICz9kk3jy/wgJxqKzEpgPMEJ+5SMxZtIUNwhaWeHV8CzuELS3xd+ktRgh7OqPE 9t8SEHM2M0qs2j0Bqsha4vDxi1DL+CR6fz9hgpjPK9HRJgRR4iEx80QrC4TtKPFs7hOwXUIC sRKPt39inMAoNwvJC7OQvDALyQsLGJlXMYqlFhTnpqcWmxaY6hUn5haX5qXrJefnbmIEJwGt yB2MV2YGHWIU4GBU4uHt+PQ+Qog1say4MvcQowQHs5IIL+OODxFCvCmJlVWpRfnxRaU5qcWH GKU5WJTEeTVWXosQEkhPLEnNTk0tSC2CyTJxcEo1MMrznVdzNX+tpz9bt2X2N4f1ezdu89x+ l8nsBf//25W1zw+XTpnsaMUUG7l95rnITS7hpnN2hN48r71XNSlMWjfs497+EI+PjXlpP17+ ODQ9Zm2xtdvMvJWqessqeX9vPzlD4aCOidyT1vyH/xsuh5aJp7II3Vgf+uZK6cm9D/56c5sK vcjouqLEUpyRaKjFXFScCAADxsGq/gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeLIzCtJLcpLzFFi42I5/e+xgG7trg8RBp2XxS2ufH3PZnGi7wOr xeVdc9gsHvW9ZXdg8Tgx4zeLx/3u40wenzfJBTBHudlkpCampBYppOYl56dk5qXbKoWGuOla KCnkJeam2ipF6PqGBCkplCXmlAJ5RgZowME5wD1YSd8uwS1j4cITTAVbVCv2NPs1MH6T62Lk 4JAQMJHYekOli5ETyBSTuHBvPVsXIxeHkMBSRolvMxewQzhfGSVmztvMBlLFJmAlMbF9FSOI LSJgJPH5xRVWEJtZIEFi88pGZhBbWEBXYs6sZSwgC1gEVCXezTYGCfMKaEpsuHgRrERUwEti y752Joi4oMSPyfdYIMbIS+zbPxVqpJbE+p3HmSYw8s1CUjYLSdksJGULGJlXMUqkFiQXFCel 5xrlpZbrFSfmFpfmpesl5+duYgQH/zPpHYyHd7kfYhTgYFTi4Y2ofR8hxJpYVlyZe4hRgoNZ SYSXcceHCCHelMTKqtSi/Pii0pzU4kOMpkB/TGSWEk3OB0ZmXkm8oYm5ibmxgYW5paWJkZI4 b+PsZ+FCAumJJanZqakFqUUwfUwcnFINjFFp1auKTjjwLlY3nFw0awvf3lSH0Jlq+3IbGY40 cM9kejFx37afgmeDgq9MsRHpYFP3F/jTFnBedb1gEYt2Hfv/VX8zWI69TfNOunwha96TLUXn rvAw7JziNedyZfo5naUhPAttZ6RqM72yr567ZbljPpv3Ho75vL23r4dWin7Xe7DV4aiBtxJL cUaioRZzUXEiAMZMl8OUAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170414120309epcas5p2701f4ac334e1281359bfa05f6f82eae2 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRvsgrzshLHsoITsnpAbU2VuaW9yIFNvZnR3YXJlIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBF?= =?UTF-8?B?bmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 105P X-CMS-RootMailID: 20170414120309epcas5p2701f4ac334e1281359bfa05f6f82eae2 X-RootMTR: 20170414120309epcas5p2701f4ac334e1281359bfa05f6f82eae2 References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Please pull fbdev fixes for v4.11-rc6. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201: Linux 4.11-rc1 (2017-03-05 12:59:56 -0800) are available in the git repository at: git://github.com/bzolnier/linux.git tags/fbdev-v4.11-rc6 for you to fetch changes up to e68d490def9f7d726eea6dc62ebd692af64ec8b5: fbdev: omapfb: delete check_required_callbacks() (2017-04-14 13:38:32 +0200) ---------------------------------------------------------------- fbdev fixes for v4.11-rc6: - fix probing time checks in omapfb driver (regression fix) - fix optional VBAT support in ssd1307fb driver (regression fix) - fix connecting to backend in xen-fbfront driver ---------------------------------------------------------------- Aaro Koskinen (1): fbdev: omapfb: delete check_required_callbacks() Bastian Stender (1): fbdev/ssd1307fb: fix optional VBAT support Juergen Gross (1): xen, fbfront: fix connecting to backend drivers/video/fbdev/omap/omapfb_main.c | 15 --------------- drivers/video/fbdev/ssd1307fb.c | 24 ++++++++++++++++-------- drivers/video/fbdev/xen-fbfront.c | 4 ++-- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c index 1abba07..f4cbfb3 100644 --- a/drivers/video/fbdev/omap/omapfb_main.c +++ b/drivers/video/fbdev/omap/omapfb_main.c @@ -1608,19 +1608,6 @@ static int omapfb_find_ctrl(struct omapfb_device *fbdev) return 0; } -static void check_required_callbacks(struct omapfb_device *fbdev) -{ -#define _C(x) (fbdev->ctrl->x != NULL) -#define _P(x) (fbdev->panel->x != NULL) - BUG_ON(fbdev->ctrl == NULL || fbdev->panel == NULL); - BUG_ON(!(_C(init) && _C(cleanup) && _C(get_caps) && - _C(set_update_mode) && _C(setup_plane) && _C(enable_plane) && - _P(init) && _P(cleanup) && _P(enable) && _P(disable) && - _P(get_caps))); -#undef _P -#undef _C -} - /* * Called by LDM binding to probe and attach a new device. * Initialization sequence: @@ -1705,8 +1692,6 @@ static int omapfb_do_probe(struct platform_device *pdev, omapfb_ops.fb_mmap = omapfb_mmap; init_state++; - check_required_callbacks(fbdev); - r = planes_init(fbdev); if (r) goto cleanup; diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index bd017b5..f599520 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -578,10 +578,14 @@ static int ssd1307fb_probe(struct i2c_client *client, par->vbat_reg = devm_regulator_get_optional(&client->dev, "vbat"); if (IS_ERR(par->vbat_reg)) { - dev_err(&client->dev, "failed to get VBAT regulator: %ld\n", - PTR_ERR(par->vbat_reg)); ret = PTR_ERR(par->vbat_reg); - goto fb_alloc_error; + if (ret == -ENODEV) { + par->vbat_reg = NULL; + } else { + dev_err(&client->dev, "failed to get VBAT regulator: %d\n", + ret); + goto fb_alloc_error; + } } if (of_property_read_u32(node, "solomon,width", &par->width)) @@ -668,10 +672,13 @@ static int ssd1307fb_probe(struct i2c_client *client, udelay(4); } - ret = regulator_enable(par->vbat_reg); - if (ret) { - dev_err(&client->dev, "failed to enable VBAT: %d\n", ret); - goto reset_oled_error; + if (par->vbat_reg) { + ret = regulator_enable(par->vbat_reg); + if (ret) { + dev_err(&client->dev, "failed to enable VBAT: %d\n", + ret); + goto reset_oled_error; + } } ret = ssd1307fb_init(par); @@ -710,7 +717,8 @@ static int ssd1307fb_probe(struct i2c_client *client, pwm_put(par->pwm); }; regulator_enable_error: - regulator_disable(par->vbat_reg); + if (par->vbat_reg) + regulator_disable(par->vbat_reg); reset_oled_error: fb_deferred_io_cleanup(info); fb_alloc_error: diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c index d0115a7..3ee309c 100644 --- a/drivers/video/fbdev/xen-fbfront.c +++ b/drivers/video/fbdev/xen-fbfront.c @@ -643,7 +643,6 @@ static void xenfb_backend_changed(struct xenbus_device *dev, break; case XenbusStateInitWait: -InitWait: xenbus_switch_state(dev, XenbusStateConnected); break; @@ -654,7 +653,8 @@ static void xenfb_backend_changed(struct xenbus_device *dev, * get Connected twice here. */ if (dev->state != XenbusStateConnected) - goto InitWait; /* no InitWait seen yet, fudge it */ + /* no InitWait seen yet, fudge it */ + xenbus_switch_state(dev, XenbusStateConnected); if (xenbus_read_unsigned(info->xbdev->otherend, "request-update", 0))