Message ID | 1325937599-12763-1-git-send-email-stefanha@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On 7 January 2012 12:59, Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> wrote: > The RFBI_READ/RFBI_STATUS code incorrectly uses chip[0] when it should > be using chip[1]. Andrzej Zaborowski <balrog@zabor.org> confirmed this > bug since I don't know this code well. > > Reported-by: Dr David Alan Gilbert <davidagilbert@uk.ibm.com> > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Reviewed-by: Andrzej Zaborowski <andrew.zaborowski@intel.com> Cheers
On Sat, Jan 07, 2012 at 11:59:59AM +0000, Stefan Hajnoczi wrote: > The RFBI_READ/RFBI_STATUS code incorrectly uses chip[0] when it should > be using chip[1]. Andrzej Zaborowski <balrog@zabor.org> confirmed this > bug since I don't know this code well. > > Reported-by: Dr David Alan Gilbert <davidagilbert@uk.ibm.com> > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> > --- > hw/omap_dss.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
diff --git a/hw/omap_dss.c b/hw/omap_dss.c index ede640b..86ed6ea 100644 --- a/hw/omap_dss.c +++ b/hw/omap_dss.c @@ -793,7 +793,7 @@ static void omap_rfbi_write(void *opaque, target_phys_addr_t addr, if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0]) s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1); else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1]) - s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1); + s->rfbi.rxbuf = s->rfbi.chip[1]->read(s->rfbi.chip[1]->opaque, 1); if (!-- s->rfbi.pixels) omap_rfbi_transfer_stop(s); break; @@ -802,7 +802,7 @@ static void omap_rfbi_write(void *opaque, target_phys_addr_t addr, if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0]) s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0); else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1]) - s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0); + s->rfbi.rxbuf = s->rfbi.chip[1]->read(s->rfbi.chip[1]->opaque, 0); if (!-- s->rfbi.pixels) omap_rfbi_transfer_stop(s); break;
The RFBI_READ/RFBI_STATUS code incorrectly uses chip[0] when it should be using chip[1]. Andrzej Zaborowski <balrog@zabor.org> confirmed this bug since I don't know this code well. Reported-by: Dr David Alan Gilbert <davidagilbert@uk.ibm.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> --- hw/omap_dss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)