Skip to content

L
linux
Commit c3611b6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'fbdev-v4.16' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "There is nothing really major here:

   - fix display-timings lookup in the Device Tree in atmel_lcdfb driver
     (Johan Hovold)

   - fix video mode and line_length to be set correctly in vfb driver
     (Pieter "PoroCYon" Sluys)

   - fix returning nonsensical values to the user-space on GIO_FONTX
     ioctl when using dummy console (Nicolas Pitre)

   - add missing license tag to mmpfb driver (Arnd Bergmann)

   - convert radeonfb and pxa3xx_gcu drivers to use ktime_get[_ts64]()
     instead of the deprecated do_gettimeofday() (Arnd Bergmann)

   - switch udlfb driver from using the pr_*() logging functions to the
     dev_*() ones + related cleanups (Ladislav Michl)

   - use __raw I/O accessors also on arm64 (Ji Zhang)

   - fix Kconfig help text for intelfb driver (Randy Dunlap)

   - do not duplicate features data in omapfb driver (Ladislav Michl)

   - misc cleanups (Colin Ian King, Markus Elfring, Rasmus Villemoes,
     Vasyl Gomonovych, Himanshu Jha, Michael Trimarchi)"

* tag 'fbdev-v4.16' of git://github.com/bzolnier/linux: (25 commits)
  video: udlfb: Switch from the pr_*() to the dev_*() logging functions
  video: udlfb: Constify read only data
  video: fbdev/mmp: add MODULE_LICENSE
  console/dummy: leave .con_font_get set to NULL
  fbdev: mxsfb: use framebuffer_alloc in the correct way
  video: udlfb: Do not name private data 'dev'
  video: udlfb: Remove noisy warnings
  video: udlfb: Remove redundant gdev variable
  video: udlfb: Remove unnecessary local variable
  fbdev: auo_k190x: Use zeroing memory allocator instead of allocator/memset
  vfb: fix video mode and line_length being set when loaded
  fbdev: arm64 use __raw I/O memory api
  omapfb: dss: Do not duplicate features data
  video: fbdev: omap2: Use PTR_ERR_OR_ZERO()
  fbdev: au1200fb: delete duplicate header contents
  fbdev: pxa3xx: use ktime_get_ts64 for time stamps
  fbdev: radeon: use ktime_get() for HZ calibration
  video: smscufx: Improve a size determination in two functions
  video: udlfb: Delete an unnecessary return statement in two functions
  video: udlfb: Improve a size determination in dlfb_alloc_urb_list()
  ...
