diff mbox

[weston,1/2] compositor-drm: skip overlay for shm buffers

Message ID 1344539908-12065-1-git-send-email-rob.clark@linaro.org
State New
Headers show

Commit Message

Rob Clark Aug. 9, 2012, 7:18 p.m. UTC 
From: Rob Clark <rob@ti.com>

They can't be imported by gbm, so no point in trying, and segfaulting
in gbm when we try to import (because it tries to deref the buffer as
a wl_drm_buffer).

Signed-off-by: Rob Clark <rob@ti.com>
---
 src/compositor-drm.c |    3 +++
 1 file changed, 3 insertions(+)

Comments

Kristian Høgsberg Aug. 9, 2012, 9:14 p.m. UTC | #1 
On Thu, Aug 09, 2012 at 02:18:27PM -0500, Rob Clark wrote:
> From: Rob Clark <rob@ti.com>
> 
> They can't be imported by gbm, so no point in trying, and segfaulting
> in gbm when we try to import (because it tries to deref the buffer as
> a wl_drm_buffer).

Thanks, both applied (with tweaks to apply against master).

Kristian

> Signed-off-by: Rob Clark <rob@ti.com>
> ---
>  src/compositor-drm.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/compositor-drm.c b/src/compositor-drm.c
> index ad2c385..d6e6c98 100644
> --- a/src/compositor-drm.c
> +++ b/src/compositor-drm.c
> @@ -566,6 +566,9 @@ drm_output_prepare_overlay_surface(struct weston_output *output_base,
>  	if (es->buffer == NULL)
>  		return -1;
>  
> +	if (wl_buffer_is_shm(es->buffer))
> +		return -1;
> +
>  	if (!drm_surface_transform_supported(es))
>  		return -1;
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
diff mbox

Patch

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index ad2c385..d6e6c98 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -566,6 +566,9 @@  drm_output_prepare_overlay_surface(struct weston_output *output_base,
 	if (es->buffer == NULL)
 		return -1;
 
+	if (wl_buffer_is_shm(es->buffer))
+		return -1;
+
 	if (!drm_surface_transform_supported(es))
 		return -1;