Skip to content

video: mxc: IPUv3 fb: restore sync bits #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linux4kix merged 1 commit into from
Sep 20, 2015
Merged

video: mxc: IPUv3 fb: restore sync bits #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions drivers/video/mxc/mxc_ipuv3_fb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,28 @@ static bool mxcfb_need_to_set_par(struct fb_info *fbi)
sizeof(struct fb_var_screeninfo));
}

static struct fb_videomode *mxc_match_mode(const struct fb_var_screeninfo *var,
struct list_head *head)
{
struct list_head *pos;
struct fb_modelist *modelist;
struct fb_videomode *m, mode;

fb_var_to_videomode(&mode, var);
list_for_each(pos, head) {
modelist = list_entry(pos, struct fb_modelist, list);
m = &modelist->mode;

mode.sync &= ~FB_MXC_SYNC_MASK;
mode.sync |= m->sync & FB_MXC_SYNC_MASK;

if (fb_mode_is_equal(m, &mode))
return m;
}

return NULL;
}

/*
* Set framebuffer parameters and change the operating mode.
*
Expand Down Expand Up @@ -583,6 +605,7 @@ static int mxcfb_set_par(struct fb_info *fbi)

if (!mxc_fbi->overlay) {
uint32_t out_pixel_fmt;
struct fb_videomode *sync_mode;

memset(&sig_cfg, 0, sizeof(sig_cfg));
if (fbi->var.vmode & FB_VMODE_INTERLACED)
Expand All @@ -596,6 +619,21 @@ static int mxcfb_set_par(struct fb_info *fbi)
sig_cfg.Hsync_pol = true;
if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
sig_cfg.Vsync_pol = true;

/*
* Try to find matching all parameters, except
* FB_MXC_SYNC_MASK bits in the .sync field.
*/
sync_mode = mxc_match_mode(&fbi->var, &fbi->modelist);
/*
* If entry exists in the mode list and FB_MXC_SYNC_MASK
* bits are empty in the fbi->var.sync (most probably cleared
* by the user space application) then copy it from the found
* mode list entry.
*/
if (sync_mode && !(fbi->var.sync & FB_MXC_SYNC_MASK))
fbi->var.sync = sync_mode->sync;

if (!(fbi->var.sync & FB_SYNC_CLK_LAT_FALL))
sig_cfg.clk_pol = true;
if (fbi->var.sync & FB_SYNC_DATA_INVERT)
Expand Down
11 changes: 11 additions & 0 deletions include/linux/mxcfb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@

#include <uapi/linux/mxcfb.h>

#define FB_SYNC_OE_LOW_ACT 0x80000000
#define FB_SYNC_CLK_LAT_FALL 0x40000000
#define FB_SYNC_DATA_INVERT 0x20000000
#define FB_SYNC_CLK_IDLE_EN 0x10000000
#define FB_SYNC_SHARP_MODE 0x08000000
#define FB_SYNC_SWAP_RGB 0x04000000

#define FB_MXC_SYNC_MASK (FB_SYNC_OE_LOW_ACT | FB_SYNC_CLK_LAT_FALL | \
FB_SYNC_DATA_INVERT | FB_SYNC_CLK_IDLE_EN | \
FB_SYNC_SHARP_MODE | FB_SYNC_SWAP_RGB)

extern struct fb_videomode mxcfb_modedb[];
extern int mxcfb_modedb_sz;

Expand Down