* [Qemu-devel] [PATCH] pxa2xx_lcd: SRAM is valid location for the framebuffer
@ 2012-01-24 18:49 Vasily Khoruzhick
2012-01-24 19:25 ` Vasily Khoruzhick
0 siblings, 1 reply; 4+ messages in thread
From: Vasily Khoruzhick @ 2012-01-24 18:49 UTC (permalink / raw)
To: Peter Maydell, Andrzej Zaborowski, qemu-devel@nongnu.org
Cc: Vasily Khoruzhick
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
hw/pxa2xx_lcd.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index 4e9f7b4..b39abbb 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -311,6 +311,10 @@ static void pxa2xx_descriptor_load(PXA2xxLCDState *s)
if (!(descptr >= PXA2XX_SDRAM_BASE && descptr +
sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size))
continue;
+ if (!(descptr >= PXA2XX_INTERNAL_BASE && descptr +
+ sizeof(desc) <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE)) {
+ continue;
+ }
cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc));
s->dma_ch[i].descriptor = tswap32(desc.fdaddr);
@@ -830,8 +834,10 @@ static void pxa2xx_update_display(void *opaque)
continue;
}
fbptr = s->dma_ch[ch].source;
- if (!(fbptr >= PXA2XX_SDRAM_BASE &&
- fbptr <= PXA2XX_SDRAM_BASE + ram_size)) {
+ if (!((fbptr >= PXA2XX_SDRAM_BASE &&
+ fbptr <= PXA2XX_SDRAM_BASE + ram_size) ||
+ (fbptr >= PXA2XX_INTERNAL_BASE &&
+ fbptr <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE))) {
pxa2xx_dma_ber_set(s, ch);
continue;
}
--
1.7.8.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] pxa2xx_lcd: SRAM is valid location for the framebuffer
2012-01-24 18:49 [Qemu-devel] [PATCH] pxa2xx_lcd: SRAM is valid location for the framebuffer Vasily Khoruzhick
@ 2012-01-24 19:25 ` Vasily Khoruzhick
2012-01-24 19:32 ` [Qemu-devel] [PATCH v2] " Vasily Khoruzhick
0 siblings, 1 reply; 4+ messages in thread
From: Vasily Khoruzhick @ 2012-01-24 19:25 UTC (permalink / raw)
To: Peter Maydell; +Cc: Andrzej Zaborowski, qemu-devel@nongnu.org
On Tue, 2012-01-24 at 21:49 +0300, Vasily Khoruzhick wrote:
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Please ignore it, this version is buggy
> hw/pxa2xx_lcd.c | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
> index 4e9f7b4..b39abbb 100644
> --- a/hw/pxa2xx_lcd.c
> +++ b/hw/pxa2xx_lcd.c
> @@ -311,6 +311,10 @@ static void pxa2xx_descriptor_load(PXA2xxLCDState *s)
> if (!(descptr >= PXA2XX_SDRAM_BASE && descptr +
> sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size))
> continue;
> + if (!(descptr >= PXA2XX_INTERNAL_BASE && descptr +
> + sizeof(desc) <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE)) {
> + continue;
> + }
>
> cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc));
> s->dma_ch[i].descriptor = tswap32(desc.fdaddr);
> @@ -830,8 +834,10 @@ static void pxa2xx_update_display(void *opaque)
> continue;
> }
> fbptr = s->dma_ch[ch].source;
> - if (!(fbptr >= PXA2XX_SDRAM_BASE &&
> - fbptr <= PXA2XX_SDRAM_BASE + ram_size)) {
> + if (!((fbptr >= PXA2XX_SDRAM_BASE &&
> + fbptr <= PXA2XX_SDRAM_BASE + ram_size) ||
> + (fbptr >= PXA2XX_INTERNAL_BASE &&
> + fbptr <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE))) {
> pxa2xx_dma_ber_set(s, ch);
> continue;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2] pxa2xx_lcd: SRAM is valid location for the framebuffer
2012-01-24 19:25 ` Vasily Khoruzhick
@ 2012-01-24 19:32 ` Vasily Khoruzhick
2012-02-17 7:26 ` andrzej zaborowski
0 siblings, 1 reply; 4+ messages in thread
From: Vasily Khoruzhick @ 2012-01-24 19:32 UTC (permalink / raw)
To: Peter Maydell, Andrzej Zaborowski, qemu-devel@nongnu.org
Cc: Vasily Khoruzhick
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
v2: fix descptr validation
hw/pxa2xx_lcd.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index 4e9f7b4..de0fa48 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -308,9 +308,12 @@ static void pxa2xx_descriptor_load(PXA2xxLCDState *s)
} else
descptr = s->dma_ch[i].descriptor;
- if (!(descptr >= PXA2XX_SDRAM_BASE && descptr +
- sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size))
+ if (!((descptr >= PXA2XX_SDRAM_BASE && descptr +
+ sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size) ||
+ (descptr >= PXA2XX_INTERNAL_BASE && descptr +
+ sizeof(desc) <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE))) {
continue;
+ }
cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc));
s->dma_ch[i].descriptor = tswap32(desc.fdaddr);
@@ -830,8 +833,10 @@ static void pxa2xx_update_display(void *opaque)
continue;
}
fbptr = s->dma_ch[ch].source;
- if (!(fbptr >= PXA2XX_SDRAM_BASE &&
- fbptr <= PXA2XX_SDRAM_BASE + ram_size)) {
+ if (!((fbptr >= PXA2XX_SDRAM_BASE &&
+ fbptr <= PXA2XX_SDRAM_BASE + ram_size) ||
+ (fbptr >= PXA2XX_INTERNAL_BASE &&
+ fbptr <= PXA2XX_INTERNAL_BASE + PXA2XX_INTERNAL_SIZE))) {
pxa2xx_dma_ber_set(s, ch);
continue;
}
--
1.7.8.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] pxa2xx_lcd: SRAM is valid location for the framebuffer
2012-01-24 19:32 ` [Qemu-devel] [PATCH v2] " Vasily Khoruzhick
@ 2012-02-17 7:26 ` andrzej zaborowski
0 siblings, 0 replies; 4+ messages in thread
From: andrzej zaborowski @ 2012-02-17 7:26 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: Peter Maydell, qemu-devel@nongnu.org
On 24 January 2012 20:32, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Thanks, applied this patch.
Cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-17 7:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-24 18:49 [Qemu-devel] [PATCH] pxa2xx_lcd: SRAM is valid location for the framebuffer Vasily Khoruzhick
2012-01-24 19:25 ` Vasily Khoruzhick
2012-01-24 19:32 ` [Qemu-devel] [PATCH v2] " Vasily Khoruzhick
2012-02-17 7:26 ` andrzej zaborowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).