From patchwork Fri Jan 11 19:57:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 1967221 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 4F3833FF0F for ; Fri, 11 Jan 2013 20:12:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C3004BF23 for ; Fri, 11 Jan 2013 12:12:58 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ye0-f174.google.com (mail-ye0-f174.google.com [209.85.213.174]) by gabe.freedesktop.org (Postfix) with ESMTP id CED7F4374E for ; Fri, 11 Jan 2013 12:11:40 -0800 (PST) Received: by mail-ye0-f174.google.com with SMTP id m6so405695yen.19 for ; Fri, 11 Jan 2013 12:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=G/TrRhH02vIJFqRTrk2u154S7pjQ2v3+DqoHLykL8j4=; b=tbYSZQLCgj8jTk00ScohfJolOEqHoal+3gVHfPSQ9ffmJTYuV5xtAMyaUILFd0rKz3 m6JH1kUvmVJKsz1ZCfRUByaK0TRdIGLHm/w7oyKAXENJz0EiBdid4R+Y6C3npHMYIItb nxIm220gJZXjJQRYqbZiZ/SayrRlMlThvmZaoWXqQOrRvldtxQk8lhXU0OPSxSbnhL9+ Ca3KQi/IVk/kxm8gCib127sAWfmjIygJk1XUmJaBfeYYZWmblbwOpN59ilJBqEoQjv8x b3x6ovbT71Dgnkb+WYrpz0spTePFtvuSwB52q+u9nyC9ZBAMgtrI7WC4JrRe/rLZ1qpv trjg== X-Received: by 10.101.50.11 with SMTP id c11mr10966198ank.5.1357935100101; Fri, 11 Jan 2013 12:11:40 -0800 (PST) Received: from localhost.localdomain ([189.0.16.214]) by mx.google.com with ESMTPS id y17sm4630713ang.12.2013.01.11.12.11.34 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 11 Jan 2013 12:11:39 -0800 (PST) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Fri, 11 Jan 2013 17:57:54 -0200 Message-Id: <1357934277-3300-6-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357934277-3300-1-git-send-email-rodrigo.vivi@gmail.com> References: <1357934277-3300-1-git-send-email-rodrigo.vivi@gmail.com> Subject: [Intel-gfx] [PATCH 5/8] drm/i915: VBT Parsing for the PSR Feature Block for HSW X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org From: Shobhit Kumar Parse and store useful information in i915_dev_private Signed-off-by: Shobhit Kumar Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ drivers/gpu/drm/i915/intel_bios.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_bios.h | 20 +++++++++++++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d2b93a4..6cb3439 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -751,6 +751,14 @@ typedef struct drm_i915_private { } edp; bool no_aux_handshake; + + /* PSR related info from VBT */ + u8 full_link_state; + u8 wait_lines; + u8 idle_frames; + u16 wakeup_tp1; + u16 wakeup_tp2_tp3; + int crt_ddc_pin; struct drm_i915_fence_reg fence_regs[I915_MAX_NUM_FENCES]; /* assume 965 */ int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 87e9b92..a5fa3c4 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -381,6 +381,35 @@ parse_general_definitions(struct drm_i915_private *dev_priv, } } + +static void +parse_edp_psr(struct drm_i915_private *dev_priv, struct bdb_header *bdb) +{ + struct bdb_psr_features *psr; + struct bdb_lvds_options *lvds_opts; + int index = 0; + lvds_opts = find_section(bdb, BDB_LVDS_OPTIONS); + if (!lvds_opts) { + DRM_DEBUG_KMS("No LVDS Options block found.\n"); + return; + } + + index = lvds_opts->panel_type; + + psr = find_section(bdb, BDB_PSR_FEATURES); + if (!psr) { + DRM_DEBUG_KMS("No PSR feature block found.\n"); + return; + } + + dev_priv->full_link_state = psr[index].link_disable; + dev_priv->wait_lines = psr[index].wait_lines; + dev_priv->idle_frames = psr[index].idle_frames; + dev_priv->wakeup_tp1 = psr[index].wakeup_tp1; + dev_priv->wakeup_tp2_tp3 = psr[index].wakeup_tp2; +} + + static void parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, struct bdb_header *bdb) @@ -747,6 +776,7 @@ intel_parse_bios(struct drm_device *dev) parse_device_mapping(dev_priv, bdb); parse_driver_features(dev_priv, bdb); parse_edp(dev_priv, bdb); + parse_edp_psr(dev_priv, bdb); if (bios) pci_unmap_rom(pdev, bios); diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index 36e57f9..c1d39de 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h @@ -80,7 +80,7 @@ struct vbios_data { #define BDB_EXT_MMIO_REGS 6 #define BDB_SWF_IO 7 #define BDB_SWF_MMIO 8 -#define BDB_DOT_CLOCK_TABLE 9 +#define BDB_PSR_FEATURES 9 #define BDB_MODE_REMOVAL_TABLE 10 #define BDB_CHILD_DEVICE_TABLE 11 #define BDB_DRIVER_FEATURES 12 @@ -263,6 +263,24 @@ struct bdb_lvds_options { u8 rsvd4; } __attribute__((packed)); +struct bdb_psr_features { + /* psr_enable byte */ + u8 link_disable:1; + u8 require_aux:1; + u8 rsvd1:6; + + /* panel wait times */ + u8 idle_frames:4; + u8 wait_lines:3; + u8 rsvd2:1; + + /* TP1 wakeup time */ + u16 wakeup_tp1; + + /* TP2 wakeup time */ + u16 wakeup_tp2; +} __attribute__((packed)); + /* LFP pointer table contains entries to the struct below */ struct bdb_lvds_lfp_data_ptr { u16 fp_timing_offset; /* offsets are from start of bdb */