From patchwork Tue Jul 7 09:44:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6731671 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C02F49F38C for ; Tue, 7 Jul 2015 09:41:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F23B0206AB for ; Tue, 7 Jul 2015 09:41:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8E1C6203AA for ; Tue, 7 Jul 2015 09:41:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 141F66E2C2; Tue, 7 Jul 2015 02:41:51 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3DA8D6E2C2 for ; Tue, 7 Jul 2015 02:41:50 -0700 (PDT) Received: by wibdq8 with SMTP id dq8so177137432wib.1 for ; Tue, 07 Jul 2015 02:41:48 -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:mime-version:content-type :content-transfer-encoding; bh=0Q/gKxUisHa+ZA+kHr61uhZRMFFJ+r6hEPxS1R2daW8=; b=P/7w8o/6sV78vio6CmbgQ7eaRh5dEJB92eap8wxSSui+8ZIkFDo4ScROI4fqalELps 1r74DX83kgRTqH09gWDf1a7E2NyJoc4+vVG0Ukv33Wt08ch7SHuUfmHta5JgFOIorJj8 OL0FJVUekN5vIuv34wgAselakYn1wXGx0SmPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=0Q/gKxUisHa+ZA+kHr61uhZRMFFJ+r6hEPxS1R2daW8=; b=SPBiZ7L3doYgH15cWFn7L50yd4DrEB4Zyho5gM9zGX+sUUpUW77xTOm0bgTO7gDSzV ezZNkIUOGKVHnxixaD17VqwljrPuv0qB3HY51TfDU4uZrBpxojHgEOJzBRlaaCC2pF6s jQf8higmeeUxehjFoD+spscdb2pE5HR4rn7KbqSTkx9IGODf5EXQfNbXYnlMmzXDCuGQ j95w7ClQIGihM9eyUaCkMTx7OJ7uSlSEgLsUdiRQj11VOLMXkDg/cHNSH4wsP88yY5NW 9+3u9bKoaPwX54EjIs0u5X3Ac6KbkZXZHTjYyMTaDJP8TIPoSbS/Mf5nCwnpd/ytmlA0 GFYA== X-Gm-Message-State: ALoCoQmRJKgKh0HpmFL6EsBqSnRmK2vbKZv0UDpqcx23BaZByZgujLid7+bisxDu/xVopA9WzATy X-Received: by 10.180.85.194 with SMTP id j2mr6476031wiz.11.1436262108710; Tue, 07 Jul 2015 02:41:48 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id e2sm32457343wjw.12.2015.07.07.02.41.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 02:41:47 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 7 Jul 2015 11:44:32 +0200 Message-Id: <1436262272-8663-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Inline SUPPORTS_DIGITAL_OUTPUTS X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After the register save/restore code is gone there's just one user left and it just obfuscates that one. Remove it. Cc: Ville Syrjälä Suggested-by: Ville Syrjälä Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0d9a60b9e6c5..ee956a165d46 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2511,7 +2511,6 @@ struct drm_i915_cmd_table { */ #define HAS_128_BYTE_Y_TILING(dev) (!IS_GEN2(dev) && !(IS_I915G(dev) || \ IS_I915GM(dev))) -#define SUPPORTS_DIGITAL_OUTPUTS(dev) (!IS_GEN2(dev) && !IS_PINEVIEW(dev)) #define SUPPORTS_TV(dev) (INTEL_INFO(dev)->supports_tv) #define I915_HAS_HOTPLUG(dev) (INTEL_INFO(dev)->has_hotplug) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 87be3f307e40..0663e1d97979 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14316,7 +14316,7 @@ static void intel_setup_outputs(struct drm_device *dev) } intel_dsi_init(dev); - } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) { + } else if (!IS_GEN2(dev) && !IS_PINEVIEW(dev)) { bool found = false; if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {