From patchwork Wed Jul 11 14:28:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184061 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 F19B5DF25A for ; Wed, 11 Jul 2012 16:16:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C2D39A0EC5 for ; Wed, 11 Jul 2012 09:16:59 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BABF9EED2 for ; Wed, 11 Jul 2012 08:36:21 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so946426wgb.12 for ; Wed, 11 Jul 2012 08:36:21 -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=QeyJpSubcIgeO8DX2nK4FKB0YHCdUqlNMWtDu/p6+g4=; b=azBIpGV/ghfy22uB1TVK0GeIwLPsISWrtwV/h0QKX6JAJ0GDvbmO07dV8UOv+hyt/I vZhkwlwjl0bJ+DoaaIlffCCWaRSkBoj+BG5vuNut5RVMSdxzK2FQH+fuURtJUZswr5Oo raEg38mRcAXx+HAnNOzMC3sufRdRsogMt7BlA= 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=QeyJpSubcIgeO8DX2nK4FKB0YHCdUqlNMWtDu/p6+g4=; b=jfAZS1IsM3JrgcjEQHJg2uflCRT3No4CwrTQU7IDSG3nW9yvWfkyHh2BESQyHSEaeV 4/gXRrCh1Rz69uK4oe1qCMAdsYMQTCCcHnnirJB6K72zXv3aX94NC/a659Sdw/p4C4ai eHnqS8CeCvuuuZLr1gH3xBllFVVOu9DWPaQO5xk9dTpHREl59yzx0ZzFWwakqx0qAq/o OlB43x9nEZEBhFbQPN/JKB+u41airkGzWqWkkdgLB/6jRIVJSUUGQW3P6BNVspHQYHsi V8h8Czp4fWF02RMEOhx27Qr/AsYeiGQbcv9loe5NvN0IY9E2kaFpu0B0LUpkh8T3GAPn OZWA== Received: by 10.216.208.87 with SMTP id p65mr20595483weo.162.1342020981020; Wed, 11 Jul 2012 08:36:21 -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.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:20 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:36 +0200 Message-Id: <1342016944-23395-54-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: ALoCoQl/JOZiUJCJBIvbTZIrbhgJEwQXsOCSeQMnVQUZSDAvQvrRMKzWWXQozZQfwOWQbucC1BGO Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 53/81] drm/i915: convert pointless error checks in set_config to BUGs 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 Because they all are, the ioctl command never calls us with any of these violated. Also drop a equally pointless empty debug message (and also in set_cursor, while we're at it). With all these changes, intel_crtc_set_config is neatly condensed down to it's essence, the actual modeset code (or fb update calling code) v2: The fb helper code is actually stretching ->set_config semantics a bit, it calls it with set->mode == NULL but set->fb != NULL. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f90860f..2659ad5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5380,8 +5380,6 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc, uint32_t addr; int ret; - DRM_DEBUG_KMS("\n"); - /* if we want to turn off the cursor ignore width and height */ if (!handle) { DRM_DEBUG_KMS("cursor off\n"); @@ -6920,16 +6918,9 @@ static int intel_crtc_set_config(struct drm_mode_set *set) int ret; int i; - DRM_DEBUG_KMS("\n"); - - if (!set) - return -EINVAL; - - if (!set->crtc) - return -EINVAL; - - if (!set->crtc->helper_private) - return -EINVAL; + BUG_ON(!set); + BUG_ON(!set->crtc); + BUG_ON(!set->crtc->helper_private); if (!set->mode) set->fb = NULL;