From patchwork Mon May 23 14:08:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9131879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F2C31607D3 for ; Mon, 23 May 2016 14:08:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E947F281E3 for ; Mon, 23 May 2016 14:08:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDE702822B; Mon, 23 May 2016 14:08:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BF63281E3 for ; Mon, 23 May 2016 14:08:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8680D6E2B6; Mon, 23 May 2016 14:08:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3801289B95 for ; Mon, 23 May 2016 14:08:19 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id 67so15493886wmg.0 for ; Mon, 23 May 2016 07:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q5nXAI+MSoQuxMkz0llKCaiOMmR9guON/tIdXiJ8IYo=; b=LCTi/IQM/IeCf5dcijjj3QbcCAGYU1O8xIhX8zVEjEJp0d5XCLC5ACmi/t3ie6rxlQ 0R9KYSiB0PFNWXGBynuwcX2JR0hnXYTtPR/Tk9Js4Eo2JiETfcS6bIjm59Er0k+UIkV7 jfirseT9E0xjo3SUHDXMDfSS9fvCjRJNPnT8e3O41Miwb8+on0txVBU/u8YTfbBW3err j5efes25OB++flVW3kneLiv7sJM9CiItlIDhmkQ57Azx3oXE6HQVzWoCx/nsK354xha4 NDRYBTBb9/FOuvXPfJW3/QuxhQ5kIili0QOqAUfSl3O7XLUWAlKWQqcdX+nLmtvNHZJC qAVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Q5nXAI+MSoQuxMkz0llKCaiOMmR9guON/tIdXiJ8IYo=; b=CBtJEDRCudP+mO4KQgUBe4HKUpCDYlgwSuvDIbCefVyYlDtzDNLsoYL5Sz4PYGxt8P /qfHYhPmyW3GhNt3o1XtypropgrHrjtqXbFgDNqMi5keV+Cmc3WxA8qnBPY/KrOKF4Ma GP1pMs6B7JqlaHM2GeghiOEZj6kYTdD44pNJHiZr1GiFfN32zrLzvjOtHOkunc3nUXNz orOyn7TihvzKOwGZmbsjsemF0E7Y8nf+kLw6x/Cw864HKKRZLif2k6uHvBCUtQZv558l 7rVx17PKci1BRo/OcQP5hifLDXEBPwR+jTXglcOM4tKWX1+laBQzGGCEOrVHhF61q+/4 e+NQ== X-Gm-Message-State: AOPr4FV/xvFBi5XDO67wIGoIJ0C9W7fvCShHt9QXudlJ80TiWBOs2K9GiaI2pPXF1ZY+QA== X-Received: by 10.194.216.65 with SMTP id oo1mr16075013wjc.97.1464012497363; Mon, 23 May 2016 07:08:17 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id k127sm13953965wmf.21.2016.05.23.07.08.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2016 07:08:16 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 23 May 2016 15:08:10 +0100 Message-Id: <1464012490-30961-2-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464012490-30961-1-git-send-email-chris@chris-wilson.co.uk> References: <1464012490-30961-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 2/2] drm/i915/opregion: Rename init/fini functions to register/unregister X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Current intel_opregion_init is called during the driver registration phase and intel_opregion_fini from the unregistration phase. Rename the functions show that this is clear from their names. The phases tell us what we expect the existing hw state to be, e.g. whether interrupts are still enabled etc. Signed-off-by: Chris Wilson Cc: Jani Nikula Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/i915_dma.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/intel_opregion.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 363bd5884a56..07edaed9d5a2 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1376,7 +1376,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) if (INTEL_INFO(dev_priv)->num_pipes) { /* Must be done after probing outputs */ - intel_opregion_init(dev_priv); + intel_opregion_register(dev_priv); acpi_video_register(); } @@ -1395,7 +1395,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv) i915_audio_component_cleanup(dev_priv); intel_gpu_ips_teardown(); acpi_video_unregister(); - intel_opregion_fini(dev_priv); + intel_opregion_unregister(dev_priv); i915_teardown_sysfs(dev_priv->dev); i915_gem_shrinker_cleanup(dev_priv); } diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 7627bbec8e37..943d7b222fd4 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -631,7 +631,7 @@ static int i915_drm_suspend(struct drm_device *dev) intel_opregion_notify_adapter(dev_priv, opregion_target_state); intel_uncore_forcewake_reset(dev_priv, false); - intel_opregion_fini(dev_priv); + intel_opregion_unregister(dev_priv); intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true); @@ -794,7 +794,7 @@ static int i915_drm_resume(struct drm_device *dev) /* Config may have changed between suspend and resume */ drm_helper_hpd_irq_event(dev); - intel_opregion_init(dev_priv); + intel_opregion_register(dev_priv); intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index caf7e45ae663..17fe272e9ef8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3609,8 +3609,8 @@ bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv, /* intel_opregion.c */ #ifdef CONFIG_ACPI extern int intel_opregion_setup(struct drm_i915_private *dev_priv); -extern void intel_opregion_init(struct drm_i915_private *dev_priv); -extern void intel_opregion_fini(struct drm_i915_private *dev_priv); +extern void intel_opregion_register(struct drm_i915_private *dev_priv); +extern void intel_opregion_unregister(struct drm_i915_private *dev_priv); extern void intel_opregion_asle_intr(struct drm_i915_private *dev_priv); extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, bool enable); diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index f9cdec866e49..f6d8a21d2c49 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -778,7 +778,7 @@ static void intel_setup_cadls(struct drm_i915_private *dev_priv) } while (++i < 8 && disp_id != 0); } -void intel_opregion_init(struct drm_i915_private *dev_priv) +void intel_opregion_register(struct drm_i915_private *dev_priv) { struct intel_opregion *opregion = &dev_priv->opregion; @@ -805,7 +805,7 @@ void intel_opregion_init(struct drm_i915_private *dev_priv) } } -void intel_opregion_fini(struct drm_i915_private *dev_priv) +void intel_opregion_unregister(struct drm_i915_private *dev_priv) { struct intel_opregion *opregion = &dev_priv->opregion;