From patchwork Thu Jul 9 20:04:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6758651 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 10D119F319 for ; Thu, 9 Jul 2015 20:02:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECE6A206F7 for ; Thu, 9 Jul 2015 20:02:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F0D5F205EE for ; Thu, 9 Jul 2015 20:02:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 656E56ED36; Thu, 9 Jul 2015 13:02:27 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 382426ED3C for ; Thu, 9 Jul 2015 13:02:24 -0700 (PDT) Received: by wgjx7 with SMTP id x7so232275759wgj.2 for ; Thu, 09 Jul 2015 13:02:23 -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:in-reply-to:references; bh=DQ6rhO8J8RTmU5EDRxRRcnxVS8Qa9i4Cl0tKbemDqH8=; b=UA63286NnKTvEu5lISJZFrAnajdf0i5kF2Mj3iBzIC3lWM+adVLLLxjQjZ2gXnMWRS rPaUjbfxYCOIkvTV3AWzS1QyBRxJs6IrP7sikyyN1NeJJwAj+rtgVnCvDEptKEwOOD0a 1JiPKqQNJaCB7roakXEz2PIaOwGoM60C9l/7M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DQ6rhO8J8RTmU5EDRxRRcnxVS8Qa9i4Cl0tKbemDqH8=; b=PLh2egeTdtaL068hi8l5pT2pPByVRwoU3N0QSod8E03FiZwaI/NGh5wMSsoWxvVIYf tlRBCU1Tij/Y9WO6/jlTO3Owvhww1cTh8WOjHd5k1Bj2r/f+s5tnVlm5wES+GonmyK/H EnzzaO0DymYzXof6iAkN8UpOPqcj9FNgs0QSpu1TsjihQoVD42DkYA6QxCDi+AJB1OzB tZ4pWQ3K44Qv+Vn6fCns5Z3v9UtTsXLrfYCuZutV7X7AMOlG7vcI2gUfONMji42+UUX1 vjaaBnNL4x2mWf7NBFUlqfLNAUdi7jaf4CB7Mir1LPihYcJBegJor+VcOPJVfvSz5Y/C Kj+g== X-Gm-Message-State: ALoCoQm1/6g8w64FDaZlfWY3jScoKT4n9XqTIxoTlqztnwVcopVA3jlAtVVoC1X7ZzhdlkWpMaK1 X-Received: by 10.180.210.234 with SMTP id mx10mr89127551wic.42.1436472143023; Thu, 09 Jul 2015 13:02:23 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id i5sm9807972wic.10.2015.07.09.13.02.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 13:02:21 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 9 Jul 2015 22:04:45 +0200 Message-Id: <1436472288-595-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436472288-595-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436365487-19242-1-git-send-email-animesh.manna@intel.com> <1436472288-595-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH 09/12] drm/i915: Use dev_priv in csr functions 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 It's the new style! Cc: Animesh Manna Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 6 +++--- drivers/gpu/drm/i915/i915_drv.c | 4 +--- drivers/gpu/drm/i915/intel_csr.c | 27 +++++++++++---------------- drivers/gpu/drm/i915/intel_drv.h | 6 +++--- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 1d1a3bb51bf2..3cb5afef64c3 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -841,7 +841,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_uncore_init(dev); /* Load CSR Firmware for SKL */ - intel_csr_ucode_init(dev); + intel_csr_ucode_init(dev_priv); ret = i915_gem_gtt_init(dev); if (ret) @@ -1016,7 +1016,7 @@ out_mtrrfree: out_gtt: i915_global_gtt_cleanup(dev); out_freecsr: - intel_csr_ucode_fini(dev); + intel_csr_ucode_fini(dev_priv); intel_uncore_fini(dev); pci_iounmap(dev->pdev, dev_priv->regs); put_bridge: @@ -1097,7 +1097,7 @@ int i915_driver_unload(struct drm_device *dev) intel_fbc_cleanup_cfb(dev_priv); i915_gem_cleanup_stolen(dev); - intel_csr_ucode_fini(dev); + intel_csr_ucode_fini(dev_priv); intel_teardown_gmbus(dev); intel_teardown_mchbar(dev); diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index adc3502068d1..7dfe9136c86f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1045,10 +1045,8 @@ static int bxt_resume_prepare(struct drm_i915_private *dev_priv) static int skl_resume_prepare(struct drm_i915_private *dev_priv) { - struct drm_device *dev = dev_priv->dev; - skl_init_cdclk(dev_priv); - intel_csr_load_program(dev); + intel_csr_load_program(dev_priv); return 0; } diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index b87d5dfc04ce..d46f8110e72a 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -185,19 +185,18 @@ static char intel_get_substepping(struct drm_device *dev) /** * intel_csr_load_program() - write the firmware from memory to register. - * @dev: drm device. + * @dev_priv: i915 drm device. * * CSR firmware is read from a .bin file and kept in internal memory one time. * Everytime display comes back from low power state this function is called to * copy the firmware from internal memory to registers. */ -void intel_csr_load_program(struct drm_device *dev) +void intel_csr_load_program(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = dev->dev_private; uint32_t *payload = dev_priv->csr.dmc_payload; uint32_t i, fw_size; - if (!IS_GEN9(dev)) { + if (!IS_GEN9(dev_priv)) { DRM_ERROR("No CSR support available for this platform\n"); return; } @@ -332,7 +331,6 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, static void finish_csr_load(const struct firmware *fw, void *context) { struct drm_i915_private *dev_priv = context; - struct drm_device *dev = dev_priv->dev; if (!fw) goto out; @@ -341,7 +339,7 @@ static void finish_csr_load(const struct firmware *fw, void *context) if (!dev_priv->csr.dmc_payload) goto out; - intel_csr_load_program(dev); + intel_csr_load_program(dev_priv); DRM_DEBUG_KMS("Finished loading %s\n", dev_priv->csr.fw_path); out: @@ -360,21 +358,20 @@ out: /** * intel_csr_ucode_init() - initialize the firmware loading. - * @dev: drm device. + * @dev_priv: i915 drm device. * * This function is called at the time of loading the display driver to read * firmware from a .bin file and copied into a internal memory. */ -void intel_csr_ucode_init(struct drm_device *dev) +void intel_csr_ucode_init(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = dev->dev_private; struct intel_csr *csr = &dev_priv->csr; int ret; - if (!HAS_CSR(dev)) + if (!HAS_CSR(dev_priv)) return; - if (IS_SKYLAKE(dev)) + if (IS_SKYLAKE(dev_priv)) csr->fw_path = I915_CSR_SKL; DRM_DEBUG_KMS("Loading %s\n", csr->fw_path); @@ -394,16 +391,14 @@ void intel_csr_ucode_init(struct drm_device *dev) /** * intel_csr_ucode_fini() - unload the CSR firmware. - * @dev: drm device. + * @dev_priv: i915 drm device. * * Firmmware unloading includes freeing the internal momory and reset the * firmware loading status. */ -void intel_csr_ucode_fini(struct drm_device *dev) +void intel_csr_ucode_fini(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = dev->dev_private; - - if (!HAS_CSR(dev)) + if (!HAS_CSR(dev_priv)) return; kfree(dev_priv->csr.dmc_payload); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 094a223238eb..b22bded5b439 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1162,9 +1162,9 @@ u32 skl_plane_ctl_tiling(uint64_t fb_modifier); u32 skl_plane_ctl_rotation(unsigned int rotation); /* intel_csr.c */ -void intel_csr_ucode_init(struct drm_device *dev); -void intel_csr_load_program(struct drm_device *dev); -void intel_csr_ucode_fini(struct drm_device *dev); +void intel_csr_ucode_init(struct drm_i915_private *); +void intel_csr_load_program(struct drm_i915_private *); +void intel_csr_ucode_fini(struct drm_i915_private *); /* intel_dp.c */ void intel_dp_init(struct drm_device *dev, int output_reg, enum port port);