[PATCH 02/13] drm/vmwgfx: Fix single framebuffer detection.

[Paulius Zaleckas]

On 04/27/2010 08:45 PM, Thomas Hellstrom wrote:
> From: Jakob Bornecrantz<jakob at vmware.com>
>
> Signed-off-by: Jakob Bornecrantz<jakob at vmware.com>
> Signed-off-by: Thomas Hellstrom<thellstrom at vmware.com>
> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> index 9089159..be88fc6 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> @@ -130,6 +130,7 @@ static int vmw_ldu_del_active(struct vmw_private *vmw_priv,
>   	if (list_empty(&ldu->active))
>   		return 0;
>
> +	/* must init otherwise list_empty(&ldu->active) well not work */

Spelling well->will

>   	list_del_init(&ldu->active);
>   	if (--(ld->num_active) == 0) {
>   		BUG_ON(!ld->fb);
> @@ -208,6 +209,8 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set)
>
>   	/* ldu only supports one fb active at the time */
>   	if (dev_priv->ldu_priv->fb&&  vfb&&
> +	    !(dev_priv->ldu_priv->num_active == 1&&
> +	      !list_empty(&ldu->active))&&
>   	dev_priv->ldu_priv->fb != vfb) {
>   		DRM_ERROR("Multiple framebuffers not supported\n");
>   		return -EINVAL;