Re: [Intel-gfx] [PATCH 5/7] sna/cursor: add an assert on cursor->image

2016-02-12 Thread Chris Wilson 
On Fri, Feb 12, 2016 at 06:31:27PM +0200, Martin Peres wrote:
> Caught by Klockwork, but it was a false positive. However, better safe
> than sorry.

No. cursor->image can be NULL for old gen/kernels.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 5/7] sna/cursor: add an assert on cursor->image

2016-02-12 Thread Martin Peres 
Caught by Klockwork, but it was a false positive. However, better safe
than sorry.

Signed-off-by: Martin Peres 
---
 src/sna/sna_display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 9215b23..78937c2 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5573,8 +5573,9 @@ static struct sna_cursor *__sna_get_cursor(struct sna 
*sna, xf86CrtcPtr crtc)
argb = get_cursor_argb(sna->cursor.ref);
pitch = BitmapBytePad(width);
 
+   assert(cursor->image);
image = cursor->image;
-   if (image == NULL || transformed) {
+   if (transformed) {
image = sna->cursor.scratch;
cursor->last_width = cursor->last_height = size;
}
-- 
2.7.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx