From patchwork Tue Jul 3 09:28:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1150401 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 27E593FE4F for ; Tue, 3 Jul 2012 10:58:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FA929F74F for ; Tue, 3 Jul 2012 03:58:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A2549F0F2 for ; Tue, 3 Jul 2012 03:35:04 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so4714410wgb.12 for ; Tue, 03 Jul 2012 03:35:04 -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=QBC6tFhCSmm3ZgwDUhB0og1WoWlMGJVRKhs5IfT7ljg=; b=iwsOiz1bEZ2IawwHHLbHR0qqlMRs1GrrO28WfRnnLEUYYVt//4mt7fsXnb7fKd9sk+ /oIL2v23t8mGJbshtW/ZtjHWhnPtnmXAS5o2fv4pJnCuWPHvWuendRctyAvx/6J8NYeU TGnycrziBsGf8kwYOYJ6TZWTwkfUni6yrTYJ8= 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=QBC6tFhCSmm3ZgwDUhB0og1WoWlMGJVRKhs5IfT7ljg=; b=OlYEevz3QfeYIGwgBiCGcFOMC2P9dlc4gWPjFUjhndz5BihNAG1xf/6n9Q8Kgr9aR0 SI8wqwcYPfcwY8PrfeduERFlvwkZc0MulLtkCKCBtSrUTh4dL+gPe4MuaRcFZ/r97qa6 Kpz7yipxchzwnW5Azd/eVMf71iGGDV5yauI/TM4FuxeOpKm+qPku+/TyGLpQWTZMxkyq WWMpMDrnGxOR75YzaWITwCQvi8TMkeAYzfpoftgIXgF/DphCeH2bE/5dgNooRwzA81Ox vN26I+rLy+N0Xx9c5H/cioIiBfWJ+CrGh6iXP+YhGJuXXEqRhEqKkyMLTcFZB/eZgadb M63Q== Received: by 10.180.14.8 with SMTP id l8mr24089700wic.6.1341311704766; Tue, 03 Jul 2012 03:35:04 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id e9sm14845138wiw.10.2012.07.03.03.35.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 03:35:04 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 3 Jul 2012 11:28:22 +0200 Message-Id: <1341307715-3886-31-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> References: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQm42wgqr1YgbLANIytHF9Pzb4RkKEur7gr6XEWeZBQm6iM8sAN7Ok3Xj0L9OGVUhK3PdZ5x Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 30/43] drm/i915: simplify intel_crtc_prepare_encoders 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 don't have the ->get_crtc callback. - Call intel_encoder->disable directly. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 574a610..fefa600 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6598,31 +6598,14 @@ intel_crtc_helper_disable(struct drm_crtc *crtc) } static void -intel_encoder_disable_helper(struct drm_encoder *encoder) -{ - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; - - if (encoder_funcs->disable) - (*encoder_funcs->disable)(encoder); - else - (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF); -} - -static void intel_crtc_prepare_encoders(struct drm_device *dev) { - struct drm_encoder_helper_funcs *encoder_funcs; - struct drm_encoder *encoder; + struct intel_encoder *encoder; - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { - encoder_funcs = encoder->helper_private; + list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) { /* Disable unused encoders */ - if (encoder->crtc == NULL) - intel_encoder_disable_helper(encoder); - /* Disable encoders whose CRTC is about to change */ - if (encoder_funcs->get_crtc && - encoder->crtc != (*encoder_funcs->get_crtc)(encoder)) - intel_encoder_disable_helper(encoder); + if (encoder->base.crtc == NULL) + encoder->disable(encoder); } }