parents cc006a22 5865889f
Hide whitespace changes
Inline Side-by-side
Showing with 421 additions and 777 deletions
drivers/video/console/dummycon.c
View file @ c3611b6d
...@@ -67,7 +67,6 @@ const struct consw dummy_con = { ...@@ -67,7 +67,6 @@ const struct consw dummy_con = {
.con_switch = DUMMY, .con_switch = DUMMY,
.con_blank = DUMMY, .con_blank = DUMMY,
.con_font_set = DUMMY, .con_font_set = DUMMY,
.con_font_get = DUMMY,
.con_font_default = DUMMY, .con_font_default = DUMMY,
.con_font_copy = DUMMY, .con_font_copy = DUMMY,
}; };
......
drivers/video/fbdev/Kconfig
View file @ c3611b6d
...@@ -1188,7 +1188,7 @@ config FB_INTEL ...@@ -1188,7 +1188,7 @@ config FB_INTEL
830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
Say Y if you have and plan to use such a board. Say Y if you have and plan to use such a board.
To make FB_INTELFB=Y work you need to say AGP_INTEL=y too. To make FB_INTEL=Y work you need to say AGP_INTEL=y too.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called intelfb. module will be called intelfb.
......
drivers/video/fbdev/atmel_lcdfb.c
View file @ c3611b6d
...@@ -1119,7 +1119,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) ...@@ -1119,7 +1119,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
goto put_display_node; goto put_display_node;
} }
timings_np = of_find_node_by_name(display_np, "display-timings"); timings_np = of_get_child_by_name(display_np, "display-timings");
if (!timings_np) { if (!timings_np) {
dev_err(dev, "failed to find display-timings node\n"); dev_err(dev, "failed to find display-timings node\n");
ret = -ENODEV; ret = -ENODEV;
...@@ -1140,6 +1140,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) ...@@ -1140,6 +1140,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
fb_add_videomode(&fb_vm, &info->modelist); fb_add_videomode(&fb_vm, &info->modelist);
} }
/*
* FIXME: Make sure we are not referencing any fields in display_np
* and timings_np and drop our references to them before returning to
* avoid leaking the nodes on probe deferral and driver unbind.
*/
return 0; return 0;
put_timings_node: put_timings_node:
......
drivers/video/fbdev/aty/radeon_base.c
View file @ c3611b6d
...@@ -583,8 +583,8 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) ...@@ -583,8 +583,8 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
int hTotal, vTotal, num, denom, m, n; int hTotal, vTotal, num, denom, m, n;
unsigned long long hz, vclk; unsigned long long hz, vclk;
long xtal; long xtal;
struct timeval start_tv, stop_tv; ktime_t start_time, stop_time;
long total_secs, total_usecs; u64 total_usecs;
int i; int i;
/* Ugh, we cut interrupts, bad bad bad, but we want some precision /* Ugh, we cut interrupts, bad bad bad, but we want some precision
...@@ -600,7 +600,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) ...@@ -600,7 +600,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0)
break; break;
do_gettimeofday(&start_tv); start_time = ktime_get();
for(i=0; i<1000000; i++) for(i=0; i<1000000; i++)
if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) != 0) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) != 0)
...@@ -610,18 +610,14 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) ...@@ -610,18 +610,14 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0)
break; break;
do_gettimeofday(&stop_tv); stop_time = ktime_get();
local_irq_enable(); local_irq_enable();
total_secs = stop_tv.tv_sec - start_tv.tv_sec; total_usecs = ktime_us_delta(stop_time, start_time);
if (total_secs > 10) if (total_usecs >= 10 * USEC_PER_SEC || total_usecs == 0)
return -1; return -1;
total_usecs = stop_tv.tv_usec - start_tv.tv_usec; hz = USEC_PER_SEC/(u32)total_usecs;
total_usecs += total_secs * 1000000;
if (total_usecs < 0)
total_usecs = -total_usecs;
hz = 1000000/total_usecs;
hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8; hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8;
vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1); vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1);
......
drivers/video/fbdev/au1200fb.h
View file @ c3611b6d
...@@ -284,289 +284,3 @@ struct au1200_lcd { ...@@ -284,289 +284,3 @@ struct au1200_lcd {
/********************************************************************/ /********************************************************************/
#endif /* _AU1200LCD_H */ #endif /* _AU1200LCD_H */
/*
* BRIEF MODULE DESCRIPTION
* Hardware definitions for the Au1200 LCD controller
*
* Copyright 2004 AMD
* Author: AMD
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _AU1200LCD_H
#define _AU1200LCD_H
/********************************************************************/
#define AU1200_LCD_ADDR 0xB5000000
#define uint8 unsigned char
#define uint32 unsigned int
struct au1200_lcd {
volatile uint32 reserved0;
volatile uint32 screen;
volatile uint32 backcolor;
volatile uint32 horztiming;
volatile uint32 verttiming;
volatile uint32 clkcontrol;
volatile uint32 pwmdiv;
volatile uint32 pwmhi;
volatile uint32 reserved1;
volatile uint32 winenable;
volatile uint32 colorkey;
volatile uint32 colorkeymsk;
struct
{
volatile uint32 cursorctrl;
volatile uint32 cursorpos;
volatile uint32 cursorcolor0;
volatile uint32 cursorcolor1;
volatile uint32 cursorcolor2;
uint32 cursorcolor3;
} hwc;
volatile uint32 intstatus;
volatile uint32 intenable;
volatile uint32 outmask;
volatile uint32 fifoctrl;
uint32 reserved2[(0x0100-0x0058)/4];
struct
{
volatile uint32 winctrl0;
volatile uint32 winctrl1;
volatile uint32 winctrl2;
volatile uint32 winbuf0;
volatile uint32 winbuf1;
volatile uint32 winbufctrl;
uint32 winreserved0;
uint32 winreserved1;
} window[4];
uint32 reserved3[(0x0400-0x0180)/4];
volatile uint32 palette[(0x0800-0x0400)/4];
volatile uint8 cursorpattern[256];
};
/* lcd_screen */
#define LCD_SCREEN_SEN (1<<31)
#define LCD_SCREEN_SX (0x07FF<<19)
#define LCD_SCREEN_SY (0x07FF<< 8)
#define LCD_SCREEN_SWP (1<<7)
#define LCD_SCREEN_SWD (1<<6)
#define LCD_SCREEN_PT (7<<0)
#define LCD_SCREEN_PT_TFT (0<<0)
#define LCD_SCREEN_SX_N(WIDTH) ((WIDTH-1)<<19)
#define LCD_SCREEN_SY_N(HEIGHT) ((HEIGHT-1)<<8)
#define LCD_SCREEN_PT_CSTN (1<<0)
#define LCD_SCREEN_PT_CDSTN (2<<0)
#define LCD_SCREEN_PT_M8STN (3<<0)
#define LCD_SCREEN_PT_M4STN (4<<0)
/* lcd_backcolor */
#define LCD_BACKCOLOR_SBGR (0xFF<<16)
#define LCD_BACKCOLOR_SBGG (0xFF<<8)
#define LCD_BACKCOLOR_SBGB (0xFF<<0)
#define LCD_BACKCOLOR_SBGR_N(N) ((N)<<16)
#define LCD_BACKCOLOR_SBGG_N(N) ((N)<<8)
#define LCD_BACKCOLOR_SBGB_N(N) ((N)<<0)
/* lcd_winenable */
#define LCD_WINENABLE_WEN3 (1<<3)
#define LCD_WINENABLE_WEN2 (1<<2)
#define LCD_WINENABLE_WEN1 (1<<1)
#define LCD_WINENABLE_WEN0 (1<<0)
/* lcd_colorkey */
#define LCD_COLORKEY_CKR (0xFF<<16)
#define LCD_COLORKEY_CKG (0xFF<<8)
#define LCD_COLORKEY_CKB (0xFF<<0)
#define LCD_COLORKEY_CKR_N(N) ((N)<<16)
#define LCD_COLORKEY_CKG_N(N) ((N)<<8)
#define LCD_COLORKEY_CKB_N(N) ((N)<<0)
/* lcd_colorkeymsk */
#define LCD_COLORKEYMSK_CKMR (0xFF<<16)
#define LCD_COLORKEYMSK_CKMG (0xFF<<8)
#define LCD_COLORKEYMSK_CKMB (0xFF<<0)
#define LCD_COLORKEYMSK_CKMR_N(N) ((N)<<16)
#define LCD_COLORKEYMSK_CKMG_N(N) ((N)<<8)
#define LCD_COLORKEYMSK_CKMB_N(N) ((N)<<0)
/* lcd windows control 0 */
#define LCD_WINCTRL0_OX (0x07FF<<21)
#define LCD_WINCTRL0_OY (0x07FF<<10)
#define LCD_WINCTRL0_A (0x00FF<<2)
#define LCD_WINCTRL0_AEN (1<<1)
#define LCD_WINCTRL0_OX_N(N) ((N)<<21)
#define LCD_WINCTRL0_OY_N(N) ((N)<<10)
#define LCD_WINCTRL0_A_N(N) ((N)<<2)
/* lcd windows control 1 */
#define LCD_WINCTRL1_PRI (3<<30)
#define LCD_WINCTRL1_PIPE (1<<29)
#define LCD_WINCTRL1_FRM (0xF<<25)
#define LCD_WINCTRL1_CCO (1<<24)
#define LCD_WINCTRL1_PO (3<<22)
#define LCD_WINCTRL1_SZX (0x07FF<<11)
#define LCD_WINCTRL1_SZY (0x07FF<<0)
#define LCD_WINCTRL1_FRM_1BPP (0<<25)
#define LCD_WINCTRL1_FRM_2BPP (1<<25)
#define LCD_WINCTRL1_FRM_4BPP (2<<25)
#define LCD_WINCTRL1_FRM_8BPP (3<<25)
#define LCD_WINCTRL1_FRM_12BPP (4<<25)
#define LCD_WINCTRL1_FRM_16BPP655 (5<<25)
#define LCD_WINCTRL1_FRM_16BPP565 (6<<25)
#define LCD_WINCTRL1_FRM_16BPP556 (7<<25)
#define LCD_WINCTRL1_FRM_16BPPI1555 (8<<25)
#define LCD_WINCTRL1_FRM_16BPPI5551 (9<<25)
#define LCD_WINCTRL1_FRM_16BPPA1555 (10<<25)
#define LCD_WINCTRL1_FRM_16BPPA5551 (11<<25)
#define LCD_WINCTRL1_FRM_24BPP (12<<25)
#define LCD_WINCTRL1_FRM_32BPP (13<<25)
#define LCD_WINCTRL1_PRI_N(N) ((N)<<30)
#define LCD_WINCTRL1_PO_00 (0<<22)
#define LCD_WINCTRL1_PO_01 (1<<22)
#define LCD_WINCTRL1_PO_10 (2<<22)
#define LCD_WINCTRL1_PO_11 (3<<22)
#define LCD_WINCTRL1_SZX_N(N) ((N-1)<<11)
#define LCD_WINCTRL1_SZY_N(N) ((N-1)<<0)
/* lcd windows control 2 */
#define LCD_WINCTRL2_CKMODE (3<<24)
#define LCD_WINCTRL2_DBM (1<<23)
#define LCD_WINCTRL2_RAM (3<<21)
#define LCD_WINCTRL2_BX (0x1FFF<<8)
#define LCD_WINCTRL2_SCX (0xF<<4)
#define LCD_WINCTRL2_SCY (0xF<<0)
#define LCD_WINCTRL2_CKMODE_00 (0<<24)
#define LCD_WINCTRL2_CKMODE_01 (1<<24)
#define LCD_WINCTRL2_CKMODE_10 (2<<24)
#define LCD_WINCTRL2_CKMODE_11 (3<<24)
#define LCD_WINCTRL2_RAM_NONE (0<<21)
#define LCD_WINCTRL2_RAM_PALETTE (1<<21)
#define LCD_WINCTRL2_RAM_GAMMA (2<<21)
#define LCD_WINCTRL2_RAM_BUFFER (3<<21)
#define LCD_WINCTRL2_BX_N(N) ((N)<<8)
#define LCD_WINCTRL2_SCX_1 (0<<4)
#define LCD_WINCTRL2_SCX_2 (1<<4)
#define LCD_WINCTRL2_SCX_4 (2<<4)
#define LCD_WINCTRL2_SCY_1 (0<<0)
#define LCD_WINCTRL2_SCY_2 (1<<0)
#define LCD_WINCTRL2_SCY_4 (2<<0)
/* lcd windows buffer control */
#define LCD_WINBUFCTRL_DB (1<<1)
#define LCD_WINBUFCTRL_DBN (1<<0)
/* lcd_intstatus, lcd_intenable */
#define LCD_INT_IFO (0xF<<14)
#define LCD_INT_IFU (0xF<<10)
#define LCD_INT_OFO (1<<9)
#define LCD_INT_OFU (1<<8)
#define LCD_INT_WAIT (1<<3)
#define LCD_INT_SD (1<<2)
#define LCD_INT_SA (1<<1)
#define LCD_INT_SS (1<<0)
/* lcd_horztiming */
#define LCD_HORZTIMING_HND2 (0x1FF<<18)
#define LCD_HORZTIMING_HND1 (0x1FF<<9)
#define LCD_HORZTIMING_HPW (0x1FF<<0)
#define LCD_HORZTIMING_HND2_N(N)(((N)-1)<<18)
#define LCD_HORZTIMING_HND1_N(N)(((N)-1)<<9)
#define LCD_HORZTIMING_HPW_N(N) (((N)-1)<<0)
/* lcd_verttiming */
#define LCD_VERTTIMING_VND2 (0x1FF<<18)
#define LCD_VERTTIMING_VND1 (0x1FF<<9)
#define LCD_VERTTIMING_VPW (0x1FF<<0)
#define LCD_VERTTIMING_VND2_N(N)(((N)-1)<<18)
#define LCD_VERTTIMING_VND1_N(N)(((N)-1)<<9)
#define LCD_VERTTIMING_VPW_N(N) (((N)-1)<<0)
/* lcd_clkcontrol */
#define LCD_CLKCONTROL_EXT (1<<22)
#define LCD_CLKCONTROL_DELAY (3<<20)
#define LCD_CLKCONTROL_CDD (1<<19)
#define LCD_CLKCONTROL_IB (1<<18)
#define LCD_CLKCONTROL_IC (1<<17)
#define LCD_CLKCONTROL_IH (1<<16)
#define LCD_CLKCONTROL_IV (1<<15)
#define LCD_CLKCONTROL_BF (0x1F<<10)
#define LCD_CLKCONTROL_PCD (0x3FF<<0)
#define LCD_CLKCONTROL_BF_N(N) (((N)-1)<<10)
#define LCD_CLKCONTROL_PCD_N(N) ((N)<<0)
/* lcd_pwmdiv */
#define LCD_PWMDIV_EN (1<<31)
#define LCD_PWMDIV_PWMDIV (0x1FFFF<<0)
#define LCD_PWMDIV_PWMDIV_N(N) ((N)<<0)
/* lcd_pwmhi */
#define LCD_PWMHI_PWMHI1 (0xFFFF<<16)
#define LCD_PWMHI_PWMHI0 (0xFFFF<<0)
#define LCD_PWMHI_PWMHI1_N(N) ((N)<<16)
#define LCD_PWMHI_PWMHI0_N(N) ((N)<<0)
/* lcd_hwccon */
#define LCD_HWCCON_EN (1<<0)
/* lcd_cursorpos */
#define LCD_CURSORPOS_HWCXOFF (0x1F<<27)
#define LCD_CURSORPOS_HWCXPOS (0x07FF<<16)
#define LCD_CURSORPOS_HWCYOFF (0x1F<<11)
#define LCD_CURSORPOS_HWCYPOS (0x07FF<<0)
#define LCD_CURSORPOS_HWCXOFF_N(N) ((N)<<27)
#define LCD_CURSORPOS_HWCXPOS_N(N) ((N)<<16)
#define LCD_CURSORPOS_HWCYOFF_N(N) ((N)<<11)
#define LCD_CURSORPOS_HWCYPOS_N(N) ((N)<<0)
/* lcd_cursorcolor */
#define LCD_CURSORCOLOR_HWCA (0xFF<<24)
#define LCD_CURSORCOLOR_HWCR (0xFF<<16)
#define LCD_CURSORCOLOR_HWCG (0xFF<<8)
#define LCD_CURSORCOLOR_HWCB (0xFF<<0)
#define LCD_CURSORCOLOR_HWCA_N(N) ((N)<<24)
#define LCD_CURSORCOLOR_HWCR_N(N) ((N)<<16)
#define LCD_CURSORCOLOR_HWCG_N(N) ((N)<<8)
#define LCD_CURSORCOLOR_HWCB_N(N) ((N)<<0)
/* lcd_fifoctrl */
#define LCD_FIFOCTRL_F3IF (1<<29)
#define LCD_FIFOCTRL_F3REQ (0x1F<<24)
#define LCD_FIFOCTRL_F2IF (1<<29)
#define LCD_FIFOCTRL_F2REQ (0x1F<<16)
#define LCD_FIFOCTRL_F1IF (1<<29)
#define LCD_FIFOCTRL_F1REQ (0x1F<<8)
#define LCD_FIFOCTRL_F0IF (1<<29)
#define LCD_FIFOCTRL_F0REQ (0x1F<<0)
#define LCD_FIFOCTRL_F3REQ_N(N) ((N-1)<<24)
#define LCD_FIFOCTRL_F2REQ_N(N) ((N-1)<<16)
#define LCD_FIFOCTRL_F1REQ_N(N) ((N-1)<<8)
#define LCD_FIFOCTRL_F0REQ_N(N) ((N-1)<<0)
/* lcd_outmask */
#define LCD_OUTMASK_MASK (0x00FFFFFF)
/********************************************************************/
#endif /* _AU1200LCD_H */
drivers/video/fbdev/auo_k190x.c
View file @ c3611b6d
...@@ -1056,13 +1056,12 @@ int auok190x_common_probe(struct platform_device *pdev, ...@@ -1056,13 +1056,12 @@ int auok190x_common_probe(struct platform_device *pdev,
/* videomemory handling */ /* videomemory handling */
videomemorysize = roundup((panel->w * panel->h) * 2, PAGE_SIZE); videomemorysize = roundup((panel->w * panel->h) * 2, PAGE_SIZE);
videomemory = vmalloc(videomemorysize); videomemory = vzalloc(videomemorysize);
if (!videomemory) { if (!videomemory) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_irq; goto err_irq;
} }
memset(videomemory, 0, videomemorysize);
info->screen_base = (char *)videomemory; info->screen_base = (char *)videomemory;
info->fix.smem_len = videomemorysize; info->fix.smem_len = videomemorysize;
......
drivers/video/fbdev/mmp/core.c
View file @ c3611b6d
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/module.h>
#include <video/mmp_disp.h> #include <video/mmp_disp.h>
static struct mmp_overlay *path_get_overlay(struct mmp_path *path, static struct mmp_overlay *path_get_overlay(struct mmp_path *path,
...@@ -249,3 +250,7 @@ void mmp_unregister_path(struct mmp_path *path) ...@@ -249,3 +250,7 @@ void mmp_unregister_path(struct mmp_path *path)
mutex_unlock(&disp_lock); mutex_unlock(&disp_lock);
} }
EXPORT_SYMBOL_GPL(mmp_unregister_path); EXPORT_SYMBOL_GPL(mmp_unregister_path);
MODULE_AUTHOR("Zhou Zhu <zzhu3@marvell.com>");
MODULE_DESCRIPTION("Marvell MMP display framework");
MODULE_LICENSE("GPL");
drivers/video/fbdev/mxsfb.c
View file @ c3611b6d
...@@ -169,7 +169,6 @@ struct mxsfb_devdata { ...@@ -169,7 +169,6 @@ struct mxsfb_devdata {
}; };
struct mxsfb_info { struct mxsfb_info {
struct fb_info fb_info;
struct platform_device *pdev; struct platform_device *pdev;
struct clk *clk; struct clk *clk;
struct clk *clk_axi; struct clk *clk_axi;
...@@ -208,8 +207,6 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { ...@@ -208,8 +207,6 @@ static const struct mxsfb_devdata mxsfb_devdata[] = {
}, },
}; };
#define to_imxfb_host(x) (container_of(x, struct mxsfb_info, fb_info))
/* mask and shift depends on architecture */ /* mask and shift depends on architecture */
static inline u32 set_hsync_pulse_width(struct mxsfb_info *host, unsigned val) static inline u32 set_hsync_pulse_width(struct mxsfb_info *host, unsigned val)
{ {
...@@ -269,7 +266,7 @@ static inline unsigned chan_to_field(unsigned chan, struct fb_bitfield *bf) ...@@ -269,7 +266,7 @@ static inline unsigned chan_to_field(unsigned chan, struct fb_bitfield *bf)
static int mxsfb_check_var(struct fb_var_screeninfo *var, static int mxsfb_check_var(struct fb_var_screeninfo *var,
struct fb_info *fb_info) struct fb_info *fb_info)
{ {
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
const struct fb_bitfield *rgb = NULL; const struct fb_bitfield *rgb = NULL;
if (var->xres < MIN_XRES) if (var->xres < MIN_XRES)
...@@ -330,7 +327,7 @@ static inline void mxsfb_disable_axi_clk(struct mxsfb_info *host) ...@@ -330,7 +327,7 @@ static inline void mxsfb_disable_axi_clk(struct mxsfb_info *host)
static void mxsfb_enable_controller(struct fb_info *fb_info) static void mxsfb_enable_controller(struct fb_info *fb_info)
{ {
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
u32 reg; u32 reg;
int ret; int ret;
...@@ -367,7 +364,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info) ...@@ -367,7 +364,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
static void mxsfb_disable_controller(struct fb_info *fb_info) static void mxsfb_disable_controller(struct fb_info *fb_info)
{ {
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
unsigned loop; unsigned loop;
u32 reg; u32 reg;
int ret; int ret;
...@@ -409,7 +406,7 @@ static void mxsfb_disable_controller(struct fb_info *fb_info) ...@@ -409,7 +406,7 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
static int mxsfb_set_par(struct fb_info *fb_info) static int mxsfb_set_par(struct fb_info *fb_info)
{ {
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
u32 ctrl, vdctrl0, vdctrl4; u32 ctrl, vdctrl0, vdctrl4;
int line_size, fb_size; int line_size, fb_size;
int reenable = 0; int reenable = 0;
...@@ -569,7 +566,7 @@ static int mxsfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, ...@@ -569,7 +566,7 @@ static int mxsfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
static int mxsfb_blank(int blank, struct fb_info *fb_info) static int mxsfb_blank(int blank, struct fb_info *fb_info)
{ {
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
switch (blank) { switch (blank) {
case FB_BLANK_POWERDOWN: case FB_BLANK_POWERDOWN:
...@@ -591,7 +588,7 @@ static int mxsfb_blank(int blank, struct fb_info *fb_info) ...@@ -591,7 +588,7 @@ static int mxsfb_blank(int blank, struct fb_info *fb_info)
static int mxsfb_pan_display(struct fb_var_screeninfo *var, static int mxsfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *fb_info) struct fb_info *fb_info)
{ {
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
unsigned offset; unsigned offset;
if (var->xoffset != 0) if (var->xoffset != 0)
...@@ -622,10 +619,10 @@ static struct fb_ops mxsfb_ops = { ...@@ -622,10 +619,10 @@ static struct fb_ops mxsfb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int mxsfb_restore_mode(struct mxsfb_info *host, static int mxsfb_restore_mode(struct fb_info *fb_info,
struct fb_videomode *vmode) struct fb_videomode *vmode)
{ {
struct fb_info *fb_info = &host->fb_info; struct mxsfb_info *host = fb_info->par;
unsigned line_count; unsigned line_count;
unsigned period; unsigned period;
unsigned long pa, fbsize; unsigned long pa, fbsize;
...@@ -726,10 +723,10 @@ static int mxsfb_restore_mode(struct mxsfb_info *host, ...@@ -726,10 +723,10 @@ static int mxsfb_restore_mode(struct mxsfb_info *host,
return ret; return ret;
} }
static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host, static int mxsfb_init_fbinfo_dt(struct fb_info *fb_info,
struct fb_videomode *vmode) struct fb_videomode *vmode)
{ {
struct fb_info *fb_info = &host->fb_info; struct mxsfb_info *host = fb_info->par;
struct fb_var_screeninfo *var = &fb_info->var; struct fb_var_screeninfo *var = &fb_info->var;
struct device *dev = &host->pdev->dev; struct device *dev = &host->pdev->dev;
struct device_node *np = host->pdev->dev.of_node; struct device_node *np = host->pdev->dev.of_node;
...@@ -805,12 +802,12 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host, ...@@ -805,12 +802,12 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host,
return ret; return ret;
} }
static int mxsfb_init_fbinfo(struct mxsfb_info *host, static int mxsfb_init_fbinfo(struct fb_info *fb_info,
struct fb_videomode *vmode) struct fb_videomode *vmode)
{ {
int ret; int ret;
struct mxsfb_info *host = fb_info->par;
struct device *dev = &host->pdev->dev; struct device *dev = &host->pdev->dev;
struct fb_info *fb_info = &host->fb_info;
struct fb_var_screeninfo *var = &fb_info->var; struct fb_var_screeninfo *var = &fb_info->var;
dma_addr_t fb_phys; dma_addr_t fb_phys;
void *fb_virt; void *fb_virt;
...@@ -824,7 +821,7 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host, ...@@ -824,7 +821,7 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host,
fb_info->fix.visual = FB_VISUAL_TRUECOLOR, fb_info->fix.visual = FB_VISUAL_TRUECOLOR,
fb_info->fix.accel = FB_ACCEL_NONE; fb_info->fix.accel = FB_ACCEL_NONE;
ret = mxsfb_init_fbinfo_dt(host, vmode); ret = mxsfb_init_fbinfo_dt(fb_info, vmode);
if (ret) if (ret)
return ret; return ret;
...@@ -843,16 +840,16 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host, ...@@ -843,16 +840,16 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host,
fb_info->screen_base = fb_virt; fb_info->screen_base = fb_virt;
fb_info->screen_size = fb_info->fix.smem_len = fb_size; fb_info->screen_size = fb_info->fix.smem_len = fb_size;
if (mxsfb_restore_mode(host, vmode)) if (mxsfb_restore_mode(fb_info, vmode))
memset(fb_virt, 0, fb_size); memset(fb_virt, 0, fb_size);
return 0; return 0;
} }
static void mxsfb_free_videomem(struct mxsfb_info *host) static void mxsfb_free_videomem(struct fb_info *fb_info)
{ {
struct mxsfb_info *host = fb_info->par;
struct device *dev = &host->pdev->dev; struct device *dev = &host->pdev->dev;
struct fb_info *fb_info = &host->fb_info;
dma_free_wc(dev, fb_info->screen_size, fb_info->screen_base, dma_free_wc(dev, fb_info->screen_size, fb_info->screen_base,
fb_info->fix.smem_start); fb_info->fix.smem_start);
...@@ -902,7 +899,7 @@ static int mxsfb_probe(struct platform_device *pdev) ...@@ -902,7 +899,7 @@ static int mxsfb_probe(struct platform_device *pdev)
if (mode == NULL) if (mode == NULL)
return -ENOMEM; return -ENOMEM;
host = to_imxfb_host(fb_info); host = fb_info->par;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
host->base = devm_ioremap_resource(&pdev->dev, res); host->base = devm_ioremap_resource(&pdev->dev, res);
...@@ -941,7 +938,7 @@ static int mxsfb_probe(struct platform_device *pdev) ...@@ -941,7 +938,7 @@ static int mxsfb_probe(struct platform_device *pdev)
goto fb_release; goto fb_release;
} }
ret = mxsfb_init_fbinfo(host, mode); ret = mxsfb_init_fbinfo(fb_info, mode);
if (ret != 0) if (ret != 0)
goto fb_release; goto fb_release;
...@@ -982,13 +979,13 @@ static int mxsfb_probe(struct platform_device *pdev) ...@@ -982,13 +979,13 @@ static int mxsfb_probe(struct platform_device *pdev)
static int mxsfb_remove(struct platform_device *pdev) static int mxsfb_remove(struct platform_device *pdev)
{ {
struct fb_info *fb_info = platform_get_drvdata(pdev); struct fb_info *fb_info = platform_get_drvdata(pdev);
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
if (host->enabled) if (host->enabled)
mxsfb_disable_controller(fb_info); mxsfb_disable_controller(fb_info);
unregister_framebuffer(fb_info); unregister_framebuffer(fb_info);
mxsfb_free_videomem(host); mxsfb_free_videomem(fb_info);
framebuffer_release(fb_info); framebuffer_release(fb_info);
...@@ -998,7 +995,7 @@ static int mxsfb_remove(struct platform_device *pdev) ...@@ -998,7 +995,7 @@ static int mxsfb_remove(struct platform_device *pdev)
static void mxsfb_shutdown(struct platform_device *pdev) static void mxsfb_shutdown(struct platform_device *pdev)
{ {
struct fb_info *fb_info = platform_get_drvdata(pdev); struct fb_info *fb_info = platform_get_drvdata(pdev);
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = fb_info->par;
mxsfb_enable_axi_clk(host); mxsfb_enable_axi_clk(host);
......
drivers/video/fbdev/omap2/omapfb/dss/dispc.c
View file @ c3611b6d
...@@ -3976,52 +3976,33 @@ static const struct dispc_features omap54xx_dispc_feats = { ...@@ -3976,52 +3976,33 @@ static const struct dispc_features omap54xx_dispc_feats = {
.has_writeback = true, .has_writeback = true,
}; };
static int dispc_init_features(struct platform_device *pdev) static const struct dispc_features *dispc_get_features(void)
{ {
const struct dispc_features *src;
struct dispc_features *dst;
dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
if (!dst) {
dev_err(&pdev->dev, "Failed to allocate DISPC Features\n");
return -ENOMEM;
}
switch (omapdss_get_version()) { switch (omapdss_get_version()) {
case OMAPDSS_VER_OMAP24xx: case OMAPDSS_VER_OMAP24xx:
src = &omap24xx_dispc_feats; return &omap24xx_dispc_feats;
break;
case OMAPDSS_VER_OMAP34xx_ES1: case OMAPDSS_VER_OMAP34xx_ES1:
src = &omap34xx_rev1_0_dispc_feats; return &omap34xx_rev1_0_dispc_feats;
break;
case OMAPDSS_VER_OMAP34xx_ES3: case OMAPDSS_VER_OMAP34xx_ES3:
case OMAPDSS_VER_OMAP3630: case OMAPDSS_VER_OMAP3630:
case OMAPDSS_VER_AM35xx: case OMAPDSS_VER_AM35xx:
case OMAPDSS_VER_AM43xx: case OMAPDSS_VER_AM43xx:
src = &omap34xx_rev3_0_dispc_feats; return &omap34xx_rev3_0_dispc_feats;
break;
case OMAPDSS_VER_OMAP4430_ES1: case OMAPDSS_VER_OMAP4430_ES1:
case OMAPDSS_VER_OMAP4430_ES2: case OMAPDSS_VER_OMAP4430_ES2:
case OMAPDSS_VER_OMAP4: case OMAPDSS_VER_OMAP4:
src = &omap44xx_dispc_feats; return &omap44xx_dispc_feats;
break;
case OMAPDSS_VER_OMAP5: case OMAPDSS_VER_OMAP5:
case OMAPDSS_VER_DRA7xx: case OMAPDSS_VER_DRA7xx:
src = &omap54xx_dispc_feats; return &omap54xx_dispc_feats;
break;
default: default:
return -ENODEV; return NULL;
} }
memcpy(dst, src, sizeof(*dst));
dispc.feat = dst;
return 0;
} }
static irqreturn_t dispc_irq_handler(int irq, void *arg) static irqreturn_t dispc_irq_handler(int irq, void *arg)
...@@ -4078,9 +4059,9 @@ static int dispc_bind(struct device *dev, struct device *master, void *data) ...@@ -4078,9 +4059,9 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
spin_lock_init(&dispc.control_lock); spin_lock_init(&dispc.control_lock);
r = dispc_init_features(dispc.pdev); dispc.feat = dispc_get_features();
if (r) if (!dispc.feat)
return r; return -ENODEV;
dispc_mem = platform_get_resource(dispc.pdev, IORESOURCE_MEM, 0); dispc_mem = platform_get_resource(dispc.pdev, IORESOURCE_MEM, 0);
if (!dispc_mem) { if (!dispc_mem) {
......
drivers/video/fbdev/omap2/omapfb/dss/dss.c
View file @ c3611b6d
...@@ -887,58 +887,37 @@ static const struct dss_features dra7xx_dss_feats = { ...@@ -887,58 +887,37 @@ static const struct dss_features dra7xx_dss_feats = {
.num_ports = ARRAY_SIZE(dra7xx_ports), .num_ports = ARRAY_SIZE(dra7xx_ports),
}; };
static int dss_init_features(struct platform_device *pdev) static const struct dss_features *dss_get_features(void)
{ {
const struct dss_features *src;
struct dss_features *dst;
dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
if (!dst) {
dev_err(&pdev->dev, "Failed to allocate local DSS Features\n");
return -ENOMEM;
}
switch (omapdss_get_version()) { switch (omapdss_get_version()) {
case OMAPDSS_VER_OMAP24xx: case OMAPDSS_VER_OMAP24xx:
src = &omap24xx_dss_feats; return &omap24xx_dss_feats;
break;
case OMAPDSS_VER_OMAP34xx_ES1: case OMAPDSS_VER_OMAP34xx_ES1:
case OMAPDSS_VER_OMAP34xx_ES3: case OMAPDSS_VER_OMAP34xx_ES3:
case OMAPDSS_VER_AM35xx: case OMAPDSS_VER_AM35xx:
src = &omap34xx_dss_feats; return &omap34xx_dss_feats;
break;
case OMAPDSS_VER_OMAP3630: case OMAPDSS_VER_OMAP3630:
src = &omap3630_dss_feats; return &omap3630_dss_feats;
break;
case OMAPDSS_VER_OMAP4430_ES1: case OMAPDSS_VER_OMAP4430_ES1:
case OMAPDSS_VER_OMAP4430_ES2: case OMAPDSS_VER_OMAP4430_ES2:
case OMAPDSS_VER_OMAP4: case OMAPDSS_VER_OMAP4:
src = &omap44xx_dss_feats; return &omap44xx_dss_feats;
break;
case OMAPDSS_VER_OMAP5: case OMAPDSS_VER_OMAP5:
src = &omap54xx_dss_feats; return &omap54xx_dss_feats;
break;
case OMAPDSS_VER_AM43xx: case OMAPDSS_VER_AM43xx:
src = &am43xx_dss_feats; return &am43xx_dss_feats;
break;
case OMAPDSS_VER_DRA7xx: case OMAPDSS_VER_DRA7xx:
src = &dra7xx_dss_feats; return &dra7xx_dss_feats;
break;
default: default:
return -ENODEV; return NULL;
} }
memcpy(dst, src, sizeof(*dst));
dss.feat = dst;
return 0;
} }
static void dss_uninit_ports(struct platform_device *pdev); static void dss_uninit_ports(struct platform_device *pdev);
...@@ -1104,9 +1083,9 @@ static int dss_bind(struct device *dev) ...@@ -1104,9 +1083,9 @@ static int dss_bind(struct device *dev)
dss.pdev = pdev; dss.pdev = pdev;
r = dss_init_features(dss.pdev); dss.feat = dss_get_features();
if (r) if (!dss.feat)
return r; return -ENODEV;
dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0); dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0);
if (!dss_mem) { if (!dss_mem) {
......
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
View file @ c3611b6d
...@@ -673,10 +673,7 @@ static int hdmi_audio_register(struct device *dev) ...@@ -673,10 +673,7 @@ static int hdmi_audio_register(struct device *dev)
dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO, dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
&pdata, sizeof(pdata)); &pdata, sizeof(pdata));
if (IS_ERR(hdmi.audio_pdev)) return PTR_ERR_OR_ZERO(hdmi.audio_pdev);
return PTR_ERR(hdmi.audio_pdev);
return 0;
} }
/* HDMI HW IP initialisation */ /* HDMI HW IP initialisation */
......
drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
View file @ c3611b6d
...@@ -189,47 +189,30 @@ static const struct hdmi_phy_features omap54xx_phy_feats = { ...@@ -189,47 +189,30 @@ static const struct hdmi_phy_features omap54xx_phy_feats = {
.max_phy = 186000000, .max_phy = 186000000,
}; };
static int hdmi_phy_init_features(struct platform_device *pdev) static const struct hdmi_phy_features *hdmi_phy_get_features(void)
{ {
struct hdmi_phy_features *dst;
const struct hdmi_phy_features *src;
dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
if (!dst) {
dev_err(&pdev->dev, "Failed to allocate HDMI PHY Features\n");
return -ENOMEM;
}
switch (omapdss_get_version()) { switch (omapdss_get_version()) {
case OMAPDSS_VER_OMAP4430_ES1: case OMAPDSS_VER_OMAP4430_ES1:
case OMAPDSS_VER_OMAP4430_ES2: case OMAPDSS_VER_OMAP4430_ES2:
case OMAPDSS_VER_OMAP4: case OMAPDSS_VER_OMAP4:
src = &omap44xx_phy_feats; return &omap44xx_phy_feats;
break;
case OMAPDSS_VER_OMAP5: case OMAPDSS_VER_OMAP5:
case OMAPDSS_VER_DRA7xx: case OMAPDSS_VER_DRA7xx:
src = &omap54xx_phy_feats; return &omap54xx_phy_feats;
break;
default: default:
return -ENODEV; return NULL;
} }
memcpy(dst, src, sizeof(*dst));
phy_feat = dst;
return 0;
} }
int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy) int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy)
{ {
int r;
struct resource *res; struct resource *res;
r = hdmi_phy_init_features(pdev); phy_feat = hdmi_phy_get_features();
if (r) if (!phy_feat)
return r; return -ENODEV;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
if (!res) { if (!res) {
......
drivers/video/fbdev/pxa3xx-gcu.c
View file @ c3611b6d
...@@ -104,7 +104,7 @@ struct pxa3xx_gcu_priv { ...@@ -104,7 +104,7 @@ struct pxa3xx_gcu_priv {
wait_queue_head_t wait_idle; wait_queue_head_t wait_idle;
wait_queue_head_t wait_free; wait_queue_head_t wait_free;
spinlock_t spinlock; spinlock_t spinlock;
struct timeval base_time; struct timespec64 base_time;
struct pxa3xx_gcu_batch *free; struct pxa3xx_gcu_batch *free;
struct pxa3xx_gcu_batch *ready; struct pxa3xx_gcu_batch *ready;
...@@ -126,18 +126,20 @@ gc_writel(struct pxa3xx_gcu_priv *priv, unsigned int off, unsigned long val) ...@@ -126,18 +126,20 @@ gc_writel(struct pxa3xx_gcu_priv *priv, unsigned int off, unsigned long val)
#define QPRINT(priv, level, msg) \ #define QPRINT(priv, level, msg) \
do { \ do { \
struct timeval tv; \ struct timespec64 ts; \
struct pxa3xx_gcu_shared *shared = priv->shared; \ struct pxa3xx_gcu_shared *shared = priv->shared; \
u32 base = gc_readl(priv, REG_GCRBBR); \ u32 base = gc_readl(priv, REG_GCRBBR); \
\ \
do_gettimeofday(&tv); \ ktime_get_ts64(&ts); \
ts = timespec64_sub(ts, priv->base_time); \
\ \
printk(level "%ld.%03ld.%03ld - %-17s: %-21s (%s, " \ printk(level "%lld.%03ld.%03ld - %-17s: %-21s (%s, " \
"STATUS " \ "STATUS " \
"0x%02lx, B 0x%08lx [%ld], E %5ld, H %5ld, " \ "0x%02lx, B 0x%08lx [%ld], E %5ld, H %5ld, " \
"T %5ld)\n", \ "T %5ld)\n", \
tv.tv_sec - priv->base_time.tv_sec, \ (s64)(ts.tv_sec), \
tv.tv_usec / 1000, tv.tv_usec % 1000, \ ts.tv_nsec / NSEC_PER_MSEC, \
(ts.tv_nsec % NSEC_PER_MSEC) / USEC_PER_MSEC, \
__func__, msg, \ __func__, msg, \
shared->hw_running ? "running" : " idle", \ shared->hw_running ? "running" : " idle", \
gc_readl(priv, REG_GCISCR), \ gc_readl(priv, REG_GCISCR), \
...@@ -164,7 +166,7 @@ pxa3xx_gcu_reset(struct pxa3xx_gcu_priv *priv) ...@@ -164,7 +166,7 @@ pxa3xx_gcu_reset(struct pxa3xx_gcu_priv *priv)
priv->shared->buffer_phys = priv->shared_phys; priv->shared->buffer_phys = priv->shared_phys;
priv->shared->magic = PXA3XX_GCU_SHARED_MAGIC; priv->shared->magic = PXA3XX_GCU_SHARED_MAGIC;
do_gettimeofday(&priv->base_time); ktime_get_ts64(&priv->base_time);
/* set up the ring buffer pointers */ /* set up the ring buffer pointers */
gc_writel(priv, REG_GCRBLR, 0); gc_writel(priv, REG_GCRBLR, 0);
......
drivers/video/fbdev/smscufx.c
View file @ c3611b6d
...@@ -1086,8 +1086,7 @@ static int ufx_ops_open(struct fb_info *info, int user) ...@@ -1086,8 +1086,7 @@ static int ufx_ops_open(struct fb_info *info, int user)
struct fb_deferred_io *fbdefio; struct fb_deferred_io *fbdefio;
fbdefio = kzalloc(sizeof(struct fb_deferred_io), GFP_KERNEL); fbdefio = kzalloc(sizeof(*fbdefio), GFP_KERNEL);
if (fbdefio) { if (fbdefio) {
fbdefio->delay = UFX_DEFIO_WRITE_DELAY; fbdefio->delay = UFX_DEFIO_WRITE_DELAY;
fbdefio->deferred_io = ufx_dpy_deferred_io; fbdefio->deferred_io = ufx_dpy_deferred_io;
...@@ -1875,7 +1874,7 @@ static int ufx_alloc_urb_list(struct ufx_data *dev, int count, size_t size) ...@@ -1875,7 +1874,7 @@ static int ufx_alloc_urb_list(struct ufx_data *dev, int count, size_t size)
INIT_LIST_HEAD(&dev->urbs.list); INIT_LIST_HEAD(&dev->urbs.list);
while (i < count) { while (i < count) {
unode = kzalloc(sizeof(struct urb_node), GFP_KERNEL); unode = kzalloc(sizeof(*unode), GFP_KERNEL);
if (!unode) if (!unode)
break; break;
unode->dev = dev; unode->dev = dev;
......
drivers/video/fbdev/udlfb.c
View file @ c3611b6d
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
* from Florian Echtler, Henrik Bjerregaard Pedersen, and others. * from Florian Echtler, Henrik Bjerregaard Pedersen, and others.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -32,7 +30,7 @@ ...@@ -32,7 +30,7 @@
#include <video/udlfb.h> #include <video/udlfb.h>
#include "edid.h" #include "edid.h"
static struct fb_fix_screeninfo dlfb_fix = { static const struct fb_fix_screeninfo dlfb_fix = {
.id = "udlfb", .id = "udlfb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
...@@ -76,10 +74,10 @@ static int pixel_limit; /* Optionally force a pixel resolution limit */ ...@@ -76,10 +74,10 @@ static int pixel_limit; /* Optionally force a pixel resolution limit */
/* dlfb keeps a list of urbs for efficient bulk transfers */ /* dlfb keeps a list of urbs for efficient bulk transfers */
static void dlfb_urb_completion(struct urb *urb); static void dlfb_urb_completion(struct urb *urb);
static struct urb *dlfb_get_urb(struct dlfb_data *dev); static struct urb *dlfb_get_urb(struct dlfb_data *dlfb);
static int dlfb_submit_urb(struct dlfb_data *dev, struct urb * urb, size_t len); static int dlfb_submit_urb(struct dlfb_data *dlfb, struct urb * urb, size_t len);
static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size); static int dlfb_alloc_urb_list(struct dlfb_data *dlfb, int count, size_t size);
static void dlfb_free_urb_list(struct dlfb_data *dev); static void dlfb_free_urb_list(struct dlfb_data *dlfb);
/* /*
* All DisplayLink bulk operations start with 0xAF, followed by specific code * All DisplayLink bulk operations start with 0xAF, followed by specific code
...@@ -274,7 +272,7 @@ static char *dlfb_set_vid_cmds(char *wrptr, struct fb_var_screeninfo *var) ...@@ -274,7 +272,7 @@ static char *dlfb_set_vid_cmds(char *wrptr, struct fb_var_screeninfo *var)
* and then generates the appropriate command sequence that then drives the * and then generates the appropriate command sequence that then drives the
* display controller. * display controller.
*/ */
static int dlfb_set_video_mode(struct dlfb_data *dev, static int dlfb_set_video_mode(struct dlfb_data *dlfb,
struct fb_var_screeninfo *var) struct fb_var_screeninfo *var)
{ {
char *buf; char *buf;
...@@ -283,10 +281,10 @@ static int dlfb_set_video_mode(struct dlfb_data *dev, ...@@ -283,10 +281,10 @@ static int dlfb_set_video_mode(struct dlfb_data *dev,
int writesize; int writesize;
struct urb *urb; struct urb *urb;
if (!atomic_read(&dev->usb_active)) if (!atomic_read(&dlfb->usb_active))
return -EPERM; return -EPERM;
urb = dlfb_get_urb(dev); urb = dlfb_get_urb(dlfb);
if (!urb) if (!urb)
return -ENOMEM; return -ENOMEM;
...@@ -302,7 +300,7 @@ static int dlfb_set_video_mode(struct dlfb_data *dev, ...@@ -302,7 +300,7 @@ static int dlfb_set_video_mode(struct dlfb_data *dev,
/* set base for 16bpp segment to 0 */ /* set base for 16bpp segment to 0 */
wrptr = dlfb_set_base16bpp(wrptr, 0); wrptr = dlfb_set_base16bpp(wrptr, 0);
/* set base for 8bpp segment to end of fb */ /* set base for 8bpp segment to end of fb */
wrptr = dlfb_set_base8bpp(wrptr, dev->info->fix.smem_len); wrptr = dlfb_set_base8bpp(wrptr, dlfb->info->fix.smem_len);
wrptr = dlfb_set_vid_cmds(wrptr, var); wrptr = dlfb_set_vid_cmds(wrptr, var);
wrptr = dlfb_blanking(wrptr, FB_BLANK_UNBLANK); wrptr = dlfb_blanking(wrptr, FB_BLANK_UNBLANK);
...@@ -310,9 +308,9 @@ static int dlfb_set_video_mode(struct dlfb_data *dev, ...@@ -310,9 +308,9 @@ static int dlfb_set_video_mode(struct dlfb_data *dev,
writesize = wrptr - buf; writesize = wrptr - buf;
retval = dlfb_submit_urb(dev, urb, writesize); retval = dlfb_submit_urb(dlfb, urb, writesize);
dev->blank_mode = FB_BLANK_UNBLANK; dlfb->blank_mode = FB_BLANK_UNBLANK;
return retval; return retval;
} }
...@@ -333,8 +331,8 @@ static int dlfb_ops_mmap(struct fb_info *info, struct vm_area_struct *vma) ...@@ -333,8 +331,8 @@ static int dlfb_ops_mmap(struct fb_info *info, struct vm_area_struct *vma)
pos = (unsigned long)info->fix.smem_start + offset; pos = (unsigned long)info->fix.smem_start + offset;
pr_notice("mmap() framebuffer addr:%lu size:%lu\n", dev_dbg(info->dev, "mmap() framebuffer addr:%lu size:%lu\n",
pos, size); pos, size);
while (size > 0) { while (size > 0) {
page = vmalloc_to_pfn((void *)pos); page = vmalloc_to_pfn((void *)pos);
...@@ -505,8 +503,6 @@ static void dlfb_compress_hline( ...@@ -505,8 +503,6 @@ static void dlfb_compress_hline(
*command_buffer_ptr = cmd; *command_buffer_ptr = cmd;
*pixel_start_ptr = pixel; *pixel_start_ptr = pixel;
*device_address_ptr = dev_addr; *device_address_ptr = dev_addr;
return;
} }
/* /*
...@@ -515,13 +511,13 @@ static void dlfb_compress_hline( ...@@ -515,13 +511,13 @@ static void dlfb_compress_hline(
* (that we can only write to, slowly, and can never read), and (optionally) * (that we can only write to, slowly, and can never read), and (optionally)
* our shadow copy that tracks what's been sent to that hardware buffer. * our shadow copy that tracks what's been sent to that hardware buffer.
*/ */
static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr, static int dlfb_render_hline(struct dlfb_data *dlfb, struct urb **urb_ptr,
const char *front, char **urb_buf_ptr, const char *front, char **urb_buf_ptr,
u32 byte_offset, u32 byte_width, u32 byte_offset, u32 byte_width,
int *ident_ptr, int *sent_ptr) int *ident_ptr, int *sent_ptr)
{ {
const u8 *line_start, *line_end, *next_pixel; const u8 *line_start, *line_end, *next_pixel;
u32 dev_addr = dev->base16 + byte_offset; u32 dev_addr = dlfb->base16 + byte_offset;
struct urb *urb = *urb_ptr; struct urb *urb = *urb_ptr;
u8 *cmd = *urb_buf_ptr; u8 *cmd = *urb_buf_ptr;
u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length; u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length;
...@@ -530,9 +526,9 @@ static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr, ...@@ -530,9 +526,9 @@ static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr,
next_pixel = line_start; next_pixel = line_start;
line_end = next_pixel + byte_width; line_end = next_pixel + byte_width;
if (dev->backing_buffer) { if (dlfb->backing_buffer) {
int offset; int offset;
const u8 *back_start = (u8 *) (dev->backing_buffer const u8 *back_start = (u8 *) (dlfb->backing_buffer
+ byte_offset); + byte_offset);
*ident_ptr += dlfb_trim_hline(back_start, &next_pixel, *ident_ptr += dlfb_trim_hline(back_start, &next_pixel,
...@@ -556,10 +552,10 @@ static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr, ...@@ -556,10 +552,10 @@ static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr,
if (cmd >= cmd_end) { if (cmd >= cmd_end) {
int len = cmd - (u8 *) urb->transfer_buffer; int len = cmd - (u8 *) urb->transfer_buffer;
if (dlfb_submit_urb(dev, urb, len)) if (dlfb_submit_urb(dlfb, urb, len))
return 1; /* lost pixels is set */ return 1; /* lost pixels is set */
*sent_ptr += len; *sent_ptr += len;
urb = dlfb_get_urb(dev); urb = dlfb_get_urb(dlfb);
if (!urb) if (!urb)
return 1; /* lost_pixels is set */ return 1; /* lost_pixels is set */
*urb_ptr = urb; *urb_ptr = urb;
...@@ -573,7 +569,7 @@ static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr, ...@@ -573,7 +569,7 @@ static int dlfb_render_hline(struct dlfb_data *dev, struct urb **urb_ptr,
return 0; return 0;
} }
static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y, static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y,
int width, int height, char *data) int width, int height, char *data)
{ {
int i, ret; int i, ret;
...@@ -591,24 +587,24 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y, ...@@ -591,24 +587,24 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
x = aligned_x; x = aligned_x;
if ((width <= 0) || if ((width <= 0) ||
(x + width > dev->info->var.xres) || (x + width > dlfb->info->var.xres) ||
(y + height > dev->info->var.yres)) (y + height > dlfb->info->var.yres))
return -EINVAL; return -EINVAL;
if (!atomic_read(&dev->usb_active)) if (!atomic_read(&dlfb->usb_active))
return 0; return 0;
urb = dlfb_get_urb(dev); urb = dlfb_get_urb(dlfb);
if (!urb) if (!urb)
return 0; return 0;
cmd = urb->transfer_buffer; cmd = urb->transfer_buffer;
for (i = y; i < y + height ; i++) { for (i = y; i < y + height ; i++) {
const int line_offset = dev->info->fix.line_length * i; const int line_offset = dlfb->info->fix.line_length * i;
const int byte_offset = line_offset + (x * BPP); const int byte_offset = line_offset + (x * BPP);
if (dlfb_render_hline(dev, &urb, if (dlfb_render_hline(dlfb, &urb,
(char *) dev->info->fix.smem_start, (char *) dlfb->info->fix.smem_start,
&cmd, byte_offset, width * BPP, &cmd, byte_offset, width * BPP,
&bytes_identical, &bytes_sent)) &bytes_identical, &bytes_sent))
goto error; goto error;
...@@ -617,19 +613,19 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y, ...@@ -617,19 +613,19 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
if (cmd > (char *) urb->transfer_buffer) { if (cmd > (char *) urb->transfer_buffer) {
/* Send partial buffer remaining before exiting */ /* Send partial buffer remaining before exiting */
int len = cmd - (char *) urb->transfer_buffer; int len = cmd - (char *) urb->transfer_buffer;
ret = dlfb_submit_urb(dev, urb, len); ret = dlfb_submit_urb(dlfb, urb, len);
bytes_sent += len; bytes_sent += len;
} else } else
dlfb_urb_completion(urb); dlfb_urb_completion(urb);
error: error:
atomic_add(bytes_sent, &dev->bytes_sent); atomic_add(bytes_sent, &dlfb->bytes_sent);
atomic_add(bytes_identical, &dev->bytes_identical); atomic_add(bytes_identical, &dlfb->bytes_identical);
atomic_add(width*height*2, &dev->bytes_rendered); atomic_add(width*height*2, &dlfb->bytes_rendered);
end_cycles = get_cycles(); end_cycles = get_cycles();
atomic_add(((unsigned int) ((end_cycles - start_cycles) atomic_add(((unsigned int) ((end_cycles - start_cycles)
>> 10)), /* Kcycles */ >> 10)), /* Kcycles */
&dev->cpu_kcycles_used); &dlfb->cpu_kcycles_used);
return 0; return 0;
} }
...@@ -644,7 +640,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf, ...@@ -644,7 +640,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
ssize_t result; ssize_t result;
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
u32 offset = (u32) *ppos; u32 offset = (u32) *ppos;
result = fb_sys_write(info, buf, count, ppos); result = fb_sys_write(info, buf, count, ppos);
...@@ -654,7 +650,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf, ...@@ -654,7 +650,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf,
int lines = min((u32)((result / info->fix.line_length) + 1), int lines = min((u32)((result / info->fix.line_length) + 1),
(u32)info->var.yres); (u32)info->var.yres);
dlfb_handle_damage(dev, 0, start, info->var.xres, dlfb_handle_damage(dlfb, 0, start, info->var.xres,
lines, info->screen_base); lines, info->screen_base);
} }
...@@ -666,33 +662,33 @@ static void dlfb_ops_copyarea(struct fb_info *info, ...@@ -666,33 +662,33 @@ static void dlfb_ops_copyarea(struct fb_info *info,
const struct fb_copyarea *area) const struct fb_copyarea *area)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
sys_copyarea(info, area); sys_copyarea(info, area);
dlfb_handle_damage(dev, area->dx, area->dy, dlfb_handle_damage(dlfb, area->dx, area->dy,
area->width, area->height, info->screen_base); area->width, area->height, info->screen_base);
} }
static void dlfb_ops_imageblit(struct fb_info *info, static void dlfb_ops_imageblit(struct fb_info *info,
const struct fb_image *image) const struct fb_image *image)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
sys_imageblit(info, image); sys_imageblit(info, image);
dlfb_handle_damage(dev, image->dx, image->dy, dlfb_handle_damage(dlfb, image->dx, image->dy,
image->width, image->height, info->screen_base); image->width, image->height, info->screen_base);
} }
static void dlfb_ops_fillrect(struct fb_info *info, static void dlfb_ops_fillrect(struct fb_info *info,
const struct fb_fillrect *rect) const struct fb_fillrect *rect)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
sys_fillrect(info, rect); sys_fillrect(info, rect);
dlfb_handle_damage(dev, rect->dx, rect->dy, rect->width, dlfb_handle_damage(dlfb, rect->dx, rect->dy, rect->width,
rect->height, info->screen_base); rect->height, info->screen_base);
} }
...@@ -707,7 +703,7 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, ...@@ -707,7 +703,7 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
{ {
struct page *cur; struct page *cur;
struct fb_deferred_io *fbdefio = info->fbdefio; struct fb_deferred_io *fbdefio = info->fbdefio;
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
struct urb *urb; struct urb *urb;
char *cmd; char *cmd;
cycles_t start_cycles, end_cycles; cycles_t start_cycles, end_cycles;
...@@ -718,12 +714,12 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, ...@@ -718,12 +714,12 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
if (!fb_defio) if (!fb_defio)
return; return;
if (!atomic_read(&dev->usb_active)) if (!atomic_read(&dlfb->usb_active))
return; return;
start_cycles = get_cycles(); start_cycles = get_cycles();
urb = dlfb_get_urb(dev); urb = dlfb_get_urb(dlfb);
if (!urb) if (!urb)
return; return;
...@@ -732,7 +728,7 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, ...@@ -732,7 +728,7 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
/* walk the written page list and render each to device */ /* walk the written page list and render each to device */
list_for_each_entry(cur, &fbdefio->pagelist, lru) { list_for_each_entry(cur, &fbdefio->pagelist, lru) {
if (dlfb_render_hline(dev, &urb, (char *) info->fix.smem_start, if (dlfb_render_hline(dlfb, &urb, (char *) info->fix.smem_start,
&cmd, cur->index << PAGE_SHIFT, &cmd, cur->index << PAGE_SHIFT,
PAGE_SIZE, &bytes_identical, &bytes_sent)) PAGE_SIZE, &bytes_identical, &bytes_sent))
goto error; goto error;
...@@ -742,25 +738,24 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, ...@@ -742,25 +738,24 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
if (cmd > (char *) urb->transfer_buffer) { if (cmd > (char *) urb->transfer_buffer) {
/* Send partial buffer remaining before exiting */ /* Send partial buffer remaining before exiting */
int len = cmd - (char *) urb->transfer_buffer; int len = cmd - (char *) urb->transfer_buffer;
dlfb_submit_urb(dev, urb, len); dlfb_submit_urb(dlfb, urb, len);
bytes_sent += len; bytes_sent += len;
} else } else
dlfb_urb_completion(urb); dlfb_urb_completion(urb);
error: error:
atomic_add(bytes_sent, &dev->bytes_sent); atomic_add(bytes_sent, &dlfb->bytes_sent);
atomic_add(bytes_identical, &dev->bytes_identical); atomic_add(bytes_identical, &dlfb->bytes_identical);
atomic_add(bytes_rendered, &dev->bytes_rendered); atomic_add(bytes_rendered, &dlfb->bytes_rendered);
end_cycles = get_cycles(); end_cycles = get_cycles();
atomic_add(((unsigned int) ((end_cycles - start_cycles) atomic_add(((unsigned int) ((end_cycles - start_cycles)
>> 10)), /* Kcycles */ >> 10)), /* Kcycles */
&dev->cpu_kcycles_used); &dlfb->cpu_kcycles_used);
} }
static int dlfb_get_edid(struct dlfb_data *dev, char *edid, int len) static int dlfb_get_edid(struct dlfb_data *dlfb, char *edid, int len)
{ {
int i; int i, ret;
int ret;
char *rbuf; char *rbuf;
rbuf = kmalloc(2, GFP_KERNEL); rbuf = kmalloc(2, GFP_KERNEL);
...@@ -768,12 +763,13 @@ static int dlfb_get_edid(struct dlfb_data *dev, char *edid, int len) ...@@ -768,12 +763,13 @@ static int dlfb_get_edid(struct dlfb_data *dev, char *edid, int len)
return 0; return 0;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
ret = usb_control_msg(dev->udev, ret = usb_control_msg(dlfb->udev,
usb_rcvctrlpipe(dev->udev, 0), 0x02, usb_rcvctrlpipe(dlfb->udev, 0), 0x02,
(0x80 | (0x02 << 5)), i << 8, 0xA1, (0x80 | (0x02 << 5)), i << 8, 0xA1,
rbuf, 2, USB_CTRL_GET_TIMEOUT); rbuf, 2, USB_CTRL_GET_TIMEOUT);
if (ret < 2) { if (ret < 2) {
pr_err("Read EDID byte %d failed: %d\n", i, ret); dev_err(&dlfb->udev->dev,
"Read EDID byte %d failed: %d\n", i, ret);
i--; i--;
break; break;
} }
...@@ -789,15 +785,15 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd, ...@@ -789,15 +785,15 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
if (!atomic_read(&dev->usb_active)) if (!atomic_read(&dlfb->usb_active))
return 0; return 0;
/* TODO: Update X server to get this from sysfs instead */ /* TODO: Update X server to get this from sysfs instead */
if (cmd == DLFB_IOCTL_RETURN_EDID) { if (cmd == DLFB_IOCTL_RETURN_EDID) {
void __user *edid = (void __user *)arg; void __user *edid = (void __user *)arg;
if (copy_to_user(edid, dev->edid, dev->edid_size)) if (copy_to_user(edid, dlfb->edid, dlfb->edid_size))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -832,7 +828,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd, ...@@ -832,7 +828,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd,
if (area.y > info->var.yres) if (area.y > info->var.yres)
area.y = info->var.yres; area.y = info->var.yres;
dlfb_handle_damage(dev, area.x, area.y, area.w, area.h, dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h,
info->screen_base); info->screen_base);
} }
...@@ -873,7 +869,7 @@ dlfb_ops_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -873,7 +869,7 @@ dlfb_ops_setcolreg(unsigned regno, unsigned red, unsigned green,
*/ */
static int dlfb_ops_open(struct fb_info *info, int user) static int dlfb_ops_open(struct fb_info *info, int user)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
/* /*
* fbcon aggressively connects to first framebuffer it finds, * fbcon aggressively connects to first framebuffer it finds,
...@@ -884,12 +880,12 @@ static int dlfb_ops_open(struct fb_info *info, int user) ...@@ -884,12 +880,12 @@ static int dlfb_ops_open(struct fb_info *info, int user)
return -EBUSY; return -EBUSY;
/* If the USB device is gone, we don't accept new opens */ /* If the USB device is gone, we don't accept new opens */
if (dev->virtualized) if (dlfb->virtualized)
return -ENODEV; return -ENODEV;
dev->fb_count++; dlfb->fb_count++;
kref_get(&dev->kref); kref_get(&dlfb->kref);
if (fb_defio && (info->fbdefio == NULL)) { if (fb_defio && (info->fbdefio == NULL)) {
/* enable defio at last moment if not disabled by client */ /* enable defio at last moment if not disabled by client */
...@@ -907,8 +903,8 @@ static int dlfb_ops_open(struct fb_info *info, int user) ...@@ -907,8 +903,8 @@ static int dlfb_ops_open(struct fb_info *info, int user)
fb_deferred_io_init(info); fb_deferred_io_init(info);
} }
pr_notice("open /dev/fb%d user=%d fb_info=%p count=%d\n", dev_dbg(info->dev, "open, user=%d fb_info=%p count=%d\n",
info->node, user, info, dev->fb_count); user, info, dlfb->fb_count);
return 0; return 0;
} }
...@@ -920,15 +916,11 @@ static int dlfb_ops_open(struct fb_info *info, int user) ...@@ -920,15 +916,11 @@ static int dlfb_ops_open(struct fb_info *info, int user)
*/ */
static void dlfb_free(struct kref *kref) static void dlfb_free(struct kref *kref)
{ {
struct dlfb_data *dev = container_of(kref, struct dlfb_data, kref); struct dlfb_data *dlfb = container_of(kref, struct dlfb_data, kref);
vfree(dev->backing_buffer); vfree(dlfb->backing_buffer);
kfree(dlfb->edid);
kfree(dev->edid); kfree(dlfb);
pr_warn("freeing dlfb_data %p\n", dev);
kfree(dev);
} }
static void dlfb_release_urb_work(struct work_struct *work) static void dlfb_release_urb_work(struct work_struct *work)
...@@ -936,16 +928,14 @@ static void dlfb_release_urb_work(struct work_struct *work) ...@@ -936,16 +928,14 @@ static void dlfb_release_urb_work(struct work_struct *work)
struct urb_node *unode = container_of(work, struct urb_node, struct urb_node *unode = container_of(work, struct urb_node,
release_urb_work.work); release_urb_work.work);
up(&unode->dev->urbs.limit_sem); up(&unode->dlfb->urbs.limit_sem);
} }
static void dlfb_free_framebuffer(struct dlfb_data *dev) static void dlfb_free_framebuffer(struct dlfb_data *dlfb)
{ {
struct fb_info *info = dev->info; struct fb_info *info = dlfb->info;
if (info) { if (info) {
int node = info->node;
unregister_framebuffer(info); unregister_framebuffer(info);
if (info->cmap.len != 0) if (info->cmap.len != 0)
...@@ -956,48 +946,45 @@ static void dlfb_free_framebuffer(struct dlfb_data *dev) ...@@ -956,48 +946,45 @@ static void dlfb_free_framebuffer(struct dlfb_data *dev)
fb_destroy_modelist(&info->modelist); fb_destroy_modelist(&info->modelist);
dev->info = NULL; dlfb->info = NULL;
/* Assume info structure is freed after this point */ /* Assume info structure is freed after this point */
framebuffer_release(info); framebuffer_release(info);
pr_warn("fb_info for /dev/fb%d has been freed\n", node);
} }
/* ref taken in probe() as part of registering framebfufer */ /* ref taken in probe() as part of registering framebfufer */
kref_put(&dev->kref, dlfb_free); kref_put(&dlfb->kref, dlfb_free);
} }
static void dlfb_free_framebuffer_work(struct work_struct *work) static void dlfb_free_framebuffer_work(struct work_struct *work)
{ {
struct dlfb_data *dev = container_of(work, struct dlfb_data, struct dlfb_data *dlfb = container_of(work, struct dlfb_data,
free_framebuffer_work.work); free_framebuffer_work.work);
dlfb_free_framebuffer(dev); dlfb_free_framebuffer(dlfb);
} }
/* /*
* Assumes caller is holding info->lock mutex (for open and release at least) * Assumes caller is holding info->lock mutex (for open and release at least)
*/ */
static int dlfb_ops_release(struct fb_info *info, int user) static int dlfb_ops_release(struct fb_info *info, int user)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
dev->fb_count--; dlfb->fb_count--;
/* We can't free fb_info here - fbmem will touch it when we return */ /* We can't free fb_info here - fbmem will touch it when we return */
if (dev->virtualized && (dev->fb_count == 0)) if (dlfb->virtualized && (dlfb->fb_count == 0))
schedule_delayed_work(&dev->free_framebuffer_work, HZ); schedule_delayed_work(&dlfb->free_framebuffer_work, HZ);
if ((dev->fb_count == 0) && (info->fbdefio)) { if ((dlfb->fb_count == 0) && (info->fbdefio)) {
fb_deferred_io_cleanup(info); fb_deferred_io_cleanup(info);
kfree(info->fbdefio); kfree(info->fbdefio);
info->fbdefio = NULL; info->fbdefio = NULL;
info->fbops->fb_mmap = dlfb_ops_mmap; info->fbops->fb_mmap = dlfb_ops_mmap;
} }
pr_warn("released /dev/fb%d user=%d count=%d\n", dev_dbg(info->dev, "release, user=%d count=%d\n", user, dlfb->fb_count);
info->node, user, dev->fb_count);
kref_put(&dev->kref, dlfb_free); kref_put(&dlfb->kref, dlfb_free);
return 0; return 0;
} }
...@@ -1006,19 +993,10 @@ static int dlfb_ops_release(struct fb_info *info, int user) ...@@ -1006,19 +993,10 @@ static int dlfb_ops_release(struct fb_info *info, int user)
* Check whether a video mode is supported by the DisplayLink chip * Check whether a video mode is supported by the DisplayLink chip
* We start from monitor's modes, so don't need to filter that here * We start from monitor's modes, so don't need to filter that here
*/ */
static int dlfb_is_valid_mode(struct fb_videomode *mode, static int dlfb_is_valid_mode(struct fb_videomode *mode, struct dlfb_data *dlfb)
struct fb_info *info)
{ {
struct dlfb_data *dev = info->par; if (mode->xres * mode->yres > dlfb->sku_pixel_limit)
if (mode->xres * mode->yres > dev->sku_pixel_limit) {
pr_warn("%dx%d beyond chip capabilities\n",
mode->xres, mode->yres);
return 0; return 0;
}
pr_info("%dx%d @ %d Hz valid mode\n", mode->xres, mode->yres,
mode->refresh);
return 1; return 1;
} }
...@@ -1039,6 +1017,7 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var, ...@@ -1039,6 +1017,7 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
struct fb_videomode mode; struct fb_videomode mode;
struct dlfb_data *dlfb = info->par;
/* TODO: support dynamically changing framebuffer size */ /* TODO: support dynamically changing framebuffer size */
if ((var->xres * var->yres * 2) > info->fix.smem_len) if ((var->xres * var->yres * 2) > info->fix.smem_len)
...@@ -1049,7 +1028,7 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var, ...@@ -1049,7 +1028,7 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var,
fb_var_to_videomode(&mode, var); fb_var_to_videomode(&mode, var);
if (!dlfb_is_valid_mode(&mode, info)) if (!dlfb_is_valid_mode(&mode, dlfb))
return -EINVAL; return -EINVAL;
return 0; return 0;
...@@ -1057,16 +1036,14 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var, ...@@ -1057,16 +1036,14 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var,
static int dlfb_ops_set_par(struct fb_info *info) static int dlfb_ops_set_par(struct fb_info *info)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
int result; int result;
u16 *pix_framebuffer; u16 *pix_framebuffer;
int i; int i;
pr_notice("set_par mode %dx%d\n", info->var.xres, info->var.yres); result = dlfb_set_video_mode(dlfb, &info->var);
result = dlfb_set_video_mode(dev, &info->var); if ((result == 0) && (dlfb->fb_count == 0)) {
if ((result == 0) && (dev->fb_count == 0)) {
/* paint greenscreen */ /* paint greenscreen */
...@@ -1074,7 +1051,7 @@ static int dlfb_ops_set_par(struct fb_info *info) ...@@ -1074,7 +1051,7 @@ static int dlfb_ops_set_par(struct fb_info *info)
for (i = 0; i < info->fix.smem_len / 2; i++) for (i = 0; i < info->fix.smem_len / 2; i++)
pix_framebuffer[i] = 0x37e6; pix_framebuffer[i] = 0x37e6;
dlfb_handle_damage(dev, 0, 0, info->var.xres, info->var.yres, dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres,
info->screen_base); info->screen_base);
} }
...@@ -1101,21 +1078,21 @@ static char *dlfb_dummy_render(char *buf) ...@@ -1101,21 +1078,21 @@ static char *dlfb_dummy_render(char *buf)
*/ */
static int dlfb_ops_blank(int blank_mode, struct fb_info *info) static int dlfb_ops_blank(int blank_mode, struct fb_info *info)
{ {
struct dlfb_data *dev = info->par; struct dlfb_data *dlfb = info->par;
char *bufptr; char *bufptr;
struct urb *urb; struct urb *urb;
pr_debug("/dev/fb%d FB_BLANK mode %d --> %d\n", dev_dbg(info->dev, "blank, mode %d --> %d\n",
info->node, dev->blank_mode, blank_mode); dlfb->blank_mode, blank_mode);
if ((dev->blank_mode == FB_BLANK_POWERDOWN) && if ((dlfb->blank_mode == FB_BLANK_POWERDOWN) &&
(blank_mode != FB_BLANK_POWERDOWN)) { (blank_mode != FB_BLANK_POWERDOWN)) {
/* returning from powerdown requires a fresh modeset */ /* returning from powerdown requires a fresh modeset */
dlfb_set_video_mode(dev, &info->var); dlfb_set_video_mode(dlfb, &info->var);
} }
urb = dlfb_get_urb(dev); urb = dlfb_get_urb(dlfb);
if (!urb) if (!urb)
return 0; return 0;
...@@ -1127,10 +1104,10 @@ static int dlfb_ops_blank(int blank_mode, struct fb_info *info) ...@@ -1127,10 +1104,10 @@ static int dlfb_ops_blank(int blank_mode, struct fb_info *info)
/* seems like a render op is needed to have blank change take effect */ /* seems like a render op is needed to have blank change take effect */
bufptr = dlfb_dummy_render(bufptr); bufptr = dlfb_dummy_render(bufptr);
dlfb_submit_urb(dev, urb, bufptr - dlfb_submit_urb(dlfb, urb, bufptr -
(char *) urb->transfer_buffer); (char *) urb->transfer_buffer);
dev->blank_mode = blank_mode; dlfb->blank_mode = blank_mode;
return 0; return 0;
} }
...@@ -1157,7 +1134,7 @@ static struct fb_ops dlfb_ops = { ...@@ -1157,7 +1134,7 @@ static struct fb_ops dlfb_ops = {
* Assumes &info->lock held by caller * Assumes &info->lock held by caller
* Assumes no active clients have framebuffer open * Assumes no active clients have framebuffer open
*/ */
static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info) static int dlfb_realloc_framebuffer(struct dlfb_data *dlfb, struct fb_info *info)
{ {
int retval = -ENOMEM; int retval = -ENOMEM;
int old_len = info->fix.smem_len; int old_len = info->fix.smem_len;
...@@ -1166,8 +1143,6 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info) ...@@ -1166,8 +1143,6 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info)
unsigned char *new_fb; unsigned char *new_fb;
unsigned char *new_back = NULL; unsigned char *new_back = NULL;
pr_warn("Reallocating framebuffer. Addresses will change!\n");
new_len = info->fix.line_length * info->var.yres; new_len = info->fix.line_length * info->var.yres;
if (PAGE_ALIGN(new_len) > old_len) { if (PAGE_ALIGN(new_len) > old_len) {
...@@ -1176,7 +1151,7 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info) ...@@ -1176,7 +1151,7 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info)
*/ */
new_fb = vmalloc(new_len); new_fb = vmalloc(new_len);
if (!new_fb) { if (!new_fb) {
pr_err("Virtual framebuffer alloc failed\n"); dev_err(info->dev, "Virtual framebuffer alloc failed\n");
goto error; goto error;
} }
...@@ -1199,10 +1174,11 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info) ...@@ -1199,10 +1174,11 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info)
if (shadow) if (shadow)
new_back = vzalloc(new_len); new_back = vzalloc(new_len);
if (!new_back) if (!new_back)
pr_info("No shadow/backing buffer allocated\n"); dev_info(info->dev,
"No shadow/backing buffer allocated\n");
else { else {
vfree(dev->backing_buffer); vfree(dlfb->backing_buffer);
dev->backing_buffer = new_back; dlfb->backing_buffer = new_back;
} }
} }
...@@ -1226,18 +1202,22 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info) ...@@ -1226,18 +1202,22 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info)
* monspecs is NULL, and fb_var_screeninfo is set to safe VESA mode * monspecs is NULL, and fb_var_screeninfo is set to safe VESA mode
* Returns 0 if successful * Returns 0 if successful
*/ */
static int dlfb_setup_modes(struct dlfb_data *dev, static int dlfb_setup_modes(struct dlfb_data *dlfb,
struct fb_info *info, struct fb_info *info,
char *default_edid, size_t default_edid_size) char *default_edid, size_t default_edid_size)
{ {
int i;
const struct fb_videomode *default_vmode = NULL;
int result = 0;
char *edid; char *edid;
int tries = 3; int i, result = 0, tries = 3;
struct device *dev = info->device;
struct fb_videomode *mode;
const struct fb_videomode *default_vmode = NULL;
if (info->dev) /* only use mutex if info has been registered */ if (info->dev) {
/* only use mutex if info has been registered */
mutex_lock(&info->lock); mutex_lock(&info->lock);
/* parent device is used otherwise */
dev = info->dev;
}
edid = kmalloc(EDID_LENGTH, GFP_KERNEL); edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (!edid) { if (!edid) {
...@@ -1255,27 +1235,26 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1255,27 +1235,26 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
*/ */
while (tries--) { while (tries--) {
i = dlfb_get_edid(dev, edid, EDID_LENGTH); i = dlfb_get_edid(dlfb, edid, EDID_LENGTH);
if (i >= EDID_LENGTH) if (i >= EDID_LENGTH)
fb_edid_to_monspecs(edid, &info->monspecs); fb_edid_to_monspecs(edid, &info->monspecs);
if (info->monspecs.modedb_len > 0) { if (info->monspecs.modedb_len > 0) {
dev->edid = edid; dlfb->edid = edid;
dev->edid_size = i; dlfb->edid_size = i;
break; break;
} }
} }
/* If that fails, use a previously returned EDID if available */ /* If that fails, use a previously returned EDID if available */
if (info->monspecs.modedb_len == 0) { if (info->monspecs.modedb_len == 0) {
dev_err(dev, "Unable to get valid EDID from device/display\n");
pr_err("Unable to get valid EDID from device/display\n"); if (dlfb->edid) {
fb_edid_to_monspecs(dlfb->edid, &info->monspecs);
if (dev->edid) {
fb_edid_to_monspecs(dev->edid, &info->monspecs);
if (info->monspecs.modedb_len > 0) if (info->monspecs.modedb_len > 0)
pr_err("Using previously queried EDID\n"); dev_err(dev, "Using previously queried EDID\n");
} }
} }
...@@ -1285,9 +1264,9 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1285,9 +1264,9 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
fb_edid_to_monspecs(default_edid, &info->monspecs); fb_edid_to_monspecs(default_edid, &info->monspecs);
if (info->monspecs.modedb_len > 0) { if (info->monspecs.modedb_len > 0) {
memcpy(edid, default_edid, default_edid_size); memcpy(edid, default_edid, default_edid_size);
dev->edid = edid; dlfb->edid = edid;
dev->edid_size = default_edid_size; dlfb->edid_size = default_edid_size;
pr_err("Using default/backup EDID\n"); dev_err(dev, "Using default/backup EDID\n");
} }
} }
} }
...@@ -1296,10 +1275,12 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1296,10 +1275,12 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
if (info->monspecs.modedb_len > 0) { if (info->monspecs.modedb_len > 0) {
for (i = 0; i < info->monspecs.modedb_len; i++) { for (i = 0; i < info->monspecs.modedb_len; i++) {
if (dlfb_is_valid_mode(&info->monspecs.modedb[i], info)) mode = &info->monspecs.modedb[i];
fb_add_videomode(&info->monspecs.modedb[i], if (dlfb_is_valid_mode(mode, dlfb)) {
&info->modelist); fb_add_videomode(mode, &info->modelist);
else { } else {
dev_dbg(dev, "Specified mode %dx%d too big\n",
mode->xres, mode->yres);
if (i == 0) if (i == 0)
/* if we've removed top/best mode */ /* if we've removed top/best mode */
info->monspecs.misc info->monspecs.misc
...@@ -1323,10 +1304,12 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1323,10 +1304,12 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
* But at least the user has a chance to choose * But at least the user has a chance to choose
*/ */
for (i = 0; i < VESA_MODEDB_SIZE; i++) { for (i = 0; i < VESA_MODEDB_SIZE; i++) {
if (dlfb_is_valid_mode((struct fb_videomode *) mode = (struct fb_videomode *)&vesa_modes[i];
&vesa_modes[i], info)) if (dlfb_is_valid_mode(mode, dlfb))
fb_add_videomode(&vesa_modes[i], fb_add_videomode(mode, &info->modelist);
&info->modelist); else
dev_dbg(dev, "VESA mode %dx%d too big\n",
mode->xres, mode->yres);
} }
/* /*
...@@ -1341,7 +1324,7 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1341,7 +1324,7 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
} }
/* If we have good mode and no active clients*/ /* If we have good mode and no active clients*/
if ((default_vmode != NULL) && (dev->fb_count == 0)) { if ((default_vmode != NULL) && (dlfb->fb_count == 0)) {
fb_videomode_to_var(&info->var, default_vmode); fb_videomode_to_var(&info->var, default_vmode);
dlfb_var_color_format(&info->var); dlfb_var_color_format(&info->var);
...@@ -1353,13 +1336,13 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1353,13 +1336,13 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
info->fix.line_length = info->var.xres * info->fix.line_length = info->var.xres *
(info->var.bits_per_pixel / 8); (info->var.bits_per_pixel / 8);
result = dlfb_realloc_framebuffer(dev, info); result = dlfb_realloc_framebuffer(dlfb, info);
} else } else
result = -EINVAL; result = -EINVAL;
error: error:
if (edid && (dev->edid != edid)) if (edid && (dlfb->edid != edid))
kfree(edid); kfree(edid);
if (info->dev) if (info->dev)
...@@ -1371,33 +1354,33 @@ static int dlfb_setup_modes(struct dlfb_data *dev, ...@@ -1371,33 +1354,33 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
static ssize_t metrics_bytes_rendered_show(struct device *fbdev, static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
struct device_attribute *a, char *buf) { struct device_attribute *a, char *buf) {
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n", return snprintf(buf, PAGE_SIZE, "%u\n",
atomic_read(&dev->bytes_rendered)); atomic_read(&dlfb->bytes_rendered));
} }
static ssize_t metrics_bytes_identical_show(struct device *fbdev, static ssize_t metrics_bytes_identical_show(struct device *fbdev,
struct device_attribute *a, char *buf) { struct device_attribute *a, char *buf) {
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n", return snprintf(buf, PAGE_SIZE, "%u\n",
atomic_read(&dev->bytes_identical)); atomic_read(&dlfb->bytes_identical));
} }
static ssize_t metrics_bytes_sent_show(struct device *fbdev, static ssize_t metrics_bytes_sent_show(struct device *fbdev,
struct device_attribute *a, char *buf) { struct device_attribute *a, char *buf) {
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n", return snprintf(buf, PAGE_SIZE, "%u\n",
atomic_read(&dev->bytes_sent)); atomic_read(&dlfb->bytes_sent));
} }
static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
struct device_attribute *a, char *buf) { struct device_attribute *a, char *buf) {
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n", return snprintf(buf, PAGE_SIZE, "%u\n",
atomic_read(&dev->cpu_kcycles_used)); atomic_read(&dlfb->cpu_kcycles_used));
} }
static ssize_t edid_show( static ssize_t edid_show(
...@@ -1406,21 +1389,18 @@ static ssize_t edid_show( ...@@ -1406,21 +1389,18 @@ static ssize_t edid_show(
char *buf, loff_t off, size_t count) { char *buf, loff_t off, size_t count) {
struct device *fbdev = container_of(kobj, struct device, kobj); struct device *fbdev = container_of(kobj, struct device, kobj);
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
if (dev->edid == NULL) if (dlfb->edid == NULL)
return 0; return 0;
if ((off >= dev->edid_size) || (count > dev->edid_size)) if ((off >= dlfb->edid_size) || (count > dlfb->edid_size))
return 0; return 0;
if (off + count > dev->edid_size) if (off + count > dlfb->edid_size)
count = dev->edid_size - off; count = dlfb->edid_size - off;
pr_info("sysfs edid copy %p to %p, %d bytes\n",
dev->edid, buf, (int) count);
memcpy(buf, dev->edid, count); memcpy(buf, dlfb->edid, count);
return count; return count;
} }
...@@ -1431,21 +1411,20 @@ static ssize_t edid_store( ...@@ -1431,21 +1411,20 @@ static ssize_t edid_store(
char *src, loff_t src_off, size_t src_size) { char *src, loff_t src_off, size_t src_size) {
struct device *fbdev = container_of(kobj, struct device, kobj); struct device *fbdev = container_of(kobj, struct device, kobj);
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
int ret; int ret;
/* We only support write of entire EDID at once, no offset*/ /* We only support write of entire EDID at once, no offset*/
if ((src_size != EDID_LENGTH) || (src_off != 0)) if ((src_size != EDID_LENGTH) || (src_off != 0))
return -EINVAL; return -EINVAL;
ret = dlfb_setup_modes(dev, fb_info, src, src_size); ret = dlfb_setup_modes(dlfb, fb_info, src, src_size);
if (ret) if (ret)
return ret; return ret;
if (!dev->edid || memcmp(src, dev->edid, src_size)) if (!dlfb->edid || memcmp(src, dlfb->edid, src_size))
return -EINVAL; return -EINVAL;
pr_info("sysfs written EDID is new default\n");
dlfb_ops_set_par(fb_info); dlfb_ops_set_par(fb_info);
return src_size; return src_size;
} }
...@@ -1455,12 +1434,12 @@ static ssize_t metrics_reset_store(struct device *fbdev, ...@@ -1455,12 +1434,12 @@ static ssize_t metrics_reset_store(struct device *fbdev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct fb_info *fb_info = dev_get_drvdata(fbdev); struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par; struct dlfb_data *dlfb = fb_info->par;
atomic_set(&dev->bytes_rendered, 0); atomic_set(&dlfb->bytes_rendered, 0);
atomic_set(&dev->bytes_identical, 0); atomic_set(&dlfb->bytes_identical, 0);
atomic_set(&dev->bytes_sent, 0); atomic_set(&dlfb->bytes_sent, 0);
atomic_set(&dev->cpu_kcycles_used, 0); atomic_set(&dlfb->cpu_kcycles_used, 0);
return count; return count;
} }
...@@ -1473,7 +1452,7 @@ static const struct bin_attribute edid_attr = { ...@@ -1473,7 +1452,7 @@ static const struct bin_attribute edid_attr = {
.write = edid_store .write = edid_store
}; };
static struct device_attribute fb_device_attrs[] = { static const struct device_attribute fb_device_attrs[] = {
__ATTR_RO(metrics_bytes_rendered), __ATTR_RO(metrics_bytes_rendered),
__ATTR_RO(metrics_bytes_identical), __ATTR_RO(metrics_bytes_identical),
__ATTR_RO(metrics_bytes_sent), __ATTR_RO(metrics_bytes_sent),
...@@ -1484,7 +1463,7 @@ static struct device_attribute fb_device_attrs[] = { ...@@ -1484,7 +1463,7 @@ static struct device_attribute fb_device_attrs[] = {
/* /*
* This is necessary before we can communicate with the display controller. * This is necessary before we can communicate with the display controller.
*/ */
static int dlfb_select_std_channel(struct dlfb_data *dev) static int dlfb_select_std_channel(struct dlfb_data *dlfb)
{ {
int ret; int ret;
void *buf; void *buf;
...@@ -1499,7 +1478,7 @@ static int dlfb_select_std_channel(struct dlfb_data *dev) ...@@ -1499,7 +1478,7 @@ static int dlfb_select_std_channel(struct dlfb_data *dev)
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), ret = usb_control_msg(dlfb->udev, usb_sndctrlpipe(dlfb->udev, 0),
NR_USB_REQUEST_CHANNEL, NR_USB_REQUEST_CHANNEL,
(USB_DIR_OUT | USB_TYPE_VENDOR), 0, 0, (USB_DIR_OUT | USB_TYPE_VENDOR), 0, 0,
buf, sizeof(set_def_chn), USB_CTRL_SET_TIMEOUT); buf, sizeof(set_def_chn), USB_CTRL_SET_TIMEOUT);
...@@ -1509,8 +1488,8 @@ static int dlfb_select_std_channel(struct dlfb_data *dev) ...@@ -1509,8 +1488,8 @@ static int dlfb_select_std_channel(struct dlfb_data *dev)
return ret; return ret;
} }
static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev, static int dlfb_parse_vendor_descriptor(struct dlfb_data *dlfb,
struct usb_interface *interface) struct usb_interface *intf)
{ {
char *desc; char *desc;
char *buf; char *buf;
...@@ -1522,20 +1501,21 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev, ...@@ -1522,20 +1501,21 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev,
return false; return false;
desc = buf; desc = buf;
total_len = usb_get_descriptor(interface_to_usbdev(interface), total_len = usb_get_descriptor(interface_to_usbdev(intf),
0x5f, /* vendor specific */ 0x5f, /* vendor specific */
0, desc, MAX_VENDOR_DESCRIPTOR_SIZE); 0, desc, MAX_VENDOR_DESCRIPTOR_SIZE);
/* if not found, look in configuration descriptor */ /* if not found, look in configuration descriptor */
if (total_len < 0) { if (total_len < 0) {
if (0 == usb_get_extra_descriptor(interface->cur_altsetting, if (0 == usb_get_extra_descriptor(intf->cur_altsetting,
0x5f, &desc)) 0x5f, &desc))
total_len = (int) desc[0]; total_len = (int) desc[0];
} }
if (total_len > 5) { if (total_len > 5) {
pr_info("vendor descriptor length:%x data:%11ph\n", total_len, dev_info(&intf->dev,
desc); "vendor descriptor length: %d data: %11ph\n",
total_len, desc);
if ((desc[0] != total_len) || /* descriptor length */ if ((desc[0] != total_len) || /* descriptor length */
(desc[1] != 0x5f) || /* vendor descriptor type */ (desc[1] != 0x5f) || /* vendor descriptor type */
...@@ -1560,9 +1540,10 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev, ...@@ -1560,9 +1540,10 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev,
case 0x0200: { /* max_area */ case 0x0200: { /* max_area */
u32 max_area; u32 max_area;
max_area = le32_to_cpu(*((u32 *)desc)); max_area = le32_to_cpu(*((u32 *)desc));
pr_warn("DL chip limited to %d pixel modes\n", dev_warn(&intf->dev,
max_area); "DL chip limited to %d pixel modes\n",
dev->sku_pixel_limit = max_area; max_area);
dlfb->sku_pixel_limit = max_area;
break; break;
} }
default: default:
...@@ -1571,14 +1552,15 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev, ...@@ -1571,14 +1552,15 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev,
desc += length; desc += length;
} }
} else { } else {
pr_info("vendor descriptor not available (%d)\n", total_len); dev_info(&intf->dev, "vendor descriptor not available (%d)\n",
total_len);
} }
goto success; goto success;
unrecognized: unrecognized:
/* allow udlfb to load for now even if firmware unrecognized */ /* allow udlfb to load for now even if firmware unrecognized */
pr_err("Unrecognized vendor firmware descriptor\n"); dev_err(&intf->dev, "Unrecognized vendor firmware descriptor\n");
success: success:
kfree(buf); kfree(buf);
...@@ -1587,75 +1569,66 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev, ...@@ -1587,75 +1569,66 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev,
static void dlfb_init_framebuffer_work(struct work_struct *work); static void dlfb_init_framebuffer_work(struct work_struct *work);
static int dlfb_usb_probe(struct usb_interface *interface, static int dlfb_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct usb_device *usbdev; struct dlfb_data *dlfb;
struct dlfb_data *dev;
int retval = -ENOMEM; int retval = -ENOMEM;
struct usb_device *usbdev = interface_to_usbdev(intf);
/* usb initialization */ /* usb initialization */
dlfb = kzalloc(sizeof(*dlfb), GFP_KERNEL);
usbdev = interface_to_usbdev(interface); if (!dlfb) {
dev_err(&intf->dev, "%s: failed to allocate dlfb\n", __func__);
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
dev_err(&interface->dev, "dlfb_usb_probe: failed alloc of dev struct\n");
goto error; goto error;
} }
kref_init(&dev->kref); /* matching kref_put in usb .disconnect fn */ kref_init(&dlfb->kref); /* matching kref_put in usb .disconnect fn */
dev->udev = usbdev; dlfb->udev = usbdev;
dev->gdev = &usbdev->dev; /* our generic struct device * */ usb_set_intfdata(intf, dlfb);
usb_set_intfdata(interface, dev);
pr_info("%s %s - serial #%s\n", dev_dbg(&intf->dev, "console enable=%d\n", console);
usbdev->manufacturer, usbdev->product, usbdev->serial); dev_dbg(&intf->dev, "fb_defio enable=%d\n", fb_defio);
pr_info("vid_%04x&pid_%04x&rev_%04x driver's dlfb_data struct at %p\n", dev_dbg(&intf->dev, "shadow enable=%d\n", shadow);
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);
dev->sku_pixel_limit = 2048 * 1152; /* default to maximum */ dlfb->sku_pixel_limit = 2048 * 1152; /* default to maximum */
if (!dlfb_parse_vendor_descriptor(dev, interface)) { if (!dlfb_parse_vendor_descriptor(dlfb, intf)) {
pr_err("firmware not recognized. Assume incompatible device\n"); dev_err(&intf->dev,
"firmware not recognized, incompatible device?\n");
goto error; goto error;
} }
if (pixel_limit) { if (pixel_limit) {
pr_warn("DL chip limit of %d overridden" dev_warn(&intf->dev,
" by module param to %d\n", "DL chip limit of %d overridden to %d\n",
dev->sku_pixel_limit, pixel_limit); dlfb->sku_pixel_limit, pixel_limit);
dev->sku_pixel_limit = pixel_limit; dlfb->sku_pixel_limit = pixel_limit;
} }
if (!dlfb_alloc_urb_list(dev, WRITES_IN_FLIGHT, MAX_TRANSFER)) { if (!dlfb_alloc_urb_list(dlfb, WRITES_IN_FLIGHT, MAX_TRANSFER)) {
retval = -ENOMEM; retval = -ENOMEM;
pr_err("dlfb_alloc_urb_list failed\n"); dev_err(&intf->dev, "unable to allocate urb list\n");
goto error; goto error;
} }
kref_get(&dev->kref); /* matching kref_put in free_framebuffer_work */ kref_get(&dlfb->kref); /* matching kref_put in free_framebuffer_work */
/* We don't register a new USB class. Our client interface is fbdev */ /* We don't register a new USB class. Our client interface is dlfbev */
/* Workitem keep things fast & simple during USB enumeration */ /* Workitem keep things fast & simple during USB enumeration */
INIT_DELAYED_WORK(&dev->init_framebuffer_work, INIT_DELAYED_WORK(&dlfb->init_framebuffer_work,
dlfb_init_framebuffer_work); dlfb_init_framebuffer_work);
schedule_delayed_work(&dev->init_framebuffer_work, 0); schedule_delayed_work(&dlfb->init_framebuffer_work, 0);
return 0; return 0;
error: error:
if (dev) { if (dlfb) {
kref_put(&dev->kref, dlfb_free); /* last ref from kref_init */ kref_put(&dlfb->kref, dlfb_free); /* last ref from kref_init */
/* dev has been deallocated. Do not dereference */ /* dev has been deallocated. Do not dereference */
} }
...@@ -1665,97 +1638,101 @@ static int dlfb_usb_probe(struct usb_interface *interface, ...@@ -1665,97 +1638,101 @@ static int dlfb_usb_probe(struct usb_interface *interface,
static void dlfb_init_framebuffer_work(struct work_struct *work) static void dlfb_init_framebuffer_work(struct work_struct *work)
{ {
struct dlfb_data *dev = container_of(work, struct dlfb_data, int i, retval;
init_framebuffer_work.work);
struct fb_info *info; struct fb_info *info;
int retval; const struct device_attribute *attr;
int i; struct dlfb_data *dlfb = container_of(work, struct dlfb_data,
init_framebuffer_work.work);
/* allocates framebuffer driver structure, not framebuffer memory */ /* allocates framebuffer driver structure, not framebuffer memory */
info = framebuffer_alloc(0, dev->gdev); info = framebuffer_alloc(0, &dlfb->udev->dev);
if (!info) { if (!info) {
pr_err("framebuffer_alloc failed\n"); dev_err(&dlfb->udev->dev, "framebuffer_alloc failed\n");
goto error; goto error;
} }
dev->info = info; dlfb->info = info;
info->par = dev; info->par = dlfb;
info->pseudo_palette = dev->pseudo_palette; info->pseudo_palette = dlfb->pseudo_palette;
info->fbops = &dlfb_ops; info->fbops = &dlfb_ops;
retval = fb_alloc_cmap(&info->cmap, 256, 0); retval = fb_alloc_cmap(&info->cmap, 256, 0);
if (retval < 0) { if (retval < 0) {
pr_err("fb_alloc_cmap failed %x\n", retval); dev_err(info->device, "cmap allocation failed: %d\n", retval);
goto error; goto error;
} }
INIT_DELAYED_WORK(&dev->free_framebuffer_work, INIT_DELAYED_WORK(&dlfb->free_framebuffer_work,
dlfb_free_framebuffer_work); dlfb_free_framebuffer_work);
INIT_LIST_HEAD(&info->modelist); INIT_LIST_HEAD(&info->modelist);
retval = dlfb_setup_modes(dev, info, NULL, 0); retval = dlfb_setup_modes(dlfb, info, NULL, 0);
if (retval != 0) { if (retval != 0) {
pr_err("unable to find common mode for display and adapter\n"); dev_err(info->device,
"unable to find common mode for display and adapter\n");
goto error; goto error;
} }
/* ready to begin using device */ /* ready to begin using device */
atomic_set(&dev->usb_active, 1); atomic_set(&dlfb->usb_active, 1);
dlfb_select_std_channel(dev); dlfb_select_std_channel(dlfb);
dlfb_ops_check_var(&info->var, info); dlfb_ops_check_var(&info->var, info);
dlfb_ops_set_par(info); dlfb_ops_set_par(info);
retval = register_framebuffer(info); retval = register_framebuffer(info);
if (retval < 0) { if (retval < 0) {
pr_err("register_framebuffer failed %d\n", retval); dev_err(info->device, "unable to register framebuffer: %d\n",
retval);
goto error; goto error;
} }
for (i = 0; i < ARRAY_SIZE(fb_device_attrs); i++) { for (i = 0; i < ARRAY_SIZE(fb_device_attrs); i++) {
retval = device_create_file(info->dev, &fb_device_attrs[i]); attr = &fb_device_attrs[i];
if (retval) { retval = device_create_file(info->dev, attr);
pr_warn("device_create_file failed %d\n", retval); if (retval)
} dev_warn(info->device,
"failed to create '%s' attribute: %d\n",
attr->attr.name, retval);
} }
retval = device_create_bin_file(info->dev, &edid_attr); retval = device_create_bin_file(info->dev, &edid_attr);
if (retval) { if (retval)
pr_warn("device_create_bin_file failed %d\n", retval); dev_warn(info->device, "failed to create '%s' attribute: %d\n",
} edid_attr.attr.name, retval);
pr_info("DisplayLink USB device /dev/fb%d attached. %dx%d resolution." dev_info(info->device,
" Using %dK framebuffer memory\n", info->node, "%s is DisplayLink USB device (%dx%d, %dK framebuffer memory)\n",
info->var.xres, info->var.yres, dev_name(info->dev), info->var.xres, info->var.yres,
((dev->backing_buffer) ? ((dlfb->backing_buffer) ?
info->fix.smem_len * 2 : info->fix.smem_len) >> 10); info->fix.smem_len * 2 : info->fix.smem_len) >> 10);
return; return;
error: error:
dlfb_free_framebuffer(dev); dlfb_free_framebuffer(dlfb);
} }
static void dlfb_usb_disconnect(struct usb_interface *interface) static void dlfb_usb_disconnect(struct usb_interface *intf)
{ {
struct dlfb_data *dev; struct dlfb_data *dlfb;
struct fb_info *info; struct fb_info *info;
int i; int i;
dev = usb_get_intfdata(interface); dlfb = usb_get_intfdata(intf);
info = dev->info; info = dlfb->info;
pr_info("USB disconnect starting\n"); dev_dbg(&intf->dev, "USB disconnect starting\n");
/* we virtualize until all fb clients release. Then we free */ /* we virtualize until all fb clients release. Then we free */
dev->virtualized = true; dlfb->virtualized = true;
/* When non-active we'll update virtual framebuffer, but no new urbs */ /* When non-active we'll update virtual framebuffer, but no new urbs */
atomic_set(&dev->usb_active, 0); atomic_set(&dlfb->usb_active, 0);
/* this function will wait for all in-flight urbs to complete */ /* this function will wait for all in-flight urbs to complete */
dlfb_free_urb_list(dev); dlfb_free_urb_list(dlfb);
if (info) { if (info) {
/* remove udlfb's sysfs interfaces */ /* remove udlfb's sysfs interfaces */
...@@ -1765,20 +1742,17 @@ static void dlfb_usb_disconnect(struct usb_interface *interface) ...@@ -1765,20 +1742,17 @@ static void dlfb_usb_disconnect(struct usb_interface *interface)
unlink_framebuffer(info); unlink_framebuffer(info);
} }
usb_set_intfdata(interface, NULL); usb_set_intfdata(intf, NULL);
dev->udev = NULL; dlfb->udev = NULL;
dev->gdev = NULL;
/* if clients still have us open, will be freed on last close */ /* if clients still have us open, will be freed on last close */
if (dev->fb_count == 0) if (dlfb->fb_count == 0)
schedule_delayed_work(&dev->free_framebuffer_work, 0); schedule_delayed_work(&dlfb->free_framebuffer_work, 0);
/* release reference taken by kref_init in probe() */ /* release reference taken by kref_init in probe() */
kref_put(&dev->kref, dlfb_free); kref_put(&dlfb->kref, dlfb_free);
/* consider dlfb_data freed */ /* consider dlfb_data freed */
return;
} }
static struct usb_driver dlfb_driver = { static struct usb_driver dlfb_driver = {
...@@ -1793,26 +1767,32 @@ module_usb_driver(dlfb_driver); ...@@ -1793,26 +1767,32 @@ module_usb_driver(dlfb_driver);
static void dlfb_urb_completion(struct urb *urb) static void dlfb_urb_completion(struct urb *urb)
{ {
struct urb_node *unode = urb->context; struct urb_node *unode = urb->context;
struct dlfb_data *dev = unode->dev; struct dlfb_data *dlfb = unode->dlfb;
unsigned long flags; unsigned long flags;
/* sync/async unlink faults aren't errors */ switch (urb->status) {
if (urb->status) { case 0:
if (!(urb->status == -ENOENT || /* success */
urb->status == -ECONNRESET || break;
urb->status == -ESHUTDOWN)) { case -ECONNRESET:
pr_err("%s - nonzero write bulk status received: %d\n", case -ENOENT:
__func__, urb->status); case -ESHUTDOWN:
atomic_set(&dev->lost_pixels, 1); /* sync/async unlink faults aren't errors */
} break;
default:
dev_err(&dlfb->udev->dev,
"%s - nonzero write bulk status received: %d\n",
__func__, urb->status);
atomic_set(&dlfb->lost_pixels, 1);
break;
} }
urb->transfer_buffer_length = dev->urbs.size; /* reset to actual */ urb->transfer_buffer_length = dlfb->urbs.size; /* reset to actual */
spin_lock_irqsave(&dev->urbs.lock, flags); spin_lock_irqsave(&dlfb->urbs.lock, flags);
list_add_tail(&unode->entry, &dev->urbs.list); list_add_tail(&unode->entry, &dlfb->urbs.list);
dev->urbs.available++; dlfb->urbs.available++;
spin_unlock_irqrestore(&dev->urbs.lock, flags); spin_unlock_irqrestore(&dlfb->urbs.lock, flags);
/* /*
* When using fb_defio, we deadlock if up() is called * When using fb_defio, we deadlock if up() is called
...@@ -1821,65 +1801,63 @@ static void dlfb_urb_completion(struct urb *urb) ...@@ -1821,65 +1801,63 @@ static void dlfb_urb_completion(struct urb *urb)
if (fb_defio) if (fb_defio)
schedule_delayed_work(&unode->release_urb_work, 0); schedule_delayed_work(&unode->release_urb_work, 0);
else else
up(&dev->urbs.limit_sem); up(&dlfb->urbs.limit_sem);
} }
static void dlfb_free_urb_list(struct dlfb_data *dev) static void dlfb_free_urb_list(struct dlfb_data *dlfb)
{ {
int count = dev->urbs.count; int count = dlfb->urbs.count;
struct list_head *node; struct list_head *node;
struct urb_node *unode; struct urb_node *unode;
struct urb *urb; struct urb *urb;
int ret; int ret;
unsigned long flags; unsigned long flags;
pr_notice("Freeing all render urbs\n");
/* keep waiting and freeing, until we've got 'em all */ /* keep waiting and freeing, until we've got 'em all */
while (count--) { while (count--) {
/* Getting interrupted means a leak, but ok at disconnect */ /* Getting interrupted means a leak, but ok at disconnect */
ret = down_interruptible(&dev->urbs.limit_sem); ret = down_interruptible(&dlfb->urbs.limit_sem);
if (ret) if (ret)
break; break;
spin_lock_irqsave(&dev->urbs.lock, flags); spin_lock_irqsave(&dlfb->urbs.lock, flags);
node = dev->urbs.list.next; /* have reserved one with sem */ node = dlfb->urbs.list.next; /* have reserved one with sem */
list_del_init(node); list_del_init(node);
spin_unlock_irqrestore(&dev->urbs.lock, flags); spin_unlock_irqrestore(&dlfb->urbs.lock, flags);
unode = list_entry(node, struct urb_node, entry); unode = list_entry(node, struct urb_node, entry);
urb = unode->urb; urb = unode->urb;
/* Free each separately allocated piece */ /* Free each separately allocated piece */
usb_free_coherent(urb->dev, dev->urbs.size, usb_free_coherent(urb->dev, dlfb->urbs.size,
urb->transfer_buffer, urb->transfer_dma); urb->transfer_buffer, urb->transfer_dma);
usb_free_urb(urb); usb_free_urb(urb);
kfree(node); kfree(node);
} }
dev->urbs.count = 0; dlfb->urbs.count = 0;
} }
static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size) static int dlfb_alloc_urb_list(struct dlfb_data *dlfb, int count, size_t size)
{ {
int i = 0; int i = 0;
struct urb *urb; struct urb *urb;
struct urb_node *unode; struct urb_node *unode;
char *buf; char *buf;
spin_lock_init(&dev->urbs.lock); spin_lock_init(&dlfb->urbs.lock);
dev->urbs.size = size; dlfb->urbs.size = size;
INIT_LIST_HEAD(&dev->urbs.list); INIT_LIST_HEAD(&dlfb->urbs.list);
while (i < count) { while (i < count) {
unode = kzalloc(sizeof(struct urb_node), GFP_KERNEL); unode = kzalloc(sizeof(*unode), GFP_KERNEL);
if (!unode) if (!unode)
break; break;
unode->dev = dev; unode->dlfb = dlfb;
INIT_DELAYED_WORK(&unode->release_urb_work, INIT_DELAYED_WORK(&unode->release_urb_work,
dlfb_release_urb_work); dlfb_release_urb_work);
...@@ -1891,7 +1869,7 @@ static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size) ...@@ -1891,7 +1869,7 @@ static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size)
} }
unode->urb = urb; unode->urb = urb;
buf = usb_alloc_coherent(dev->udev, MAX_TRANSFER, GFP_KERNEL, buf = usb_alloc_coherent(dlfb->udev, MAX_TRANSFER, GFP_KERNEL,
&urb->transfer_dma); &urb->transfer_dma);
if (!buf) { if (!buf) {
kfree(unode); kfree(unode);
...@@ -1900,69 +1878,64 @@ static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size) ...@@ -1900,69 +1878,64 @@ static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size)
} }
/* urb->transfer_buffer_length set to actual before submit */ /* urb->transfer_buffer_length set to actual before submit */
usb_fill_bulk_urb(urb, dev->udev, usb_sndbulkpipe(dev->udev, 1), usb_fill_bulk_urb(urb, dlfb->udev, usb_sndbulkpipe(dlfb->udev, 1),
buf, size, dlfb_urb_completion, unode); buf, size, dlfb_urb_completion, unode);
urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
list_add_tail(&unode->entry, &dev->urbs.list); list_add_tail(&unode->entry, &dlfb->urbs.list);
i++; i++;
} }
sema_init(&dev->urbs.limit_sem, i); sema_init(&dlfb->urbs.limit_sem, i);
dev->urbs.count = i; dlfb->urbs.count = i;
dev->urbs.available = i; dlfb->urbs.available = i;
pr_notice("allocated %d %d byte urbs\n", i, (int) size);
return i; return i;
} }
static struct urb *dlfb_get_urb(struct dlfb_data *dev) static struct urb *dlfb_get_urb(struct dlfb_data *dlfb)
{ {
int ret; int ret;
struct list_head *entry; struct list_head *entry;
struct urb_node *unode; struct urb_node *unode;
struct urb *urb = NULL;
unsigned long flags; unsigned long flags;
/* Wait for an in-flight buffer to complete and get re-queued */ /* Wait for an in-flight buffer to complete and get re-queued */
ret = down_timeout(&dev->urbs.limit_sem, GET_URB_TIMEOUT); ret = down_timeout(&dlfb->urbs.limit_sem, GET_URB_TIMEOUT);
if (ret) { if (ret) {
atomic_set(&dev->lost_pixels, 1); atomic_set(&dlfb->lost_pixels, 1);
pr_warn("wait for urb interrupted: %x available: %d\n", dev_warn(&dlfb->udev->dev,
ret, dev->urbs.available); "wait for urb interrupted: %d available: %d\n",
goto error; ret, dlfb->urbs.available);
return NULL;
} }
spin_lock_irqsave(&dev->urbs.lock, flags); spin_lock_irqsave(&dlfb->urbs.lock, flags);
BUG_ON(list_empty(&dev->urbs.list)); /* reserved one with limit_sem */ BUG_ON(list_empty(&dlfb->urbs.list)); /* reserved one with limit_sem */
entry = dev->urbs.list.next; entry = dlfb->urbs.list.next;
list_del_init(entry); list_del_init(entry);
dev->urbs.available--; dlfb->urbs.available--;
spin_unlock_irqrestore(&dev->urbs.lock, flags); spin_unlock_irqrestore(&dlfb->urbs.lock, flags);
unode = list_entry(entry, struct urb_node, entry); unode = list_entry(entry, struct urb_node, entry);
urb = unode->urb; return unode->urb;
error:
return urb;
} }
static int dlfb_submit_urb(struct dlfb_data *dev, struct urb *urb, size_t len) static int dlfb_submit_urb(struct dlfb_data *dlfb, struct urb *urb, size_t len)
{ {
int ret; int ret;
BUG_ON(len > dev->urbs.size); BUG_ON(len > dlfb->urbs.size);
urb->transfer_buffer_length = len; /* set to actual payload len */ urb->transfer_buffer_length = len; /* set to actual payload len */
ret = usb_submit_urb(urb, GFP_KERNEL); ret = usb_submit_urb(urb, GFP_KERNEL);
if (ret) { if (ret) {
dlfb_urb_completion(urb); /* because no one else will */ dlfb_urb_completion(urb); /* because no one else will */
atomic_set(&dev->lost_pixels, 1); atomic_set(&dlfb->lost_pixels, 1);
pr_err("usb_submit_urb error %x\n", ret); dev_err(&dlfb->udev->dev, "submit urb error: %d\n", ret);
} }
return ret; return ret;
} }
......
drivers/video/fbdev/vfb.c
View file @ c3611b6d
...@@ -239,8 +239,23 @@ static int vfb_check_var(struct fb_var_screeninfo *var, ...@@ -239,8 +239,23 @@ static int vfb_check_var(struct fb_var_screeninfo *var,
*/ */
static int vfb_set_par(struct fb_info *info) static int vfb_set_par(struct fb_info *info)
{ {
switch (info->var.bits_per_pixel) {
case 1:
info->fix.visual = FB_VISUAL_MONO01;
break;
case 8:
info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
break;
case 16:
case 24:
case 32:
info->fix.visual = FB_VISUAL_TRUECOLOR;
break;
}
info->fix.line_length = get_line_length(info->var.xres_virtual, info->fix.line_length = get_line_length(info->var.xres_virtual,
info->var.bits_per_pixel); info->var.bits_per_pixel);
return 0; return 0;
} }
...@@ -450,6 +465,8 @@ static int vfb_probe(struct platform_device *dev) ...@@ -450,6 +465,8 @@ static int vfb_probe(struct platform_device *dev)
goto err2; goto err2;
platform_set_drvdata(dev, info); platform_set_drvdata(dev, info);
vfb_set_par(info);
fb_info(info, "Virtual frame buffer device, using %ldK of video memory\n", fb_info(info, "Virtual frame buffer device, using %ldK of video memory\n",
videomemorysize >> 10); videomemorysize >> 10);
return 0; return 0;
......
drivers/video/fbdev/vga16fb.c
View file @ c3611b6d
...@@ -1055,7 +1055,6 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are ...@@ -1055,7 +1055,6 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
case FB_TYPE_VGA_PLANES: case FB_TYPE_VGA_PLANES:
if (info->fix.type_aux == FB_AUX_VGA_PLANES_VGA4) { if (info->fix.type_aux == FB_AUX_VGA_PLANES_VGA4) {
width = width/8; width = width/8;
height = height;
line_ofs = info->fix.line_length - width; line_ofs = info->fix.line_length - width;
setmode(1); setmode(1);
......
drivers/video/fbdev/vt8500lcdfb.c
View file @ c3611b6d
...@@ -289,10 +289,8 @@ static int vt8500lcd_probe(struct platform_device *pdev) ...@@ -289,10 +289,8 @@ static int vt8500lcd_probe(struct platform_device *pdev)
fbi = devm_kzalloc(&pdev->dev, sizeof(struct vt8500lcd_info) fbi = devm_kzalloc(&pdev->dev, sizeof(struct vt8500lcd_info)
+ sizeof(u32) * 16, GFP_KERNEL); + sizeof(u32) * 16, GFP_KERNEL);
if (!fbi) { if (!fbi)
dev_err(&pdev->dev, "Failed to initialize framebuffer device\n");
return -ENOMEM; return -ENOMEM;
}
strcpy(fbi->fb.fix.id, "VT8500 LCD"); strcpy(fbi->fb.fix.id, "VT8500 LCD");
......
drivers/video/fbdev/wm8505fb.c
View file @ c3611b6d
...@@ -276,10 +276,8 @@ static int wm8505fb_probe(struct platform_device *pdev) ...@@ -276,10 +276,8 @@ static int wm8505fb_probe(struct platform_device *pdev)
fbi = devm_kzalloc(&pdev->dev, sizeof(struct wm8505fb_info) + fbi = devm_kzalloc(&pdev->dev, sizeof(struct wm8505fb_info) +
sizeof(u32) * 16, GFP_KERNEL); sizeof(u32) * 16, GFP_KERNEL);
if (!fbi) { if (!fbi)
dev_err(&pdev->dev, "Failed to initialize framebuffer device\n");
return -ENOMEM; return -ENOMEM;
}
strcpy(fbi->fb.fix.id, DRIVER_NAME); strcpy(fbi->fb.fix.id, DRIVER_NAME);
......
include/linux/fb.h
View file @ c3611b6d
...@@ -569,7 +569,10 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) { ...@@ -569,7 +569,10 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
#define fb_memcpy_fromfb sbus_memcpy_fromio #define fb_memcpy_fromfb sbus_memcpy_fromio
#define fb_memcpy_tofb sbus_memcpy_toio #define fb_memcpy_tofb sbus_memcpy_toio
#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) || defined(__arm__) #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || \
defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || \
defined(__avr32__) || defined(__bfin__) || defined(__arm__) || \
defined(__aarch64__)
#define fb_readb __raw_readb #define fb_readb __raw_readb
#define fb_readw __raw_readw #define fb_readw __raw_readw
......
include/video/udlfb.h
View file @ c3611b6d
...@@ -19,7 +19,7 @@ struct dloarea { ...@@ -19,7 +19,7 @@ struct dloarea {
struct urb_node { struct urb_node {
struct list_head entry; struct list_head entry;
struct dlfb_data *dev; struct dlfb_data *dlfb;
struct delayed_work release_urb_work; struct delayed_work release_urb_work;
struct urb *urb; struct urb *urb;
}; };
...@@ -35,7 +35,6 @@ struct urb_list { ...@@ -35,7 +35,6 @@ struct urb_list {
struct dlfb_data { struct dlfb_data {
struct usb_device *udev; struct usb_device *udev;
struct device *gdev; /* &udev->dev */
struct fb_info *info; struct fb_info *info;
struct urb_list urbs; struct urb_list urbs;
struct kref kref; struct kref kref;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7