From patchwork Tue Jul 16 19:34:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 2828303 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AE332C0AB2 for ; Tue, 16 Jul 2013 20:06:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D36CC2024A for ; Tue, 16 Jul 2013 20:06:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A07262022A for ; Tue, 16 Jul 2013 20:06:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82BA4E6614 for ; Tue, 16 Jul 2013 13:06:16 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 29C95E65F6 for ; Tue, 16 Jul 2013 12:34:35 -0700 (PDT) Received: by mail-lb0-f171.google.com with SMTP id 13so934825lba.30 for ; Tue, 16 Jul 2013 12:34:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=5VlrKxpNs4Ji6sXDz1kND7P7NfHF6wRseXv2NfqhgvU=; b=Q6mo+o44Cd02QGnXd9NQUPMqH9+9MfoX9W4ZW1K007gat8sfiiHW0YQ0IYOCfTNbWq /D1B/d69cn/wdmdCCJxhZDVMldcP+XP3l1ZvDHzt464uO4ivOQrBvPSjfJ5s8vQ6QNxJ 8Awfc28sDnYz487RoTdnFbLMTUVM6T7W3m7ai5Z+UYYkZEY5IAg0e97S/G9VAEIuJmFW LbUJ6rHfCQAlgVbf31YEBiC6WH3DAvSZdsOuOfUrwPeCTUaRcjoY2qSeXIidfj2P7EWb KZAx58SbYij/9dTdO9g7cE5WPS5fAlU66N2DrwNkhLIbiiG3qa1zeHCKBnbBfwkIW6Ra yLZw== X-Received: by 10.112.28.7 with SMTP id x7mr1831427lbg.7.1374003274916; Tue, 16 Jul 2013 12:34:34 -0700 (PDT) Received: from patrik-cedarview.lan (h138n8-oer-a32.ias.bredband.telia.com. [2.248.103.138]) by mx.google.com with ESMTPSA id 8sm1581822lbq.4.2013.07.16.12.34.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Jul 2013 12:34:34 -0700 (PDT) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 30/30] drm/gma500/cdv: Convert to generic set_config() Date: Tue, 16 Jul 2013 21:34:03 +0200 Message-Id: <1374003243-15888-31-git-send-email-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 1.8.1.2 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 X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Patrik Jakobsson --- drivers/gpu/drm/gma500/cdv_intel_display.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c index b84912f..6bca1fe 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_display.c +++ b/drivers/gpu/drm/gma500/cdv_intel_display.c @@ -19,7 +19,6 @@ */ #include -#include #include #include "framebuffer.h" @@ -867,24 +866,6 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, return 0; } -static int cdv_crtc_set_config(struct drm_mode_set *set) -{ - int ret = 0; - struct drm_device *dev = set->crtc->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - - if (!dev_priv->rpm_enabled) - return drm_crtc_helper_set_config(set); - - pm_runtime_forbid(&dev->pdev->dev); - - ret = drm_crtc_helper_set_config(set); - - pm_runtime_allow(&dev->pdev->dev); - - return ret; -} - /** Derive the pixel clock for the given refclk and divisors for 8xx chips. */ /* FIXME: why are we using this, should it be cdv_ in this tree ? */ @@ -1040,7 +1021,7 @@ const struct drm_crtc_funcs cdv_intel_crtc_funcs = { .cursor_set = gma_crtc_cursor_set, .cursor_move = gma_crtc_cursor_move, .gamma_set = gma_crtc_gamma_set, - .set_config = cdv_crtc_set_config, + .set_config = gma_crtc_set_config, .destroy = gma_crtc_destroy, };