From patchwork Wed Jul 11 10:31:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1181631 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id A83EB3FC8E for ; Wed, 11 Jul 2012 10:38:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88762A09A0 for ; Wed, 11 Jul 2012 03:38:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id B44C8A0DB3 for ; Wed, 11 Jul 2012 03:32:25 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hm11so712229wib.12 for ; Wed, 11 Jul 2012 03:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=QEv9kXaEJLXncPYJPRk4D2easc3d2WczTePBXy1Itvw=; b=YqXJILD5winyi6NnVOM0L2x062perX4XXQGqn8ksqBjgIZ8xwiJ56YiAFxlZ+Uc5a9 mbTPkB3pfixD3rdJIESUlE49AcgVQqCHCCH1xyZUuD7MloVqLz/2KmwED12Sb9orOEPL iF2ISVE+UuyY0AxV5dsNgFUEKHcrEfHmyA/Mk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=QEv9kXaEJLXncPYJPRk4D2easc3d2WczTePBXy1Itvw=; b=l9T7EcsINflgYu/fQBciGpJJxHvmwYRPqUxa096rZpYOy/uGxf68G8vXkfyLQesy1S DHm6rOUs87W17jCDcJ7vtLt9Q3Bj7xdplNi25vRDsDsvYl9H0XhM6E/neWsJltRtwuBT mwrWiVOhAC+7L6Ftze5Ind1YDDVkrMLiDBYAggdFQ/ISFi3M6pWpAGgoUAJilJAvt3rZ eHcgVhmM36joZwx2Vd9xoVy8GO7MF57C/J9cYqvEC6/FkMoCg/Xvw6HTuS2JOb94xBvo N53Wkpx+CUnCWY0SvaJCCugQgDMlkmzNljS6+c9aETrji/aECf2EjkVQIiyALFWZnwr2 ggqQ== Received: by 10.216.55.210 with SMTP id k60mr14239093wec.87.1342002745093; Wed, 11 Jul 2012 03:32:25 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id b7sm4047169wiz.9.2012.07.11.03.32.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 03:32:24 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 12:31:53 +0200 Message-Id: <1342002713-12628-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1342002713-12628-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342000687_250108@CP5-2952> <1342002713-12628-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnsP5nME8ESHWUgl4z3sgxKqYTAnVS0++HHeOXEVpknVUG4a6VA0l02Uhs8aj3A5Mo7JyM3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/2] drm/i915: kill intel_ddc_probe X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org We have way too much lying hardware to rely on a simple "does someone answer on the ddc i2c address?" check. And now it's unused, so just kill it. Signed-Off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_modes.c | 28 ---------------------------- 2 files changed, 29 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 6f3bf22..8435355 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -342,7 +342,6 @@ struct intel_fbc_work { }; int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); -extern bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus); extern void intel_attach_force_audio_property(struct drm_connector *connector); extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector); diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index d67ec3a..45848b9 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c @@ -33,34 +33,6 @@ #include "i915_drv.h" /** - * intel_ddc_probe - * - */ -bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus) -{ - struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private; - u8 out_buf[] = { 0x0, 0x0}; - u8 buf[2]; - struct i2c_msg msgs[] = { - { - .addr = DDC_ADDR, - .flags = 0, - .len = 1, - .buf = out_buf, - }, - { - .addr = DDC_ADDR, - .flags = I2C_M_RD, - .len = 1, - .buf = buf, - } - }; - - return i2c_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus), - msgs, 2) == 2; -} - -/** * intel_ddc_get_modes - get modelist from monitor * @connector: DRM connector device to use * @adapter: i2c adapter