Re: [Qemu-devel] Re: Another SIGFPE in display code, now in cirrus

[Avi Kivity <avi@redhat.com>]

On 05/12/2010 09:11 PM, Stefano Stabellini wrote:
> On Wed, 12 May 2010, Jamie Lokier wrote:
>    
>> Stefano Stabellini wrote:
>>      
>>> On Wed, 12 May 2010, Avi Kivity wrote:
>>>        
>>>> It's useful if you have a one-line horizontal pattern you want to
>>>> propagate all over.
>>>>          
>>>
>>> It might be useful all right, but it is not entirely clear what the
>>> hardware should do in this situation from the documentation we have, and
>>> certainly the current state of the cirrus emulation code doesn't help.
>>>        
>> It's quite a reasonable thing for hardware to do, even if not documented.
>> It would be surprising if the hardware didn't copy the one-line pattern.
>>      
>
> All right then, you convinced me :)
>
> This is my proposed solution, however it is untested with Windows NT.
>
>
> Signed-off-by: Stefano Stabellini<stefano.stabellini@eu.citrix.com>
>
> ---
>
>
>
> diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
> index 9f61a01..a7f0d3c 100644
> --- a/hw/cirrus_vga.c
> +++ b/hw/cirrus_vga.c
> @@ -676,15 +676,17 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
>       int sx, sy;
>       int dx, dy;
>       int width, height;
> +    uint32_t start_addr, line_offset, line_compare;
>       int depth;
>       int notify = 0;
>
>       depth = s->vga.get_bpp(&s->vga) / 8;
>       s->vga.get_resolution(&s->vga,&width,&height);
> +    s->vga.get_offsets(&s->vga,&line_offset,&start_addr,&line_compare);
>
>       /* extra x, y */
> -    sx = (src % ABS(s->cirrus_blt_srcpitch)) / depth;
> -    sy = (src / ABS(s->cirrus_blt_srcpitch));
> +    sx = (src % line_offset) / depth;
> +    sy = (src / line_offset);
>       dx = (dst % ABS(s->cirrus_blt_dstpitch)) / depth;
>       dy = (dst / ABS(s->cirrus_blt_dstpitch));
>    

dx/dy also need to be calculated according to line_offset.

I think the rules are:

if src_byte_range in screen and dst_byte_range in screen
    and srcpitch == dstpitch == line_offset:
        can use qemu_console_copy
elif dst_byte_range overlaps screen:
        if dstpitch == line_offset:
            invalidate rectangle
        else:
            invalidate full screen


-- 
error compiling committee.c: too many arguments to function