From patchwork Mon Aug 30 17:37:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tino Keitel X-Patchwork-Id: 143081 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7UHatEO026188 for ; Mon, 30 Aug 2010 17:37:31 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C549F9E933 for ; Mon, 30 Aug 2010 10:36:55 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from eazy.amigager.de (eazy.amigager.de [213.239.192.238]) by gabe.freedesktop.org (Postfix) with ESMTP id 042C19E761 for ; Mon, 30 Aug 2010 10:36:35 -0700 (PDT) Received: from mac.home (port-92-206-103-199.dynamic.qsc.de [92.206.103.199]) by eazy.amigager.de (Postfix) with ESMTPA id CBAB5C8C244 for ; Mon, 30 Aug 2010 19:36:34 +0200 (CEST) Received: from scorpion (uid 1001) (envelope-from tino.keitel@tikei.de) id 1f7f2 by mac.home (DragonFly Mail Agent) Mon, 30 Aug 2010 19:37:02 +0200 Date: Mon, 30 Aug 2010 19:37:02 +0200 From: Tino Keitel To: Maciej Rutecki Message-ID: <20100830173702.GA5006@mac.home> Mail-Followup-To: Maciej Rutecki , linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org References: <20100826073039.GA4567@mac.home> <201008291519.20734.maciej.rutecki@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201008291519.20734.maciej.rutecki@gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] 2.6.36-rc2 regression: Wrong screen resolution (1024x768 instead of 1680x1050) X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 30 Aug 2010 17:37:32 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 4f00390..1d306a4 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -25,6 +25,8 @@ * * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c */ + +#include #include "drmP.h" #include "drm.h" #include "i915_drm.h" diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index d2029ef..f71e488 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1279,6 +1279,8 @@ intel_tv_detect_type (struct intel_tv *intel_tv) * 1 0 X svideo * 0 0 0 Component */ + type = -1; + goto out; if ((tv_dac & TVDAC_SENSE_MASK) == (TVDAC_B_SENSE | TVDAC_C_SENSE)) { DRM_DEBUG_KMS("Detected Composite TV connection\n"); type = DRM_MODE_CONNECTOR_Composite; @@ -1292,7 +1294,7 @@ intel_tv_detect_type (struct intel_tv *intel_tv) DRM_DEBUG_KMS("No TV connection detected\n"); type = -1; } - +out: /* Restore interrupt config */ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); i915_enable_pipestat(dev_priv, 0, PIPE_HOTPLUG_INTERRUPT_ENABLE |