qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 2/2] Revert "cirrus: allow zero source pitch in


From: Laurent Vivier
Subject: Re: [Qemu-devel] [PATCH 2/2] Revert "cirrus: allow zero source pitch in pattern fill rops"
Date: Fri, 10 Feb 2017 12:39:22 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0

On 09/02/2017 14:02, Gerd Hoffmann wrote:
> This reverts commit 5858dd1801883309bdd208d72ddb81c4e9fee30c.
> 
> Conflicts:
>       hw/display/cirrus_vga.c
> 
> Cc: Wolfgang Bumiller <address@hidden>
> Cc: Dr. David Alan Gilbert <address@hidden>
> Signed-off-by: Gerd Hoffmann <address@hidden>

Reviewed-by: Laurent Vivier <address@hidden>

> ---
>  hw/display/cirrus_vga.c | 26 ++++++++------------------
>  1 file changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
> index 6bd13fc..0e47cf8 100644
> --- a/hw/display/cirrus_vga.c
> +++ b/hw/display/cirrus_vga.c
> @@ -272,6 +272,9 @@ static void cirrus_update_memory_access(CirrusVGAState 
> *s);
>  static bool blit_region_is_unsafe(struct CirrusVGAState *s,
>                                    int32_t pitch, int32_t addr)
>  {
> +    if (!pitch) {
> +        return true;
> +    }
>      if (pitch < 0) {
>          int64_t min = addr
>              + ((int64_t)s->cirrus_blt_height - 1) * pitch
> @@ -290,11 +293,8 @@ static bool blit_region_is_unsafe(struct CirrusVGAState 
> *s,
>      return false;
>  }
>  
> -static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
> -                           bool zero_src_pitch_ok)
> +static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
>  {
> -    int32_t check_pitch;
> -
>      /* should be the case, see cirrus_bitblt_start */
>      assert(s->cirrus_blt_width > 0);
>      assert(s->cirrus_blt_height > 0);
> @@ -303,10 +303,6 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, 
> bool dst_only,
>          return true;
>      }
>  
> -    if (!s->cirrus_blt_dstpitch) {
> -        return true;
> -    }
> -
>      if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
>                                s->cirrus_blt_dstaddr)) {
>          return true;
> @@ -314,13 +310,7 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, 
> bool dst_only,
>      if (dst_only) {
>          return false;
>      }
> -
> -    check_pitch = s->cirrus_blt_srcpitch;
> -    if (!zero_src_pitch_ok && !check_pitch) {
> -        check_pitch = s->cirrus_blt_width;
> -    }
> -
> -    if (blit_region_is_unsafe(s, check_pitch,
> +    if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch,
>                                s->cirrus_blt_srcaddr)) {
>          return true;
>      }
> @@ -715,7 +705,7 @@ static int 
> cirrus_bitblt_common_patterncopy(CirrusVGAState *s, bool videosrc)
>          src = s->cirrus_bltbuf;
>      }
>  
> -    if (blit_is_unsafe(s, true, true)) {
> +    if (blit_is_unsafe(s, true)) {
>          return 0;
>      }
>  
> @@ -734,7 +724,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int 
> blt_rop)
>  {
>      cirrus_fill_t rop_func;
>  
> -    if (blit_is_unsafe(s, true, true)) {
> +    if (blit_is_unsafe(s, true)) {
>          return 0;
>      }
>      rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 
> 1];
> @@ -834,7 +824,7 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int 
> src, int w, int h)
>  
>  static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
>  {
> -    if (blit_is_unsafe(s, false, false))
> +    if (blit_is_unsafe(s, false))
>          return 0;
>  
>      return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,
> 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]