From patchwork Thu Nov 20 21:24:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 5350831 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 72519C11AC for ; Thu, 20 Nov 2014 21:24:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD104201E4 for ; Thu, 20 Nov 2014 21:24:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0743B201EF for ; Thu, 20 Nov 2014 21:24:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 630A36F643; Thu, 20 Nov 2014 13:24:30 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E80F6F643 for ; Thu, 20 Nov 2014 13:24:29 -0800 (PST) Received: by mail-pd0-f171.google.com with SMTP id v10so3803627pde.16 for ; Thu, 20 Nov 2014 13:24:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:subject:date:message-id; bh=zIXKjEsT9m3szIUdZRPX/AFnFuHeVznFbATU8JUEV5A=; b=RCIzjZ7qu9ZRh/w4OD/n9LQyszictey77OiUamFMzt9FVvg8+9ZqxgJ9RXcGCxo+U5 0bSFYyzF4pxyO2QZ/IzfA1kPxI94b7hAdnUrdHuYS4PHWQGXcRyRX5grljJFg2FTjVY/ pQfpE0v1FKu+D/0Wo7GBSWGOtq2oAgBW/jE0CnvIV/iSM9sl6+TJo83nj7RzVKwNnFTk t3lgZcRDcFfiaqpojPVs5Ar2H0QuIFmSDux1L6I0NtYUlXgdgaGx85wwVrMz3Mvk3RK4 ngU2rIwvwUgZXBa/b9iIkqkor6Q5+fCZfEc/Ni9oHFf54jNHlNx7Vk9cktsKCeQtTDV8 j0TQ== X-Received: by 10.69.25.73 with SMTP id io9mr900794pbd.90.1416518669295; Thu, 20 Nov 2014 13:24:29 -0800 (PST) Received: from jbarnes-t420.intel.com (c-67-161-37-189.hsd1.ca.comcast.net. [67.161.37.189]) by mx.google.com with ESMTPSA id pe6sm2900349pac.21.2014.11.20.13.24.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Nov 2014 13:24:27 -0800 (PST) From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 20 Nov 2014 13:24:13 -0800 Message-Id: <1416518654-28749-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.9.1 Subject: [Intel-gfx] [PATCH 1/2] drm/i915/g4x: fix g4x infoframe readout 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 Need to check the port too. Reported-by: Daniel Vetter Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index f58e883..ec87333 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -170,9 +170,13 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); u32 val = I915_READ(VIDEO_DIP_CTL); - return val & VIDEO_DIP_ENABLE; + if (VIDEO_DIP_PORT(intel_dig_port->port) == (val & VIDEO_DIP_PORT_MASK)) + return val & VIDEO_DIP_ENABLE; + + return false; } static void ibx_write_infoframe(struct drm_encoder *encoder,