From patchwork Thu Mar 28 15:01:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2357121 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 E0D34DF2A1 for ; Thu, 28 Mar 2013 14:58:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A5CE6E6179 for ; Thu, 28 Mar 2013 07:58:59 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id AB898E5D01 for ; Thu, 28 Mar 2013 07:58:50 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id a15so3909402eae.1 for ; Thu, 28 Mar 2013 07:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=EfUU99D/S8rPi8M6bwXFAALva0cPXvIw/2xjRyS7N64=; b=cIbiH/pWR7QxStVPR3OneNxO1irM5++Br14wTPUNXZ6NYoeB0SjwcRW5SzGzx4c5ob gZ0e8ZZRJDbq0xqXTMI/+7y+5t/Ohau3HwZ+r3qsNe7xKOJ5wLJ9VcHY8rQ5y/ymjVUF biKRVgojSr4ttzNeU7t8OS3TCJ2J5A9olCSg8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=EfUU99D/S8rPi8M6bwXFAALva0cPXvIw/2xjRyS7N64=; b=mBtkCzIbZ+x26TtFILXe/TdNI8+F/ZYdpzWBmDNHYg6cFlYzciaiX4G0PbmT7bwpwP A+VsJTUeVuRyraAipv2JDftNHgD/+XzKlImesJCoFl55OMQZuWd5EumMY1Pkr31wg1jE 0sjJtstyjvTgY3+QH8HGhBrSfJACCrwGTL13N5tOIIMHYpAevYUK6jn9UemYWiAiiwOr jkbY+8XiiWO6IBWJTZna2F8UakHkNOhIwr0dtkZsdzg9Wa9De5Qk/+yR1ETftnsHqNGa KkTQTjT3Ap/lJyBUebii0w/ZK/zdI804+3FQmPzMHpClou9/yoIS9k1Ew2xPFrotazIh PmWw== X-Received: by 10.14.179.201 with SMTP id h49mr19361947eem.26.1364482729809; Thu, 28 Mar 2013 07:58:49 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id f47sm38227516eep.13.2013.03.28.07.58.48 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 07:58:48 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 28 Mar 2013 16:01:35 +0100 Message-Id: <1364482895-8247-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20130328144225.GN4469@intel.com> References: <20130328144225.GN4469@intel.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnMZy8FBToTtlhLVZNi9rbj45UJc4HP/bQFW+o//Us5U6sqlmRUGtsq7z8xtURpSQ4k/O92 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: check fb->pixel_format instead of bits_per_pixel 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: , 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 We've mostly switched over to the new more flexible schema, but there's one check left in the modeset code. Motivated by a question from Ville whether there's really no way an unsupported pixel_format can escape into our platform update_plane callbacks. v2: Ville noticed that the fb->depth check is redudant when we already check fb->pixel_format. Cc: Ville Syrjälä Signed-off-by: Daniel Vetter Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 84bd8d3..3f3a3dc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7954,10 +7954,8 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set, config->mode_changed = true; } else if (set->fb == NULL) { config->mode_changed = true; - } else if (set->fb->depth != set->crtc->fb->depth) { - config->mode_changed = true; - } else if (set->fb->bits_per_pixel != - set->crtc->fb->bits_per_pixel) { + } else if (set->fb->pixel_format != + set->crtc->fb->pixel_format) { config->mode_changed = true; } else config->fb_changed = true;