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

Commit 2d1f4c8e 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:
 "Fixes for intel and nouveau mainly.

   - intel: disable HSW by default, sdvo fixes, link train regression
     fix
   - nouveau: acpi rom loading regression fix, with a few other fixes
     from the rework
   -core: just other minor fixes and race fixes for ttm."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
  drm/ttm: Fix a theoretical race in ttm_bo_cleanup_refs()
  drm/ttm: Fix a theoretical race
  drm: platform: Don't initialize driver-private data
  drm/debugfs: remove redundant info from gem_names
  drm: fb: cma: Fail gracefully on allocation failure
  drm: fb: cma: Fix typo in debug message
  drm/nouveau/clock: fix missing pll type/addr when matching default entry
  drm/nouveau/fb: fix reporting of memory type on GF8+ IGPs
  drm/nv41/vm: don't init hw pciegart on boards with agp bridge
  drm/nouveau/bios: fetch full 4KiB block to determine ACPI ROM image size
  drm/nouveau: validate vbios size
  drm/nouveau: warn when trying to free mm which is still in use
  drm/nouveau: fix nouveau_mm/nouveau_mm_node leak
  drm/nouveau/bios: improve error handling when reading the vbios from ACPI
  drm/nouveau: handle same-fb page flips
  drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle()
  drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
  drm/i915: Insert i915_preliminary_hw_support variable.
  drm/i915: shut up spurious WARN in the gtt fault handler
  Revert "drm/i915: Try harder to complete DP training pattern 1"
  ...
parents d888af96 b8e902f2

drivers/gpu/drm/drm_fb_cma_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, 
	size_t size;

	int ret;



	DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d\n",

	DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d)\n",

			sizes->surface_width, sizes->surface_height,

			sizes->surface_bpp);
@@ -220,7 +220,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, 


	size = mode_cmd.pitches[0] * mode_cmd.height;

	obj = drm_gem_cma_create(dev, size);

	if (!obj)

	if (IS_ERR(obj))

		return -ENOMEM;



	fbi = framebuffer_alloc(0, dev->dev);

drivers/gpu/drm/drm_info.c

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ static int drm_gem_one_name_info(int id, void *ptr, void *data) 
	struct drm_gem_object *obj = ptr;

	struct seq_file *m = data;



	seq_printf(m, "name %d size %zd\n", obj->name, obj->size);



	seq_printf(m, "%6d %8zd %7d %8d\n",

		   obj->name, obj->size,

		   atomic_read(&obj->handle_count),

drivers/gpu/drm/drm_platform.c

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ int drm_get_platform_dev(struct platform_device *platdev, 
	}



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		dev_set_drvdata(&platdev->dev, dev);

		ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);

		if (ret)

			goto err_g1;

drivers/gpu/drm/i915/i915_drv.c

+13 −0
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0600); 
MODULE_PARM_DESC(i915_enable_ppgtt,

		"Enable PPGTT (default: true)");



unsigned int i915_preliminary_hw_support __read_mostly = 0;

module_param_named(preliminary_hw_support, i915_preliminary_hw_support, int, 0600);

MODULE_PARM_DESC(preliminary_hw_support,

		"Enable preliminary hardware support. "

		"Enable Haswell and ValleyView Support. "

		"(default: false)");



static struct drm_driver driver;

extern int intel_agp_enabled;
@@ -826,6 +833,12 @@ i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct intel_device_info *intel_info =

		(struct intel_device_info *) ent->driver_data;



	if (intel_info->is_haswell || intel_info->is_valleyview)

		if(!i915_preliminary_hw_support) {

			DRM_ERROR("Preliminary hardware support disabled\n");

			return -ENODEV;

		}



	/* Only bind to function 0 of the device. Early generations

	 * used function 1 as a placeholder for multi-head. This causes

	 * us confusion instead, especially on the systems where both

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,7 @@ extern int i915_enable_rc6 __read_mostly; 
extern int i915_enable_fbc __read_mostly;

extern bool i915_enable_hangcheck __read_mostly;

extern int i915_enable_ppgtt __read_mostly;

extern unsigned int i915_preliminary_hw_support __read_mostly;



extern int i915_suspend(struct drm_device *dev, pm_message_t state);

extern int i915_resume(struct drm_device *dev);