From patchwork Wed Mar 10 22:45:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 84715 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2AMkEi1006463 for ; Wed, 10 Mar 2010 22:46:54 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EC0D9F5EA; Wed, 10 Mar 2010 14:46:11 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from orsmga101.jf.intel.com (mga06.intel.com [134.134.136.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 27CE69F5C6 for ; Wed, 10 Mar 2010 14:45:51 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 10 Mar 2010 14:42:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,616,1262592000"; d="scan'208";a="499618482" Received: from unknown (HELO localhost.localdomain) ([10.255.13.214]) by orsmga002.jf.intel.com with ESMTP; 10 Mar 2010 14:45:06 -0800 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Mar 2010 22:45:05 +0000 Message-Id: <1268261124-13653-19-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1268261124-13653-1-git-send-email-chris@chris-wilson.co.uk> References: <1268261124-13653-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 18/37] drm/i915: Remove the potential SDVO programming error 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: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 10 Mar 2010 22:46:54 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 872a0ae..dc94b4c 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -522,16 +522,12 @@ static bool intel_sdvo_set_control_bus_switch(struct intel_output *intel_output, return true; } -static bool intel_sdvo_set_target_input(struct intel_output *intel_output, bool target_0, bool target_1) +static bool intel_sdvo_set_target_input(struct intel_output *intel_output, bool target_1) { struct intel_sdvo_set_target_input_args targets = {0}; u8 status; - if (target_0 && target_1) - return SDVO_CMD_STATUS_NOTSUPP; - - if (target_1) - targets.target_1 = 1; + targets.target_1 = !! target_1; status = SDVO_CMD_STATUS_READ_FAILED; if (intel_sdvo_write_cmd(intel_output, SDVO_CMD_SET_TARGET_INPUT, @@ -1108,8 +1104,8 @@ static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder, return false; /* Set the input timing to the screen. Assume always input 0. */ - intel_sdvo_set_target_input(output, true, false); - + if (!intel_sdvo_set_target_input(output, false)) + return false; if (!intel_sdvo_create_preferred_input_timing(output, mode->clock / 10, @@ -1200,7 +1196,8 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, } /* Set the input timing to the screen. Assume always input 0. */ - intel_sdvo_set_target_input(output, true, false); + if (!intel_sdvo_set_target_input(output, false)) + return; if (sdvo_priv->is_tv) { if (!intel_sdvo_set_tv_format(output)) @@ -1338,13 +1335,13 @@ static void intel_sdvo_save(struct drm_connector *connector) intel_sdvo_get_active_outputs(intel_output, &sdvo_priv->save_active_outputs); if (sdvo_priv->caps.sdvo_inputs_mask & 0x1) { - intel_sdvo_set_target_input(intel_output, true, false); + intel_sdvo_set_target_input(intel_output, false); intel_sdvo_get_input_timing(intel_output, &sdvo_priv->save_input_dtd_1); } if (sdvo_priv->caps.sdvo_inputs_mask & 0x2) { - intel_sdvo_set_target_input(intel_output, false, true); + intel_sdvo_set_target_input(intel_output, true); intel_sdvo_get_input_timing(intel_output, &sdvo_priv->save_input_dtd_2); } @@ -1388,12 +1385,12 @@ static void intel_sdvo_restore(struct drm_connector *connector) } if (sdvo_priv->caps.sdvo_inputs_mask & 0x1) { - intel_sdvo_set_target_input(intel_output, true, false); + intel_sdvo_set_target_input(intel_output, false); intel_sdvo_set_input_timing(intel_output, &sdvo_priv->save_input_dtd_1); } if (sdvo_priv->caps.sdvo_inputs_mask & 0x2) { - intel_sdvo_set_target_input(intel_output, false, true); + intel_sdvo_set_target_input(intel_output, true); intel_sdvo_set_input_timing(intel_output, &sdvo_priv->save_input_dtd_2); } @@ -2899,7 +2896,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device) intel_sdvo_select_ddc_bus(sdvo_priv); /* Set the input timing to the screen. Assume always input 0. */ - if (!intel_sdvo_set_target_input(intel_output, true, false)) + if (!intel_sdvo_set_target_input(intel_output, false)) goto err_i2c; if (!intel_sdvo_get_input_pixel_clock_range(intel_output,