From: Jike Song Subject: [RFC PATCH 6/8] drm/i915: redirect GTT accesses to vgt if enabled Date: Tue, 30 Sep 2014 18:05:36 +0800 Message-ID: <1412071538-19059-7-git-send-email-jike.song@intel.com> References: <1412071538-19059-1-git-send-email-jike.song@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 905246E8A3 for ; Tue, 30 Sep 2014 03:11:40 -0700 (PDT) In-Reply-To: <1412071538-19059-1-git-send-email-jike.song@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Signed-off-by: Jike Song --- drivers/gpu/drm/i915/i915_drv.h | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 051442e..742fe8a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3077,27 +3077,54 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val); #define GTT_READ32(addr) \ ({ \ - u32 ret = readl(addr); \ - ret; \ + off_t reg = (unsigned long)(addr) - \ + (unsigned long)(dev_priv->gtt.gsm); \ + u32 __ret = 0; \ + if (i915.enable_vgt) \ + vgt_emulate_host_read(reg, &__ret, sizeof(u32), \ + true, false); \ + else \ + __ret = readl(addr); \ + __ret; \ }) #define GTT_READ64(addr) \ ({ \ - u64 ret = readq(addr); \ - ret; \ + off_t reg = (unsigned long)(addr) - \ + (unsigned long)(dev_priv->gtt.gsm); \ + u64 __ret = 0; \ + if (i915.enable_vgt) \ + vgt_emulate_host_read(reg, &__ret, sizeof(u64), \ + true, false); \ + else \ + __ret = readq(addr); \ + __ret; \ }) #define GTT_WRITE32(val, addr) \ ({ \ - writel((val), (addr)); \ + off_t reg = (unsigned long)(addr) - \ + (unsigned long)(dev_priv->gtt.gsm); \ + u32 __val = (val); \ + if (i915.enable_vgt) \ + vgt_emulate_host_write(reg, &__val, sizeof(u32), \ + true, false); \ + else \ + writel((val), (addr)); \ }) #define GTT_WRITE64(val, addr) \ ({ \ - writeq((val), (addr)); \ + off_t reg = (unsigned long)(addr) - \ + (unsigned long)(dev_priv->gtt.gsm); \ + u64 __val = (val); \ + if (i915.enable_vgt) \ + vgt_emulate_host_write(reg, &__val, sizeof(u64), \ + true, false); \ + else \ + writeq((val), (addr)); \ }) - /* "Broadcast RGB" property */ #define INTEL_BROADCAST_RGB_AUTO 0 #define INTEL_BROADCAST_RGB_FULL 1 -- 1.9.1