Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362926
b: refs/heads/master
c: fd3871a
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Stübner authored and Tomi Valkeinen committed Apr 4, 2013
1 parent cbe4ab8 commit 23752fe
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 46574c72c701e45da1e0a2e944df885fcd2db668
refs/heads/master: fd3871aa5c0d108b89858263254b49d9bca2dc53
25 changes: 20 additions & 5 deletions trunk/drivers/video/auo_k190x.c
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,20 @@ static int auok190xfb_check_var(struct fb_var_screeninfo *var,
* Dimensions
*/

if (par->rotation & 1) {
var->xres = panel->h;
var->yres = panel->w;
} else {
switch (var->rotate) {
case FB_ROTATE_UR:
case FB_ROTATE_UD:
var->xres = panel->w;
var->yres = panel->h;
break;
case FB_ROTATE_CW:
case FB_ROTATE_CCW:
var->xres = panel->h;
var->yres = panel->w;
break;
default:
dev_dbg(dev, "Invalid rotation request\n");
return -EINVAL;
}

var->xres_virtual = var->xres;
Expand Down Expand Up @@ -534,8 +542,15 @@ static int auok190xfb_set_par(struct fb_info *info)
{
struct auok190xfb_par *par = info->par;

par->rotation = info->var.rotate;
auok190xfb_set_fix(info);

/* reinit the controller to honor the rotation */
par->init(par);

/* wait for init to complete */
par->board->wait_for_rdy(par);

return 0;
}

Expand Down Expand Up @@ -1030,7 +1045,7 @@ int auok190x_common_probe(struct platform_device *pdev,
panel = &panel_table[board->resolution];

par->resolution = board->resolution;
par->rotation = board->rotation;
par->rotation = 0;

/* videomemory handling */

Expand Down
1 change: 0 additions & 1 deletion trunk/include/video/auo_k190xfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ struct auok190x_board {
int gpio_nbusy;

int resolution;
int rotation;
int quirks;
int fps;
};
Expand Down

0 comments on commit 23752fe

Please sign in to comment.