From patchwork Tue Jul 28 10:01:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak M X-Patchwork-Id: 6882081 Return-Path: X-Original-To: patchwork-intel-gfx@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 5CF0CC05AC for ; Tue, 28 Jul 2015 09:56:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 45B0F20689 for ; Tue, 28 Jul 2015 09:56:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4452C2042B for ; Tue, 28 Jul 2015 09:56:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AAE6E72062; Tue, 28 Jul 2015 02:56:41 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id E8DF06E084 for ; Tue, 28 Jul 2015 02:56:39 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 28 Jul 2015 02:56:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,562,1432623600"; d="scan'208";a="614329462" Received: from mdeepakubuntudesk01-desktop.iind.intel.com ([10.223.25.91]) by orsmga003.jf.intel.com with ESMTP; 28 Jul 2015 02:56:39 -0700 From: Deepak M To: intel-gfx@lists.freedesktop.org Date: Tue, 28 Jul 2015 15:31:03 +0530 Message-Id: <1438077670-12953-3-git-send-email-m.deepak@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1438077670-12953-1-git-send-email-m.deepak@intel.com> References: <1438077670-12953-1-git-send-email-m.deepak@intel.com> Cc: Deepak M Subject: [Intel-gfx] [MIPI SEQ PARSING v1 PATCH 2/9] drm/i915: Parsing VBT if size of VBT exceeds 6KB 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=-5.6 required=5.0 tests=BAYES_00, 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 Currently the iomap for VBT works only if the size of the VBT is less than 6KB, but if the size of the VBT exceeds 6KB than the physical address and the size of the VBT to be iomapped is specified in the mailbox3 and is iomapped accordingly. Signed-off-by: Deepak M --- drivers/gpu/drm/i915/intel_bios.c | 13 +++++++---- drivers/gpu/drm/i915/intel_opregion.c | 39 ++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 2583587..1b9164e 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1219,6 +1219,7 @@ intel_parse_bios(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; struct pci_dev *pdev = dev->pdev; const struct bdb_header *bdb = NULL; + const struct vbt_header *vbt = NULL; u8 __iomem *bios = NULL; if (HAS_PCH_NOP(dev)) @@ -1226,10 +1227,14 @@ intel_parse_bios(struct drm_device *dev) init_vbt_defaults(dev_priv); - /* XXX Should this validation be moved to intel_opregion.c? */ - if (!dmi_check_system(intel_no_opregion_vbt) && dev_priv->opregion.vbt) - bdb = validate_vbt(dev_priv->opregion.header, OPREGION_SIZE, - dev_priv->opregion.vbt, "OpRegion"); + if (!dmi_check_system(intel_no_opregion_vbt) && + dev_priv->opregion.vbt) { + vbt = (struct vbt_header *)dev_priv->opregion.vbt; + bdb = (struct bdb_header *)(dev_priv->opregion.vbt + + vbt->bdb_offset); + DRM_DEBUG_KMS("Using VBT from Opregion: %20s\n", + vbt->signature); + } if (bdb == NULL) { size_t size; diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 71e87ab..1372e39 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -50,6 +50,7 @@ #define OPREGION_VBT_OFFSET 0x400 #define OPREGION_SIGNATURE "IntelGraphicsMem" +#define VBT_SIGNATURE "$VBT" #define MBOX_ACPI (1<<0) #define MBOX_SWSCI (1<<1) #define MBOX_ASLE (1<<2) @@ -113,7 +114,12 @@ struct opregion_asle { u32 pcft; /* power conservation features */ u32 srot; /* supported rotation angles */ u32 iuer; /* IUER events */ - u8 rsvd[86]; + u64 fdss; /* DSS Buffer address allocated for IFFS feature */ + u32 fdsp; /* Size of DSS Buffer */ + u32 stat; /* State Indicator */ + u64 rvda; /* Physical address of raw vbt data */ + u32 rvds; /* Size of raw vbt data */ + u8 rsvd[58]; } __packed; /* Driver readiness indicator */ @@ -858,8 +864,10 @@ int intel_opregion_setup(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_opregion *opregion = &dev_priv->opregion; void __iomem *base; + void __iomem *vbt_base; u32 asls, mboxes; char buf[sizeof(OPREGION_SIGNATURE)]; + char vbt_sig_buf[sizeof(VBT_SIGNATURE)]; int err = 0; pci_read_config_dword(dev->pdev, PCI_ASLS, &asls); @@ -873,7 +881,7 @@ int intel_opregion_setup(struct drm_device *dev) INIT_WORK(&opregion->asle_work, asle_work); #endif - base = acpi_os_ioremap(asls, OPREGION_SIZE); + base = acpi_os_ioremap(asls, OPREGION_VBT_OFFSET); if (!base) return -ENOMEM; @@ -884,8 +892,31 @@ int intel_opregion_setup(struct drm_device *dev) err = -EINVAL; goto err_out; } + opregion->header = base; - opregion->vbt = base + OPREGION_VBT_OFFSET; + opregion->asle = base + OPREGION_ASLE_OFFSET; + + if (opregion->header->opregion_ver >= 2) { + if (opregion->asle->rvda) + vbt_base = acpi_os_ioremap(opregion->asle->rvda, + opregion->asle->rvds); + else + vbt_base = acpi_os_ioremap(asls + OPREGION_VBT_OFFSET, + OPREGION_SIZE - OPREGION_VBT_OFFSET); + } else + vbt_base = acpi_os_ioremap(asls + OPREGION_VBT_OFFSET, + OPREGION_SIZE - OPREGION_VBT_OFFSET); + + + memcpy_fromio(vbt_sig_buf, vbt_base, sizeof(vbt_sig_buf)); + + if (memcmp(vbt_sig_buf, VBT_SIGNATURE, 4)) { + DRM_ERROR("VBT signature mismatch\n"); + err = -EINVAL; + goto err_vbt; + } + + opregion->vbt = vbt_base; opregion->lid_state = base + ACPI_CLID; @@ -909,6 +940,8 @@ int intel_opregion_setup(struct drm_device *dev) return 0; +err_vbt: + iounmap(vbt_base); err_out: iounmap(base); return err;