Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab75bb5d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Turn vgpu pdps into an array 



We'll want to avoid performing arithmetic with register offsets, so
instead calculating the vgpu PDP as pdp0_lo+offset, make the PDPs
into an array. This way we can simply loop through them.

Cc: Eddie Dong <eddie.dong@intel.com>
Cc: Jike Song <jike.song@intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Yu Zhang <yu.c.zhang@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Cc: Zhiyuan Lv <zhiyuan.lv@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446672017-24497-25-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarZhiyuan Lv <zhiyuan.lv@intel.com>
parent 0d925ea0

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −7
Original line number Diff line number Diff line
@@ -910,14 +910,13 @@ static int gen8_ppgtt_notify_vgt(struct i915_hw_ppgtt *ppgtt, bool create) 
	enum vgt_g2v_type msg;

	struct drm_device *dev = ppgtt->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned int offset = vgtif_reg(pdp0_lo);

	int i;



	if (USES_FULL_48BIT_PPGTT(dev)) {

		u64 daddr = px_dma(&ppgtt->pml4);



		I915_WRITE(offset, lower_32_bits(daddr));

		I915_WRITE(offset + 4, upper_32_bits(daddr));

		I915_WRITE(vgtif_reg(pdp[0].lo), lower_32_bits(daddr));

		I915_WRITE(vgtif_reg(pdp[0].hi), upper_32_bits(daddr));



		msg = (create ? VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE :

				VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY);
@@ -925,10 +924,8 @@ static int gen8_ppgtt_notify_vgt(struct i915_hw_ppgtt *ppgtt, bool create) 
		for (i = 0; i < GEN8_LEGACY_PDPES; i++) {

			u64 daddr = i915_page_dir_dma_addr(ppgtt, i);



			I915_WRITE(offset, lower_32_bits(daddr));

			I915_WRITE(offset + 4, upper_32_bits(daddr));



			offset += 8;

			I915_WRITE(vgtif_reg(pdp[i].lo), lower_32_bits(daddr));

			I915_WRITE(vgtif_reg(pdp[i].hi), upper_32_bits(daddr));

		}



		msg = (create ? VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE :

drivers/gpu/drm/i915/i915_vgpu.h

+4 −8
Original line number Diff line number Diff line
@@ -92,14 +92,10 @@ struct vgt_if { 
	uint32_t g2v_notify;

	uint32_t rsv6[7];



	uint32_t pdp0_lo;

	uint32_t pdp0_hi;

	uint32_t pdp1_lo;

	uint32_t pdp1_hi;

	uint32_t pdp2_lo;

	uint32_t pdp2_hi;

	uint32_t pdp3_lo;

	uint32_t pdp3_hi;

	struct {

		uint32_t lo;

		uint32_t hi;

	} pdp[4];



	uint32_t execlist_context_descriptor_lo;

	uint32_t execlist_context_descriptor_hi;