From patchwork Thu Jul 16 12:20:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Hunter X-Patchwork-Id: 6806791 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 155AFC05AC for ; Thu, 16 Jul 2015 12:21:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 338AC206F7 for ; Thu, 16 Jul 2015 12:21:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 07B3220705 for ; Thu, 16 Jul 2015 12:21:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C41B6E4CA; Thu, 16 Jul 2015 05:21:09 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from pku.edu.cn (mx12.pku.edu.cn [162.105.129.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F97E6E5C6 for ; Thu, 16 Jul 2015 05:21:07 -0700 (PDT) Received: from localhost.localdomain (unknown [59.108.92.109]) by mailfront03 (Coremail) with SMTP id 84FpogBnb2ewoadV+QOQAA--.16013S10; Thu, 16 Jul 2015 20:21:05 +0800 (CST) From: John Hunter To: dri-devel@lists.freedesktop.org Subject: [PATCH 8/8] drm/bochs: atomic dpms support Date: Thu, 16 Jul 2015 20:20:41 +0800 Message-Id: <1437049241-11972-9-git-send-email-zhjwpku@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437049241-11972-1-git-send-email-zhjwpku@gmail.com> References: <1437049241-11972-1-git-send-email-zhjwpku@gmail.com> X-CM-TRANSID: 84FpogBnb2ewoadV+QOQAA--.16013S10 X-Coremail-Antispam: 1UD129KBjvJXoWxAw4DAF45XF45Zw1rXF1rCrg_yoW5WFW8pr ZxJFyfKr40qFy0ga48Xr17tan5urs8GF1xXw4kGw1fWa4SyryDXF4xAr18ua4UWa93Wrn8 KrnFqF48uF18CwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK67AK6ryUMxAIw28Icx kI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2Iq xVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42 IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8PfHUUUUUU== X-CM-SenderInfo: p2km411nx6wzxdlohudrp/ Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,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 From: Zhao Junwang - use ->disable() and ->enable() for crct and plane - use drm_atomic_helper_connector_dpms for connector Cc: Maarten Lankhorst Cc: Daniel Vetter Signed-off-by: Zhao Junwang --- drivers/gpu/drm/bochs/bochs_kms.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 599f367..eccd0a7 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -23,16 +23,20 @@ MODULE_PARM_DESC(defy, "default y resolution"); /* ---------------------------------------------------------------------- */ -static void bochs_crtc_dpms(struct drm_crtc *crtc, int mode) +static void bochs_crtc_enable(struct drm_crtc *crtc) { - switch (mode) { - case DRM_MODE_DPMS_ON: - case DRM_MODE_DPMS_STANDBY: - case DRM_MODE_DPMS_SUSPEND: - case DRM_MODE_DPMS_OFF: - default: + if (crtc->enabled) return; - } + + crtc->enabled = true; +} + +static void bochs_crtc_disable(struct drm_crtc *crtc) +{ + if (!crtc->enabled) + return; + + crtc->enabled = false; } static bool bochs_crtc_mode_fixup(struct drm_crtc *crtc, @@ -71,7 +75,8 @@ static const struct drm_crtc_funcs bochs_crtc_funcs = { }; static const struct drm_crtc_helper_funcs bochs_helper_funcs = { - .dpms = bochs_crtc_dpms, + .enable = bochs_crtc_enable, + .disable = bochs_crtc_disable, .mode_fixup = bochs_crtc_mode_fixup, .mode_set_nofb = bochs_crtc_mode_set_nofb, .commit = bochs_crtc_commit, @@ -204,7 +209,11 @@ static void bochs_encoder_mode_set(struct drm_encoder *encoder, { } -static void bochs_encoder_dpms(struct drm_encoder *encoder, int state) +static void bochs_encoder_enable(struct drm_encoder *encoder) +{ +} + +static void bochs_encoder_disable(struct drm_encoder *encoder) { } @@ -213,7 +222,8 @@ static void bochs_encoder_commit(struct drm_encoder *encoder) } static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = { - .dpms = bochs_encoder_dpms, + .enable = bochs_encoder_enable, + .disable = bochs_encoder_disable, .mode_fixup = bochs_encoder_mode_fixup, .mode_set = bochs_encoder_mode_set, .commit = bochs_encoder_commit, @@ -286,7 +296,7 @@ struct drm_connector_helper_funcs bochs_connector_connector_helper_funcs = { }; struct drm_connector_funcs bochs_connector_connector_funcs = { - .dpms = drm_helper_connector_dpms, + .dpms = drm_atomic_helper_connector_dpms, .detect = bochs_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup,