From patchwork Wed Jul 11 14:28:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1183681 Return-Path: X-Original-To: patchwork-dri-devel@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 A2F0F3FC8E for ; Wed, 11 Jul 2012 15:53:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C6AEA0E6D for ; Wed, 11 Jul 2012 08:53:57 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 7411F9EF0B for ; Wed, 11 Jul 2012 08:35:40 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so946426wgb.12 for ; Wed, 11 Jul 2012 08:35:40 -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=LhwxbqAJe5ByNtmLsj/cCH9Q34dxPUSAX6BmQJonvz8=; b=k8F5DjaipSRibCT3yhuPrevPo/Yw9kR8qLMSB7O7v9wBrlmLbyFifflJ30aNX9L3pl 43gmKJzlL8BnA+QiJXF2wHb49k5J+OIptKs/SG8eMiA+C7U9GRiWjncn3FIVWGvinZAQ O6JYG4rBrJ1R50iGcy0V2YFJ5+dfhtbB8JBjg= 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=LhwxbqAJe5ByNtmLsj/cCH9Q34dxPUSAX6BmQJonvz8=; b=KZS/KEBX/G/BiVSbZWsYXrZZnrg5iegZiyxi7ZIf2xH5H3xhPFZLgwQUNxCskSQ+Sh +nIP8Xxezxvemp83AFxf6agcspFOrsPNOJnN1um4V2hkwYFkxTs9TXYU82M+3nnwhzsJ lwXSosF7wmeImB5kaw5k2yl2XLOdTqIS978wfEB6w9ffUw1MqgMpCTb4VWyTHBHpB/Be Ghv/zNF+YXUPUCphcKiSd1d93oV104lRNATYSxaK+2snfDcKXkyDR3PfiG8ljZSfIWkw NtRxYYLv2aGDzrC1srfSH3IrEXRk3DdxD0iQ6zUheKneMaYsX1sD8cZk2U2nAPA9J+UK EXsw== Received: by 10.180.105.130 with SMTP id gm2mr48144000wib.6.1342020939854; Wed, 11 Jul 2012 08:35:39 -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 bc2sm5777080wib.0.2012.07.11.08.35.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:35:39 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Subject: [PATCH 24/81] drm/fb helper: don't call drm_crtc_helper_set_config Date: Wed, 11 Jul 2012 16:28:07 +0200 Message-Id: <1342016944-23395-25-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnrrY5wN7spFerATAiZKSDdX/Bi4QRckXYr34c2i1ir0SZ2GpDRVHy21TOVF3rXmVAx6U6a Cc: Daniel Vetter , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Go through the interface vtable instead, because not everyone might be using the crtc helper code. Cc: dri-devel@lists.freedesktop.org Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/drm_fb_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 5683b7f..bf97c0a 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -228,7 +228,7 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper) int i, ret; for (i = 0; i < fb_helper->crtc_count; i++) { struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set; - ret = drm_crtc_helper_set_config(mode_set); + ret = mode_set->crtc->funcs->set_config(mode_set); if (ret) error = true; }