[Intel-gfx] [PATCH 40/58] drm/i915: don't update the fb base if there is no fb

[Jesse Barnes]

On Sun, 19 Aug 2012 21:12:57 +0200
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:

> Otherwise we'll set_fb complains pretty loudly if we the crtc is off
> and userspace moves the NULL fb around a bit. Yeah, this actually
> happens in the wild ...
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 4b2b17f..125443a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6827,7 +6827,7 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
>  			config->fb_changed = true;
>  	}
>  
> -	if (set->x != set->crtc->x || set->y != set->crtc->y)
> +	if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y))
>  		config->fb_changed = true;
>  
>  	if (set->mode && !drm_mode_equal(set->mode, &set->crtc->mode)) {

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center