From patchwork Tue Sep 2 19:53:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 4827971 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7E3DC0338 for ; Tue, 2 Sep 2014 19:54:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBECB201C0 for ; Tue, 2 Sep 2014 19:54:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B41F7200FF for ; Tue, 2 Sep 2014 19:54:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 441A16E173; Tue, 2 Sep 2014 12:54:29 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f53.google.com (mail-yh0-f53.google.com [209.85.213.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 617EE6E173 for ; Tue, 2 Sep 2014 12:54:27 -0700 (PDT) Received: by mail-yh0-f53.google.com with SMTP id a41so4618454yho.12 for ; Tue, 02 Sep 2014 12:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=jHD2uFg7Jwx/pdwsglomkuILDjepvb/zy9T2/ClgRPU=; b=hXGpI8wNDXcZ5FMjN2R9YQ9DKQ1HsZuFZd95jAfBmbzoHoc0zWZpjwksW+bfgjJhBt 7o0GlL2/graBhwSbLkWR7nPyRJDKF7/XGnPfpChgU4/j7CNECiajCNbSg5bXpp0yJzP0 PoUR4dD37a/79UjG+tqaDHKELpQ6pOZp7RFaWPfcG7gs9oR7rSAHwgMSZnTmTlRZaqs6 LFDwHsDtxzA+wnrREsAMKGZJUxtOTjpkLZlR8zsfcIseVfk/2ZArsewWa53lEtQOykKl MKCUp6m3yQOqZUQtTEg669IeDoWIBGg6A2v75VuNfA7gShKUuyv8j6bpomgOSjylKhwn AKsA== X-Received: by 10.236.44.147 with SMTP id n19mr50350368yhb.82.1409687666557; Tue, 02 Sep 2014 12:54:26 -0700 (PDT) Received: from localhost.localdomain ([187.59.28.99]) by mx.google.com with ESMTPSA id z29sm6125629yhc.43.2014.09.02.12.54.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Sep 2014 12:54:26 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 2 Sep 2014 16:53:57 -0300 Message-Id: <1409687637-373-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: change CHV write_eld/global_resources function pointers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-5.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Paulo Zanoni Currently, CHV is using the same functions as HSW/BDW instead of the same functions as VLV. This looks wrong, especially since, for example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW check. This patch has the potential to fix display audio and the CHV CDCLK. Cc: Ville Syrjälä Signed-off-by: Paulo Zanoni Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) This is completely untested! But maybe it should go to fixes/stable. diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c092ff4..e6cae59 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.write_eld = ironlake_write_eld; dev_priv->display.modeset_global_resources = ivb_modeset_global_resources; - } else if (IS_HASWELL(dev) || IS_GEN8(dev)) { + } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { dev_priv->display.fdi_link_train = hsw_fdi_link_train; dev_priv->display.write_eld = haswell_write_eld; dev_priv->display.modeset_global_resources =