From patchwork Thu Jul 26 18:49:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245161 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 44F3D3FC33 for ; Thu, 26 Jul 2012 20:38:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 08BB59E9AD for ; Thu, 26 Jul 2012 13:38:40 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id BDDE99E9D9 for ; Thu, 26 Jul 2012 12:57:13 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hq4so5480612wib.12 for ; Thu, 26 Jul 2012 12:57:13 -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=6D6X6c8HMoFAiTsu3FWq1hqv524ouoeT9rOrvFHTyUQ=; b=lNX3fT0/qBb/W6En99OcKcenRtD6ULCOx/aQmw/ha1/LX2OpBFoZ9gQ/F8ZrLYsLFW v+Y5kBO2RMVknNWmFQel1f2fAm28EUnBO5OfYxvCUCGHtDdVgQCaINDGjxP6mwBJhRET kXVs+I7QpK0eBO8By4yM+LBrIrPPjXZoKsmOw= 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=6D6X6c8HMoFAiTsu3FWq1hqv524ouoeT9rOrvFHTyUQ=; b=A7VKZViCShxKqvlN9xaAMipRiIk4vGlTkNKw8ljxvWoogVbglJilO2N8MMhSm05u0T HvehnqDV1DjPB8egiBIR3UVUdo5D1TfbAGM1vMCdMhHsQOVkI1m84gTEXcAe9tQ7DnLo l4Dyy84xOcJgkH4oy6wzk1BZuB4ve8PkrlpxDjddDSdNGi+XU5pxGPqR9e8bxtgiZzzi L/VVKsF9NvE3df9BFjjDLD1+YyRxEMIxcrS3ewtYsWTvbhV+v9IoUhdYoT6J5yQA8wHr O6JIek4kMrTDhDBFtibzRPr93jh4UKCP5n2VayrF98sBjOsjgkxx/UvVAXhnT7yVQemm vxaA== Received: by 10.180.98.69 with SMTP id eg5mr16161121wib.3.1343332633524; Thu, 26 Jul 2012 12:57:13 -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 fr4sm391403wib.8.2012.07.26.12.57.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:12 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:13 +0200 Message-Id: <1343328581-2324-49-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlvdy/mKC78MkQJs88i3Hi1zASu1tcEbyTUbQfE7T7o4ZaZBDycoHIK5OnYPv1meEFq8X6X Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 48/76] 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 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 c38d503..79748c9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6754,7 +6754,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)) {