* [PATCH 0/2] omapfb bugfixes
@ 2008-10-09 9:42 Daniel Stone
2008-10-09 9:52 ` [PATCH 1/2] Input: Touchscreen: Make TSC2005 depend on SPI Daniel Stone
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel Stone @ 2008-10-09 9:42 UTC (permalink / raw)
To: linux-omap
[-- Attachment #1: Type: text/plain, Size: 118 bytes --]
Hi,
These should be fine for merging, one bugfix from Siarhei and one tiny
Kconfig dependency update.
Cheers,
Daniel
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] Input: Touchscreen: Make TSC2005 depend on SPI 2008-10-09 9:42 [PATCH 0/2] omapfb bugfixes Daniel Stone @ 2008-10-09 9:52 ` Daniel Stone 2008-10-09 9:52 ` [PATCH 2/2] FB: OMAP: Blizzard: Properly disable zoom when necessary Daniel Stone 2008-10-09 9:58 ` [PATCH 0/2] omapfb bugfixes Tony Lindgren 2 siblings, 0 replies; 6+ messages in thread From: Daniel Stone @ 2008-10-09 9:52 UTC (permalink / raw) To: linux-omap Make Kconfig reflect reality. Signed-off-by: Daniel Stone <daniel.stone@nokia.com> --- drivers/input/touchscreen/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index d33f450..84ba956 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -219,6 +219,7 @@ config TOUCHSCREEN_ATMEL_TSADCC config TOUCHSCREEN_TSC2005 tristate "TSC2005 touchscreen support" + depends on SPI_MASTER help Say Y here for if you are using the touchscreen features of TSC2005. -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] FB: OMAP: Blizzard: Properly disable zoom when necessary 2008-10-09 9:42 [PATCH 0/2] omapfb bugfixes Daniel Stone 2008-10-09 9:52 ` [PATCH 1/2] Input: Touchscreen: Make TSC2005 depend on SPI Daniel Stone @ 2008-10-09 9:52 ` Daniel Stone 2008-10-09 9:58 ` [PATCH 0/2] omapfb bugfixes Tony Lindgren 2 siblings, 0 replies; 6+ messages in thread From: Daniel Stone @ 2008-10-09 9:52 UTC (permalink / raw) To: linux-omap From: Siarhei Siamashka <siarhei.siamashka@nokia.com> The problem is related to the following notice in the documentation: "Once a destructive window with up-scaling is created, it can only be disabled by creating a background window.". With the current omapfb driver code, if you try to do a partial screen update (show menu or dialog) after a scaled screen update (video overlay), scaling setting are not reset properly and you see this "magnifying glass" effect if a part of new update overlaps previously scaled area. Signed-off-by: Siarhei Siamashka <siarhei.siamashka@nokia.com> Signed-off-by: Daniel Stone <daniel.stone@nokia.com> --- drivers/video/omap/blizzard.c | 56 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c index 6031b89..f60a233 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c @@ -163,6 +163,10 @@ struct blizzard_struct { int vid_scaled; int last_color_mode; int zoom_on; + int zoom_area_gx1; + int zoom_area_gx2; + int zoom_area_gy1; + int zoom_area_gy2; int screen_width; int screen_height; unsigned te_connected:1; @@ -514,6 +518,12 @@ static int do_full_screen_update(struct blizzard_request *req) return REQ_PENDING; } +static int check_1d_intersect(int a1, int a2, int b1, int b2) +{ + if (a2 <= b1 || b2 <= a1) return 0; + return 1; +} + /* Setup all planes with an overlapping area with the update window. */ static int do_partial_update(struct blizzard_request *req, int plane, int x, int y, int w, int h, @@ -526,6 +536,7 @@ static int do_partial_update(struct blizzard_request *req, int plane, int color_mode; int flags; int zoom_off; + int have_zoom_for_this_update = 0; /* Global coordinates, relative to pixel 0,0 of the LCD */ gx1 = x + blizzard.plane[plane].pos_x; @@ -545,10 +556,6 @@ static int do_partial_update(struct blizzard_request *req, int plane, gx2_out = gx1_out + w_out; gy2_out = gy1_out + h_out; } - zoom_off = blizzard.zoom_on && gx1 == 0 && gy1 == 0 && - w == blizzard.screen_width && h == blizzard.screen_height; - blizzard.zoom_on = (!zoom_off && blizzard.zoom_on) || - (w < w_out || h < h_out); for (i = 0; i < OMAPFB_PLANE_NUM; i++) { struct plane_info *p = &blizzard.plane[i]; @@ -654,8 +661,49 @@ static int do_partial_update(struct blizzard_request *req, int plane, else disable_tearsync(); + if ((gx2_out - gx1_out) != (gx2 - gx1) || + (gy2_out - gy1_out) != (gy2 - gy1)) + have_zoom_for_this_update = 1; + + /* 'background' type of screen update (as opposed to 'destructive') + can be used to disable scaling if scaling is active */ + zoom_off = blizzard.zoom_on && !have_zoom_for_this_update && + (gx1_out == 0) && (gx2_out == blizzard.screen_width) && + (gy1_out == 0) && (gy2_out == blizzard.screen_height) && + (gx1 == 0) && (gy1 == 0); + + if (blizzard.zoom_on && !have_zoom_for_this_update && !zoom_off && + check_1d_intersect(blizzard.zoom_area_gx1, blizzard.zoom_area_gx2, + gx1_out, gx2_out) && + check_1d_intersect(blizzard.zoom_area_gy1, blizzard.zoom_area_gy2, + gy1_out, gy2_out)) { + /* Previous screen update was using scaling, current update + * is not using it. Additionally, current screen update is + * going to overlap with the scaled area. Scaling needs to be + * disabled in order to avoid 'magnifying glass' effect. + * Dummy setup of background window can be used for this. + */ + set_window_regs(0, 0, blizzard.screen_width, + blizzard.screen_height, + 0, 0, blizzard.screen_width, + blizzard.screen_height, + BLIZZARD_COLOR_RGB565, 1, flags); + blizzard.zoom_on = 0; + } + + /* remember scaling settings if we have scaled update */ + if (have_zoom_for_this_update) { + blizzard.zoom_on = 1; + blizzard.zoom_area_gx1 = gx1_out; + blizzard.zoom_area_gx2 = gx2_out; + blizzard.zoom_area_gy1 = gy1_out; + blizzard.zoom_area_gy2 = gy2_out; + } + set_window_regs(gx1, gy1, gx2, gy2, gx1_out, gy1_out, gx2_out, gy2_out, color_mode, zoom_off, flags); + if (zoom_off) + blizzard.zoom_on = 0; blizzard.extif->set_bits_per_cycle(16); /* set_window_regs has left the register index at the right -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] omapfb bugfixes 2008-10-09 9:42 [PATCH 0/2] omapfb bugfixes Daniel Stone 2008-10-09 9:52 ` [PATCH 1/2] Input: Touchscreen: Make TSC2005 depend on SPI Daniel Stone 2008-10-09 9:52 ` [PATCH 2/2] FB: OMAP: Blizzard: Properly disable zoom when necessary Daniel Stone @ 2008-10-09 9:58 ` Tony Lindgren 2008-10-09 10:08 ` Daniel Stone 2 siblings, 1 reply; 6+ messages in thread From: Tony Lindgren @ 2008-10-09 9:58 UTC (permalink / raw) To: Daniel Stone; +Cc: linux-omap * Daniel Stone <daniel.stone@nokia.com> [081009 12:39]: > Hi, > These should be fine for merging, one bugfix from Siarhei and one tiny > Kconfig dependency update. OK. Can you also refresh your "FB: OMAP: DISPC: Allow multiple external IRQ handlers" patch? We really should get all the fb stuff to fbdevel list, but let's wait a bit on that, too many other things to deal with right now. Tony ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] omapfb bugfixes 2008-10-09 9:58 ` [PATCH 0/2] omapfb bugfixes Tony Lindgren @ 2008-10-09 10:08 ` Daniel Stone 2008-10-10 11:42 ` Tony Lindgren 0 siblings, 1 reply; 6+ messages in thread From: Daniel Stone @ 2008-10-09 10:08 UTC (permalink / raw) To: ext Tony Lindgren; +Cc: linux-omap [-- Attachment #1: Type: text/plain, Size: 568 bytes --] On Thu, Oct 09, 2008 at 12:58:55PM +0300, ext Tony Lindgren wrote: > * Daniel Stone <daniel.stone@nokia.com> [081009 12:39]: > > Hi, > > These should be fine for merging, one bugfix from Siarhei and one tiny > > Kconfig dependency update. > > OK. Can you also refresh your "FB: OMAP: DISPC: Allow multiple > external IRQ handlers" patch? Sure, no problem. Sent now. > We really should get all the fb stuff to fbdevel list, but let's wait > a bit on that, too many other things to deal with right now. Yeah, good point, sorry. :) Cheers, Daniel [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] omapfb bugfixes 2008-10-09 10:08 ` Daniel Stone @ 2008-10-10 11:42 ` Tony Lindgren 0 siblings, 0 replies; 6+ messages in thread From: Tony Lindgren @ 2008-10-10 11:42 UTC (permalink / raw) To: Daniel Stone; +Cc: linux-omap * Daniel Stone <daniel.stone@nokia.com> [081009 13:23]: > On Thu, Oct 09, 2008 at 12:58:55PM +0300, ext Tony Lindgren wrote: > > * Daniel Stone <daniel.stone@nokia.com> [081009 12:39]: > > > Hi, > > > These should be fine for merging, one bugfix from Siarhei and one tiny > > > Kconfig dependency update. > > > > OK. Can you also refresh your "FB: OMAP: DISPC: Allow multiple > > external IRQ handlers" patch? > > Sure, no problem. Sent now. Thanks, pushing your three patches. Tony > > We really should get all the fb stuff to fbdevel list, but let's wait > > a bit on that, too many other things to deal with right now. > > Yeah, good point, sorry. :) > > Cheers, > Daniel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-10-10 11:42 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-10-09 9:42 [PATCH 0/2] omapfb bugfixes Daniel Stone 2008-10-09 9:52 ` [PATCH 1/2] Input: Touchscreen: Make TSC2005 depend on SPI Daniel Stone 2008-10-09 9:52 ` [PATCH 2/2] FB: OMAP: Blizzard: Properly disable zoom when necessary Daniel Stone 2008-10-09 9:58 ` [PATCH 0/2] omapfb bugfixes Tony Lindgren 2008-10-09 10:08 ` Daniel Stone 2008-10-10 11:42 ` Tony Lindgren
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.