From patchwork Wed Mar 10 22:45:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 84716 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 o2AMkFrE006471 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 88A549F613; Wed, 10 Mar 2010 14:46:13 -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 AF5D09F5C6 for ; Wed, 10 Mar 2010 14:45:53 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 10 Mar 2010 14:42:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,616,1262592000"; d="scan'208";a="499618493" Received: from unknown (HELO localhost.localdomain) ([10.255.13.214]) by orsmga002.jf.intel.com with ESMTP; 10 Mar 2010 14:45:09 -0800 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Mar 2010 22:45:06 +0000 Message-Id: <1268261124-13653-20-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 19/37] drm/i915: Delete unused svdo hotplug functions. 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_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 990e01e..590f63c 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -198,8 +198,6 @@ extern void intel_release_load_detect_pipe(struct intel_output *intel_output, int dpms_mode); extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB); -extern bool intel_sdvo_supports_hotplug(struct drm_connector *connector); -extern int intel_sdvo_set_hotplug(struct drm_connector *connector, int enable); extern int intelfb_probe(struct drm_device *dev); extern int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb); extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc); diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index dc94b4c..04293b5 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1480,62 +1480,6 @@ struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB) return NULL; } -bool intel_sdvo_supports_hotplug(struct drm_connector *connector) -{ - u8 response[2]; - u8 status; - struct intel_output *intel_output; - DRM_DEBUG_KMS("\n"); - - if (!connector) - return false; - - intel_output = to_intel_output(connector); - - status = SDVO_CMD_STATUS_READ_FAILED; - if (intel_sdvo_write_cmd(intel_output, SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL, 0)) - status = intel_sdvo_read_response(intel_output, &response, 2); - - if (status != SDVO_CMD_STATUS_SUCCESS) - return false; - - return response[0] != 0; -} - -int intel_sdvo_set_hotplug(struct drm_connector *connector, int on) -{ - u8 response[2]; - u8 status; - struct intel_output *intel_output = to_intel_output(connector); - - if (!intel_sdvo_supports_hotplug (connector)) - return -ENODEV; - - if (on) { - status = SDVO_CMD_STATUS_READ_FAILED; - if (intel_sdvo_write_cmd(intel_output, SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL, 0)) - status = intel_sdvo_read_response(intel_output, &response, 2); - if (status != SDVO_CMD_STATUS_SUCCESS) - return -EIO; - - if (!intel_sdvo_write_cmd(intel_output, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &response, 2)) - return -EIO; - } else { - response[0] = 0; - response[1] = 0; - if (!intel_sdvo_write_cmd(intel_output, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &response, 2)) - return -EIO; - } - - status = SDVO_CMD_STATUS_READ_FAILED; - if (intel_sdvo_write_cmd(intel_output, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0)) - status = intel_sdvo_read_response(intel_output, &response, 2); - if (status != SDVO_CMD_STATUS_SUCCESS) - return -EIO; - - return 0; -} - static bool intel_sdvo_multifunc_encoder(struct intel_output *intel_output) {