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

Commit 3ded7acf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of fixes:
   - vmware memory corruption
   - ttm spinlock balance
   - cirrus/mgag200 work in the presence of efifb
  and finally Alex and Jerome managed to track down a magic set of bits
  that on certain rv740 and evergreen cards allow the correct use of the
  complete set of render backends, this makes the cards operate
  correctly in a number of scenarios we had issues in before, it also
  manages to boost speed on benchmarks my large amounts on these
  specific gpus."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/edid: Make the header fixup threshold tunable
  drm/radeon: fix regression in UMS CS ioctl
  drm/vmwgfx: Fix nasty write past alloced memory area
  drm/ttm: Fix spinlock imbalance
  drm/radeon: fixup tiling group size and backendmap on r6xx-r9xx (v4)
  drm/radeon: fix HD6790, HD6570 backend programming
  drm/radeon: properly program gart on rv740, juniper, cypress, barts, hemlock
  drm/radeon: fix bank information in tiling config
  drm/mgag200: kick off conflicting framebuffers earlier.
  drm/cirrus: kick out conflicting framebuffers earlier
  cirrus: avoid crash if driver fails to load
parents 37b22400 47819ba2

drivers/gpu/drm/cirrus/cirrus_drv.c

+19 −0
Original line number Diff line number Diff line
@@ -35,9 +35,28 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { 
	{0,}

};





static void cirrus_kick_out_firmware_fb(struct pci_dev *pdev)

{

	struct apertures_struct *ap;

	bool primary = false;



	ap = alloc_apertures(1);

	ap->ranges[0].base = pci_resource_start(pdev, 0);

	ap->ranges[0].size = pci_resource_len(pdev, 0);



#ifdef CONFIG_X86

	primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;

#endif

	remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary);

	kfree(ap);

}



static int __devinit

cirrus_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	cirrus_kick_out_firmware_fb(pdev);



	return drm_get_pci_dev(pdev, ent, &driver);

}

drivers/gpu/drm/cirrus/cirrus_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct cirrus_device { 
		struct ttm_bo_device bdev;

		atomic_t validate_sequence;

	} ttm;



	bool mm_inited;

};

drivers/gpu/drm/cirrus/cirrus_ttm.c

+5 −0
Original line number Diff line number Diff line
@@ -275,12 +275,17 @@ int cirrus_mm_init(struct cirrus_device *cirrus) 
				    pci_resource_len(dev->pdev, 0),

				    DRM_MTRR_WC);



	cirrus->mm_inited = true;

	return 0;

}



void cirrus_mm_fini(struct cirrus_device *cirrus)

{

	struct drm_device *dev = cirrus->dev;



	if (!cirrus->mm_inited)

		return;



	ttm_bo_device_release(&cirrus->ttm.bdev);



	cirrus_ttm_global_release(cirrus);

drivers/gpu/drm/drm_edid.c

+9 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/i2c.h>

#include <linux/export.h>

#include <linux/module.h>

#include "drmP.h"

#include "drm_edid.h"

#include "drm_edid_modes.h"
@@ -149,6 +149,10 @@ int drm_edid_header_is_valid(const u8 *raw_edid) 
}

EXPORT_SYMBOL(drm_edid_header_is_valid);



static int edid_fixup __read_mostly = 6;

module_param_named(edid_fixup, edid_fixup, int, 0400);

MODULE_PARM_DESC(edid_fixup,

		 "Minimum number of valid EDID header bytes (0-8, default 6)");



/*

 * Sanity check the EDID block (base or extension).  Return 0 if the block
@@ -160,10 +164,13 @@ bool drm_edid_block_valid(u8 *raw_edid, int block) 
	u8 csum = 0;

	struct edid *edid = (struct edid *)raw_edid;



	if (edid_fixup > 8 || edid_fixup < 0)

		edid_fixup = 6;



	if (block == 0) {

		int score = drm_edid_header_is_valid(raw_edid);

		if (score == 8) ;

		else if (score >= 6) {

		else if (score >= edid_fixup) {

			DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");

			memcpy(raw_edid, edid_header, sizeof(edid_header));

		} else {

drivers/gpu/drm/mgag200/mgag200_drv.c

+19 −0
Original line number Diff line number Diff line
@@ -41,9 +41,28 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { 


MODULE_DEVICE_TABLE(pci, pciidlist);



static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev)

{

	struct apertures_struct *ap;

	bool primary = false;



	ap = alloc_apertures(1);

	ap->ranges[0].base = pci_resource_start(pdev, 0);

	ap->ranges[0].size = pci_resource_len(pdev, 0);



#ifdef CONFIG_X86

	primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;

#endif

	remove_conflicting_framebuffers(ap, "mgag200drmfb", primary);

	kfree(ap);

}





static int __devinit

mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	mgag200_kick_out_firmware_fb(pdev);



	return drm_get_pci_dev(pdev, ent, &driver);

}