From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2] drm/i915: Replace HAS_PCH_SPLIT which incorrectly lets some platforms in Date: Tue, 22 Jul 2014 09:13:42 +0200 Message-ID: <20140722071342.GF15237@phenom.ffwll.local> References: <20140721155138.GZ15237@phenom.ffwll.local> <1406007826-9870-1-git-send-email-sonika.jindal@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D4D86E4A5 for ; Tue, 22 Jul 2014 00:13:35 -0700 (PDT) Received: by mail-wi0-f182.google.com with SMTP id d1so5215224wiv.9 for ; Tue, 22 Jul 2014 00:13:32 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1406007826-9870-1-git-send-email-sonika.jindal@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: sonika.jindal@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Jul 22, 2014 at 11:13:46AM +0530, sonika.jindal@intel.com wrote: > From: Sonika Jindal > > v2: Adding IS_G4X instead of gen < 5 as suggested by Daniel > > Signed-off-by: Sonika Jindal Merged the remaining patches, thanks. -Daniel > --- > drivers/gpu/drm/i915/intel_hdmi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index 5f8f4ca..2d1a3cb 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -1562,7 +1562,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > if (IS_VALLEYVIEW(dev)) { > intel_hdmi->write_infoframe = vlv_write_infoframe; > intel_hdmi->set_infoframes = vlv_set_infoframes; > - } else if (!HAS_PCH_SPLIT(dev)) { > + } else if (IS_G4X(dev)) { > intel_hdmi->write_infoframe = g4x_write_infoframe; > intel_hdmi->set_infoframes = g4x_set_infoframes; > } else if (HAS_DDI(dev)) { > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch