From patchwork Wed Jul 11 14:28:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184041 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 03DD73FC5A for ; Wed, 11 Jul 2012 16:16:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB2B0A0EC8 for ; Wed, 11 Jul 2012 09:16:19 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 633759ED99 for ; Wed, 11 Jul 2012 08:36:20 -0700 (PDT) Received: by wibhm11 with SMTP id hm11so929014wib.12 for ; Wed, 11 Jul 2012 08:36:19 -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=FPBG65GEVeMk9EuaQO8JAmb1I/IDY8BKISgr6y8s7So=; b=UFZVbFQFU5x9phkPP9FkS1vHpKU8r9272i0VDypWM5VpKr/fl0FzFwObhYdYfyi8Vw oL7NkfYccLoHDXKdx8p7HnJYVrNTTD5LmlryrgDPawZA5F0Y6haVf37I0rc/a8vfhlLL /sc4pnpJaqAoatLmf7LGHV4s1WIpCdLR6gCA0= 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=FPBG65GEVeMk9EuaQO8JAmb1I/IDY8BKISgr6y8s7So=; b=ns6WBu8X23gkdy326DOT+RaskYW3TH8TdfVrHcRrs1KwGBymCh7XGhnbSk2SABaKZ2 vp00M2R6LpbNsFONky5YDQ8iH5lrfgQylNVydIHAvA5OEsSKOHugARoxM7j5AXV0LCls eW9t+husxUynnUmGcbpfX4GmoSaSDW2A6NlwtCsksogbKst5UeT3moslrytaDbM+SVxT 5/qF2ZYynSaOtO6sz0iPUQTKI1uqHkrjVYPIjvPAerwHV9rUs2rd8ceI4WXEo0BQgVyD cnkpy7RIPNXuOX+rAhakssIRRatv4UP5kf80JEJuUJdbXdTlta28xl+Y6+CCgef2PEx+ RCsA== Received: by 10.216.139.145 with SMTP id c17mr20699942wej.175.1342020979670; Wed, 11 Jul 2012 08:36:19 -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 bc2sm5777080wib.0.2012.07.11.08.36.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:19 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:35 +0200 Message-Id: <1342016944-23395-53-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQki4bpMogx03r+hBfKepEH2+6OxmewsfqLsyIHqzNn1YyTEFLkn1ulT/F/f/63lSTFNWIWy Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 52/81] 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 --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 577b964..f90860f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6828,7 +6828,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)) {