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

Commit a93e4161 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: generalize pte vs. register BAR allocation 



All gen6+ parts so far have 1 BAR which holds both the register space
and the GTT PTEs. Up until now, that was a 4MB BAR with half allocated
to each.

I have a strong hunch (wink, nod, wink) that future gens will also keep
a similar 50-50 split though the sizes may change. To help this along
change the code to obey the rule of half the total size instead of a
hard-coded 2MB.

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4615d4c9

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -738,8 +738,10 @@ static int gen6_gmch_probe(struct drm_device *dev, 




	*gtt_total = (gtt_size / sizeof(gtt_pte_t)) << PAGE_SHIFT;

	*gtt_total = (gtt_size / sizeof(gtt_pte_t)) << PAGE_SHIFT;





	/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */

	/* For Modern GENs the PTEs and register space are split in the BAR */

	gtt_bus_addr = pci_resource_start(dev->pdev, 0) + (2<<20);

	gtt_bus_addr = pci_resource_start(dev->pdev, 0) +

		(pci_resource_len(dev->pdev, 0) / 2);



	dev_priv->gtt.gsm = ioremap_wc(gtt_bus_addr, gtt_size);

	dev_priv->gtt.gsm = ioremap_wc(gtt_bus_addr, gtt_size);

	if (!dev_priv->gtt.gsm) {

	if (!dev_priv->gtt.gsm) {

		DRM_ERROR("Failed to map the gtt page table\n");

		DRM_ERROR("Failed to map the gtt page table\n");