diff mbox

[1/2] drm: make sure visible is set to false if fb is null

Message ID 1414173618-20940-1-git-send-email-gustavo@padovan.org (mailing list archive)
State New, archived
Headers show

Commit Message

Gustavo Padovan Oct. 24, 2014, 6 p.m. UTC 
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

We can't let visible set true while the fb is null, some places of
the code only check for visible to base its decisions.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/gpu/drm/drm_plane_helper.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Ville Syrjala Oct. 27, 2014, 2:23 p.m. UTC | #1 
On Fri, Oct 24, 2014 at 07:00:17PM +0100, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> We can't let visible set true while the fb is null, some places of
> the code only check for visible to base its decisions.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

For the series:
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/drm_plane_helper.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
> index 827ec1a..fe4d1fb 100644
> --- a/drivers/gpu/drm/drm_plane_helper.c
> +++ b/drivers/gpu/drm/drm_plane_helper.c
> @@ -127,6 +127,11 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
>  		return -ERANGE;
>  	}
>  
> +	if (!fb) {
> +		*visible = false;
> +		return 0;
> +	}
> +
>  	*visible = drm_rect_clip_scaled(src, dest, clip, hscale, vscale);
>  	if (!*visible)
>  		/*
> -- 
> 1.9.3
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter Oct. 27, 2014, 2:27 p.m. UTC | #2 
On Mon, Oct 27, 2014 at 04:23:26PM +0200, Ville Syrjälä wrote:
> On Fri, Oct 24, 2014 at 07:00:17PM +0100, Gustavo Padovan wrote:
> > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > 
> > We can't let visible set true while the fb is null, some places of
> > the code only check for visible to base its decisions.
> > 
> > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> For the series:
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Both merged to dinq, thanks.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 827ec1a..fe4d1fb 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -127,6 +127,11 @@  int drm_plane_helper_check_update(struct drm_plane *plane,
 		return -ERANGE;
 	}
 
+	if (!fb) {
+		*visible = false;
+		return 0;
+	}
+
 	*visible = drm_rect_clip_scaled(src, dest, clip, hscale, vscale);
 	if (!*visible)
 		/*