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

Commit 75fa29c7 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 i915, nouveau and radeon:

   - i915: haswell stability, modeset rework fallout, ums fix
   - nouveau: misc fixes from code rework
   - radeon: pll rework fixes, more 2 level PTE cleanups.
   - core: warning fixes on 32-bit."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
  nouveau: fix warning on 32-bit build.
  drm/nouveau/bios: fix typo in error message
  drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP
  drm/nv50/fb: fix double free of vram mm
  drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
  drm/nouveau/pm: fix a typo related to the move to the therm subdev
  drm/nouveau/hwmon: fix the initialization condition
  drm: fix warning on 32-bit.
  drm: radeon: fix printk format warning
  drm/radeon: fix spelling typos in debugging output
  drm/radeon: Don't destroy I2C Bus Rec in radeon_ext_tmds_enc_destroy().
  drm/radeon: check if pcie gen 2 is already enabled (v2)
  drm/radeon/cayman: set VM max pfn at MC init
  drm/radeon: separate pt alloc from lru add
  drm/radeon: don't add the IB pool to all VMs v2
  drm/radeon: allocate page tables on demand v4
  drm/radeon: update comments to clarify VM setup (v2)
  drm/radeon: allocate PPLLs from low to high
  drm/radeon: fix compilation with backlight disabled
  drm/radeon: use %zu for formatting size_t
  ...
parents 5d5c5dca 8a00b6af

drivers/char/agp/intel-gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static int intel_gtt_init(void) 
	gtt_map_size = intel_private.base.gtt_total_entries * 4;



	intel_private.gtt = NULL;

	if (INTEL_GTT_GEN < 6)

	if (INTEL_GTT_GEN < 6 && INTEL_GTT_GEN > 2)

		intel_private.gtt = ioremap_wc(intel_private.gtt_bus_addr,

					       gtt_map_size);

	if (intel_private.gtt == NULL)

drivers/gpu/drm/drm_info.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ int drm_vma_info(struct seq_file *m, void *data) 
	mutex_lock(&dev->struct_mutex);

	seq_printf(m, "vma use count: %d, high_memory = %pK, 0x%pK\n",

		   atomic_read(&dev->vma_count),

		   high_memory, (void *)virt_to_phys(high_memory));

		   high_memory, (void *)(unsigned long)virt_to_phys(high_memory));



	list_for_each_entry(pt, &dev->vmalist, head) {

		vma = pt->vma;

drivers/gpu/drm/i915/dvo_ch7xxx.c

+3 −3
Original line number Diff line number Diff line
@@ -303,10 +303,10 @@ static bool ch7xxx_get_hw_state(struct intel_dvo_device *dvo) 


	ch7xxx_readb(dvo, CH7xxx_PM, &val);



	if (val & CH7xxx_PM_FPD)

		return false;

	else

	if (val & (CH7xxx_PM_DVIL | CH7xxx_PM_DVIP))

		return true;

	else

		return false;

}



static void ch7xxx_dump_regs(struct intel_dvo_device *dvo)

drivers/gpu/drm/i915/i915_drv.h

+7 −2
Original line number Diff line number Diff line
@@ -1341,9 +1341,14 @@ int __must_check i915_gem_object_get_pages(struct drm_i915_gem_object *obj); 
static inline struct page *i915_gem_object_get_page(struct drm_i915_gem_object *obj, int n)

{

	struct scatterlist *sg = obj->pages->sgl;

	while (n >= SG_MAX_SINGLE_ALLOC) {

	int nents = obj->pages->nents;

	while (nents > SG_MAX_SINGLE_ALLOC) {

		if (n < SG_MAX_SINGLE_ALLOC - 1)

			break;



		sg = sg_chain_ptr(sg + SG_MAX_SINGLE_ALLOC - 1);

		n -= SG_MAX_SINGLE_ALLOC - 1;

		nents -= SG_MAX_SINGLE_ALLOC - 1;

	}

	return sg_page(sg+n);

}
@@ -1427,7 +1432,7 @@ int __must_check i915_gpu_idle(struct drm_device *dev); 
int __must_check i915_gem_idle(struct drm_device *dev);

int i915_add_request(struct intel_ring_buffer *ring,

		     struct drm_file *file,

		     struct drm_i915_gem_request *request);

		     u32 *seqno);

int __must_check i915_wait_seqno(struct intel_ring_buffer *ring,

				 uint32_t seqno);

int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

drivers/gpu/drm/i915/i915_gem.c

+11 −8
Original line number Diff line number Diff line
@@ -1955,11 +1955,12 @@ i915_gem_next_request_seqno(struct intel_ring_buffer *ring) 
int

i915_add_request(struct intel_ring_buffer *ring,

		 struct drm_file *file,

		 struct drm_i915_gem_request *request)

		 u32 *out_seqno)

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	uint32_t seqno;

	struct drm_i915_gem_request *request;

	u32 request_ring_position;

	u32 seqno;

	int was_empty;

	int ret;
@@ -1974,11 +1975,9 @@ i915_add_request(struct intel_ring_buffer *ring, 
	if (ret)

		return ret;



	if (request == NULL) {

	request = kmalloc(sizeof(*request), GFP_KERNEL);

	if (request == NULL)

		return -ENOMEM;

	}



	seqno = i915_gem_next_request_seqno(ring);
@@ -2030,6 +2029,8 @@ i915_add_request(struct intel_ring_buffer *ring, 
		}

	}



	if (out_seqno)

		*out_seqno = seqno;

	return 0;

}
@@ -3959,6 +3960,9 @@ i915_gem_init_hw(struct drm_device *dev) 
	if (!intel_enable_gtt())

		return -EIO;



	if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1))

		I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000);



	i915_gem_l3_remap(dev);



	i915_gem_init_swizzling(dev);
@@ -4098,7 +4102,6 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, 
	}



	BUG_ON(!list_empty(&dev_priv->mm.active_list));

	BUG_ON(!list_empty(&dev_priv->mm.inactive_list));

	mutex_unlock(&dev->struct_mutex);



	ret = drm_irq_install(dev);