From patchwork Sun Aug 19 19:12:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1345141 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id BC806DF264 for ; Sun, 19 Aug 2012 20:47:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC5CCA1050 for ; Sun, 19 Aug 2012 13:47:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 480E3A1030 for ; Sun, 19 Aug 2012 13:21:08 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id r3so3851112wey.36 for ; Sun, 19 Aug 2012 13:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=AkoY8u4Bdy41szPgpsUxOVHJroiiPinP18JzjPKp5nA=; b=g2pklrbrt6Jp7FAjgJjHZBITF3IkXNvlpir5AroLAp+p9DumQTJQhfUDXKVUy1gxpO YD/LVOWVlJeTzehwM1w2N1LBa+dvbkoX+CWeDAp6JFSQ6lnZGGG5++YmUdY/la9pTyaq 9PXrrFMyTJ8OsiF271EEo5q4NuFS47Mz16V3I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=AkoY8u4Bdy41szPgpsUxOVHJroiiPinP18JzjPKp5nA=; b=cvlLHMe35jRmYWmaLo5z+guhcsJTjQFSf9hqB0ZaLGSZ4ATE8NiBdiu+2IqlQ8CUSZ hGLm7CWVCrVtyn0c7dog3qCySf59Vzgr3u+9JuWp2UV+IXzsBTchiwZDm+msmpAaBYoC rWyG9DyzNdbLBnXV3pzwruJAwZrkzeamjN8GJFRtCM2lN9QK2tgI5qS+R1qAsr/9W//E cVWry7gufgB9qUW47XiaOfOlicz6IBJzK3016cUDGJB7PVmku7HviDbVjLjq00UCiSz2 ytBmAl7MPVYsMgyr0hk9wbawblu+tyLe5AZhrecXGCEBq622r/4nIPaI/e6LemuQzs5e eo2g== Received: by 10.180.105.130 with SMTP id gm2mr22023630wib.6.1345407667944; Sun, 19 Aug 2012 13:21:07 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id fu8sm24194367wib.5.2012.08.19.13.21.06 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Aug 2012 13:21:07 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 19 Aug 2012 21:12:57 +0200 Message-Id: <1345403595-9678-41-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQn2RKM7JxJZa5GAPqa+0v2bjmA13yROYeLsp5gy8Ct81p3JQdvjiUbcLlaDD/R77XXYNWg2 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 40/58] drm/i915: don't update the fb base if there is no fb X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org 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 Reviewed-by: Jesse Barnes --- 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)) {