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

Commit 35541782 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Dave Airlie
Browse files

drm/qxl: support 64bit surface bar 



qxl devices can have a 64bit surface bar, which is quite handy if
you need a bit more surface memory.  So try to use it if it is
present.  Note that this bar might be mapped above 4g.

QEMU command line to check that out:

    qemu-system-x86_64 -m 4g \
        -vga qxl -global qxl-vga.vram64_size_mb=512 \
        $otheroptions

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 121a6a17

drivers/gpu/drm/qxl/qxl_kms.c

+25 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int qxl_device_init(struct qxl_device *qdev, 
		    struct pci_dev *pdev,

		    unsigned long flags)

{

	int r;

	int r, sb;



	qdev->dev = &pdev->dev;

	qdev->ddev = ddev;
@@ -136,21 +136,39 @@ int qxl_device_init(struct qxl_device *qdev, 
	qdev->rom_base = pci_resource_start(pdev, 2);

	qdev->rom_size = pci_resource_len(pdev, 2);

	qdev->vram_base = pci_resource_start(pdev, 0);

	qdev->surfaceram_base = pci_resource_start(pdev, 1);

	qdev->surfaceram_size = pci_resource_len(pdev, 1);

	qdev->io_base = pci_resource_start(pdev, 3);



	qdev->vram_mapping = io_mapping_create_wc(qdev->vram_base, pci_resource_len(pdev, 0));

	qdev->surface_mapping = io_mapping_create_wc(qdev->surfaceram_base, qdev->surfaceram_size);

	DRM_DEBUG_KMS("qxl: vram %llx-%llx(%dM %dk), surface %llx-%llx(%dM %dk)\n",



	if (pci_resource_len(pdev, 4) > 0) {

		/* 64bit surface bar present */

		sb = 4;

		qdev->surfaceram_base = pci_resource_start(pdev, sb);

		qdev->surfaceram_size = pci_resource_len(pdev, sb);

		qdev->surface_mapping =

			io_mapping_create_wc(qdev->surfaceram_base,

					     qdev->surfaceram_size);

	}

	if (qdev->surface_mapping == NULL) {

		/* 64bit surface bar not present (or mapping failed) */

		sb = 1;

		qdev->surfaceram_base = pci_resource_start(pdev, sb);

		qdev->surfaceram_size = pci_resource_len(pdev, sb);

		qdev->surface_mapping =

			io_mapping_create_wc(qdev->surfaceram_base,

					     qdev->surfaceram_size);

	}



	DRM_DEBUG_KMS("qxl: vram %llx-%llx(%dM %dk), surface %llx-%llx(%dM %dk, %s)\n",

		 (unsigned long long)qdev->vram_base,

		 (unsigned long long)pci_resource_end(pdev, 0),

		 (int)pci_resource_len(pdev, 0) / 1024 / 1024,

		 (int)pci_resource_len(pdev, 0) / 1024,

		 (unsigned long long)qdev->surfaceram_base,

		 (unsigned long long)pci_resource_end(pdev, 1),

		 (unsigned long long)pci_resource_end(pdev, sb),

		 (int)qdev->surfaceram_size / 1024 / 1024,

		 (int)qdev->surfaceram_size / 1024);

		 (int)qdev->surfaceram_size / 1024,

		 (sb == 4) ? "64bit" : "32bit");



	qdev->rom = ioremap(qdev->rom_base, qdev->rom_size);

	if (!qdev->rom) {