From patchwork Thu Jul 26 18:48:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1244931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id E95ADDFFCE for ; Thu, 26 Jul 2012 20:20:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ACD4FA0EEC for ; Thu, 26 Jul 2012 13:20:46 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 8893D9E790 for ; Thu, 26 Jul 2012 12:56:41 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hq4so5480612wib.12 for ; Thu, 26 Jul 2012 12:56:41 -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=kCMw8lc8zR2HD2qvegGqGb/syWWg3MxVYWAt58R4g2k=; b=dDhMnURDCspXps1pkXAZ0Up9MGEiX7t7Rhp5qoI1AB2cL+ncZERD/c39eNqlcBHQwu IhVla8TQeDTQn/xRsnX5uMc3y69PNSgxEtbLACpF1dwAqZZitYNUY0zvr6hUAp8+/0Eo UcR/f4ljBq/E0cp4rTK4Yrsc3mS/79nV8Jul0= 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=kCMw8lc8zR2HD2qvegGqGb/syWWg3MxVYWAt58R4g2k=; b=oDPRRUn6gnU7tFPE6NXdx3Lq3BdNZBs7r2XVeQYZiu6eaFcrihqdVc3XdhNmM4Cob1 C7mqVd4FDRvzpDJrvMo4vubcl8tCId2f3vC844u+hKvKRKK5rXExouPRk9L/97FC+Piu w8ZUqIIS4fwcjj6QZxBIELwoWcIBLsDb/midUu4zb5lx1yJh2opEnj/XNSBVA9L03jfv 9Rdt2LEi68K3X8QjPEjFWyTJajCawc02dNvlIU0w/5wGb746CHeOUSVENI0A4b0njGyL Yo8myfgk2LUdne0b97UVKDwmD+RsUsvD/Jwg3Zpfpl1QiVQsvJg3/OBVgi5P/hmWWlE/ VMSg== Received: by 10.180.79.69 with SMTP id h5mr158183wix.6.1343332601273; Thu, 26 Jul 2012 12:56:41 -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 fr4sm391403wib.8.2012.07.26.12.56.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:56:40 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:48:51 +0200 Message-Id: <1343328581-2324-27-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQl1y4Gxgk/m2r4SDnm8KkDAJpPgtRu3rtI+rlxYXk5NG1bbBqUDWhD8rab1XYamFiM0XZW6 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 26/76] 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 file changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 098fee3..aac21a3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6563,31 +6563,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); } }