From patchwork Fri Jun 16 14:16:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9791831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF3186038E for ; Fri, 16 Jun 2017 14:17:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4741285C2 for ; Fri, 16 Jun 2017 14:17:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D933A28649; Fri, 16 Jun 2017 14:17:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C9C602863F for ; Fri, 16 Jun 2017 14:17:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EF8E89FD4; Fri, 16 Jun 2017 14:17:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id E21716E8FC for ; Fri, 16 Jun 2017 14:16:59 +0000 (UTC) Received: from epcas5p3.samsung.com (unknown [182.195.41.41]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20170616141657epoutp038da05168329fdf54f0f4a22bc70cc0b7~In9Xv63Wt0510805108epoutp03x; Fri, 16 Jun 2017 14:16:57 +0000 (GMT) Received: from epsmges5p4.samsung.com (unknown [182.195.42.88]) by epcas5p4.samsung.com (KnoxPortal) with ESMTP id 20170616141656epcas5p4190987fc51a93c9e506a387400dee7a3~In9W6zYLB2477524775epcas5p43; Fri, 16 Jun 2017 14:16:56 +0000 (GMT) Received: from epcas5p3.samsung.com ( [182.195.41.41]) by epsmges5p4.samsung.com (EPCPMTA) with SMTP id 27.03.01383.858E3495; Fri, 16 Jun 2017 23:16:56 +0900 (KST) Received: from epsmgms2p2.samsung.com (unknown [182.195.42.80]) by epcas5p2.samsung.com (KnoxPortal) with ESMTP id 20170616141656epcas5p2537223b3e33dc13b9703319b09f8c4fc~In9WvRMsg1701917019epcas5p2w; Fri, 16 Jun 2017 14:16:56 +0000 (GMT) X-AuditID: b6c32a58-f79896d000000567-5f-5943e8587fe7 Received: from epmmp1.local.host ( [203.254.227.16]) by epsmgms2p2.samsung.com (Symantec Messaging Gateway) with SMTP id EB.2C.02294.858E3495; Fri, 16 Jun 2017 23:16:56 +0900 (KST) Received: from amdc3058.localnet ([106.120.53.102]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ORN00M3S906SB80@mmp1.samsung.com>; Fri, 16 Jun 2017 23:16:56 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Subject: [GIT PULL] fbdev fixes for v4.12-rc6 Date: Fri, 16 Jun 2017 16:16:53 +0200 Message-id: <2048689.NbThvpjilr@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7bCmpm7EC+dIg47F4hZXvr5nszjR94HV 4vKuOWwWj/resjuweJyY8ZvF4373cSaPz5vkApijuGxSUnMyy1KL9O0SuDLmPZnMXDBTvWLy p9WMDYz7FbsYOTkkBEwklmy+yAphi0lcuLeerYuRi0NIYCmjxMwZpxghnM+MEp0nNwNlOMA6 eo+rQcR3MEpM7L7LBOF8ZZRYNgvE4eRgE7CSmNi+ihHEFhEwkvj84grYCmaBBIn/53eC1QgL 6ErcffGPEWQoi4CqxMWZCSBhXgFNiX03fzCD2KICXhJb9rUzQcQFJX5MvscCMUZeYt/+qVAj dSTOHlsHdqiEwHU2iacvDzBCHCorsekAM8RnLhL3105ih7CFJV4d3wJlS0l0d8yCsqczSmz/ LQExZzOjxKrdE6AS1hKHj1+EWsYn0fv7CRPEfF6JjjYhCNND4splA4hqR4kdF+6AdQoJxEpc XdvKPIFRbhaSD2Yh+WAWkg8WMDKvYhRLLSjOTU8tNi0w0StOzC0uzUvXS87P3cQITgJaETsY /80IOsQowMGoxMO74b5zpBBrYllxZe4hRgkOZiUR3hPXgUK8KYmVValF+fFFpTmpxYcYpTlY lMR51VdeixASSE8sSc1OTS1ILYLJMnFwSjUwWjMJnfl8p0Wn67v43lvaERpbLI3v3mXpDeD0 6Ilqnluo0ifzYvscYZapuuyJfR+P9Wluq7C4rR6675emXffGpn8TljyISlaR+HaO+ZPABGYX zl8XXUwet0/fbqa0PfOQzVuHo4IKTh5xYvGnbO5fPeZc1XBue8cqpb7FXtweovPzFz3I8wlT YinOSDTUYi4qTgQAhbvDJf4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCLMWRmVeSWpSXmKPExsVy+t9jAd2IF86RBt/OcFtc+fqezeJE3wdW i8u75rBZPOp7y+7A4nFixm8Wj/vdx5k8Pm+SC2COcrPJSE1MSS1SSM1Lzk/JzEu3VQoNcdO1 UFLIS8xNtVWK0PUNCVJSKEvMKQXyjAzQgINzgHuwkr5dglvGvCeTmQtmqldM/rSasYFxv2IX IweHhICJRO9xtS5GTiBTTOLCvfVsXYxcHEIC2xglPi0+wg7hfGWUOPJhMTtIFZuAlcTE9lWM ILaIgJHE5xdXWEFsZoEEic0rG5lBbGEBXYm7L/4xgixgEVCVuDgzASTMK6Apse/mD7ASUQEv iS372pkg4oISPybfY4EYIy+xb/9UqJFaEut3HmeawMg3C0nZLCRls5CULWBkXsXIlVpQnJue W2xUYLSJERji2w5rBexgbDoXfYhRgINRiYeX4bZzpBBrYllxZe4hRgkOZiUR3hPXgUK8KYmV ValF+fFFpTmpxYcYTYEun8gsJZqcD4y/vJJ4QxNLIxMDMzNDIwNjMyVx3gmBXyKEBNITS1Kz U1MLUotg+pg4OKUaGDc6n9WbZ2zKo+dScM1B8vXphT8SFhtIXKo8nebW+WM2a/+X9u81LBwf Hy5afGT2lUgH3+ySiaor2bnqzqW6hcR9Uz7MyJS6/+O/6bOnVdWqBzPfNa9JEzx8Z9rqOCWH Gma+7dN3Chw/8V758j1xbS+/qIxWleWaZyQD6p+X/P32/NGk0qk6a5RYijMSDbWYi4oTAaPo Z4OHAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170616141656epcas5p2537223b3e33dc13b9703319b09f8c4fc X-Msg-Generator: CA X-Sender-IP: 182.195.42.80 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: 20170616141656epcas5p2537223b3e33dc13b9703319b09f8c4fc X-RootMTR: 20170616141656epcas5p2537223b3e33dc13b9703319b09f8c4fc References: Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Please pull fbdev fixes for v4.12-rc6. Best regards, --- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics The following changes since commit 32c1431eea4881a6b17bd7c639315010aeefa452: Linux 4.12-rc5 (2017-06-11 16:48:20 -0700) are available in the git repository at: git://github.com/bzolnier/linux.git tags/fbdev-v4.12-rc6 for you to fetch changes up to b429f96aa5cb4023b915de9c2aa6e7720a939856: video: fbdev: udlfb: drop log level for blanking (2017-06-14 12:40:36 +0200) ---------------------------------------------------------------- fbdev fixes for v4.12-rc6: - fix udlfb driver to stop spamming logs (Mike Gerow) - add missing endianness conversions in smscufx & udlfb drivers (Johan Hovold) - fix few gcc warnings/errors (Arnd Bergmann) ---------------------------------------------------------------- Arnd Bergmann (2): video: fbdev: avoid int-in-bool-context warning video: fbdev: via: remove possibly unused variables Johan Hovold (1): video: fbdev: add missing USB-descriptor endianness conversions Mike Gerow (1): video: fbdev: udlfb: drop log level for blanking drivers/video/fbdev/core/fbmon.c | 2 +- drivers/video/fbdev/smscufx.c | 5 +++-- drivers/video/fbdev/udlfb.c | 9 +++++---- drivers/video/fbdev/via/viafbdev.c | 8 +++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 687ebb0..41d7979 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -1048,7 +1048,7 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE; i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) - if (PIXEL_CLOCK) + if (PIXEL_CLOCK != 0) edt[num++] = block - edid; /* Yikes, EDID data is totally useless */ diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c index ec2e7e3..449fcea 100644 --- a/drivers/video/fbdev/smscufx.c +++ b/drivers/video/fbdev/smscufx.c @@ -1646,8 +1646,9 @@ static int ufx_usb_probe(struct usb_interface *interface, dev_dbg(dev->gdev, "%s %s - serial #%s\n", usbdev->manufacturer, usbdev->product, usbdev->serial); dev_dbg(dev->gdev, "vid_%04x&pid_%04x&rev_%04x driver's ufx_data struct at %p\n", - usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, - usbdev->descriptor.bcdDevice, dev); + le16_to_cpu(usbdev->descriptor.idVendor), + le16_to_cpu(usbdev->descriptor.idProduct), + le16_to_cpu(usbdev->descriptor.bcdDevice), dev); dev_dbg(dev->gdev, "console enable=%d\n", console); dev_dbg(dev->gdev, "fb_defio enable=%d\n", fb_defio); diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index 6a3c353..05ef657 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1105,8 +1105,8 @@ static int dlfb_ops_blank(int blank_mode, struct fb_info *info) char *bufptr; struct urb *urb; - pr_info("/dev/fb%d FB_BLANK mode %d --> %d\n", - info->node, dev->blank_mode, blank_mode); + pr_debug("/dev/fb%d FB_BLANK mode %d --> %d\n", + info->node, dev->blank_mode, blank_mode); if ((dev->blank_mode == FB_BLANK_POWERDOWN) && (blank_mode != FB_BLANK_POWERDOWN)) { @@ -1613,8 +1613,9 @@ static int dlfb_usb_probe(struct usb_interface *interface, pr_info("%s %s - serial #%s\n", usbdev->manufacturer, usbdev->product, usbdev->serial); pr_info("vid_%04x&pid_%04x&rev_%04x driver's dlfb_data struct at %p\n", - usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, - usbdev->descriptor.bcdDevice, dev); + le16_to_cpu(usbdev->descriptor.idVendor), + le16_to_cpu(usbdev->descriptor.idProduct), + le16_to_cpu(usbdev->descriptor.bcdDevice), dev); pr_info("console enable=%d\n", console); pr_info("fb_defio enable=%d\n", fb_defio); pr_info("shadow enable=%d\n", shadow); diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/via/viafbdev.c index f9718f0..badee04 100644 --- a/drivers/video/fbdev/via/viafbdev.c +++ b/drivers/video/fbdev/via/viafbdev.c @@ -1630,16 +1630,14 @@ static void viafb_init_proc(struct viafb_shared *shared) } static void viafb_remove_proc(struct viafb_shared *shared) { - struct proc_dir_entry *viafb_entry = shared->proc_entry, - *iga1_entry = shared->iga1_proc_entry, - *iga2_entry = shared->iga2_proc_entry; + struct proc_dir_entry *viafb_entry = shared->proc_entry; if (!viafb_entry) return; - remove_proc_entry("output_devices", iga2_entry); + remove_proc_entry("output_devices", shared->iga2_proc_entry); remove_proc_entry("iga2", viafb_entry); - remove_proc_entry("output_devices", iga1_entry); + remove_proc_entry("output_devices", shared->iga1_proc_entry); remove_proc_entry("iga1", viafb_entry); remove_proc_entry("supported_output_devices", viafb_entry);