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

Commit 06d1ee32 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:
 "I got a bit behind last week, so here is a delayed fixes pull:

   - a bunch of radeon/amd gpu fixes
   - some nouveau regression fixes (ppc bios reading and runtime pm fix)
   - one drm core oops fix
   - two qxl locking fixes
   - one qxl regression fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/bios: fix OF loading
  drm/nouveau/fbcon: take runpm reference when userspace has an open fd
  drm/nouveau/nouveau: Disable AGP for SiS 761
  drm/nouveau/display: allow up to 16k width/height for fermi+
  drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
  drm: Fix locking for sysfs dpms file
  drm/amdgpu: fix memory leak in amdgpu_vm_update_page_directory
  drm/amdgpu: fix 32-bit compiler warning
  drm/qxl: avoid dependency lock
  drm/qxl: avoid buffer reservation in qxl_crtc_page_flip
  drm/qxl: fix framebuffer dirty rectangle tracking.
  drm/amdgpu: flag iceland as experimental
  drm/amdgpu: check before checking pci bridge registers
  drm/amdgpu: fix num_crtc on CZ
  drm/amdgpu: restore the fbdev mode in lastclose
  drm/radeon: restore the fbdev mode in lastclose
  drm/radeon: add quirk for ASUS R7 370
  drm/amdgpu: add pm sysfs files late
  drm/radeon: add pm sysfs files late
parents 25cb62b7 7b98040a

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) 


	/* get chunks */

	INIT_LIST_HEAD(&p->validated);

	chunk_array_user = (uint64_t __user *)(cs->in.chunks);

	chunk_array_user = (uint64_t __user *)(unsigned long)(cs->in.chunks);

	if (copy_from_user(chunk_array, chunk_array_user,

			   sizeof(uint64_t)*cs->in.num_chunks)) {

		ret = -EFAULT;
@@ -197,7 +197,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) 
		struct drm_amdgpu_cs_chunk user_chunk;

		uint32_t __user *cdata;



		chunk_ptr = (void __user *)chunk_array[i];

		chunk_ptr = (void __user *)(unsigned long)chunk_array[i];

		if (copy_from_user(&user_chunk, chunk_ptr,

				       sizeof(struct drm_amdgpu_cs_chunk))) {

			ret = -EFAULT;
@@ -208,7 +208,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) 
		p->chunks[i].length_dw = user_chunk.length_dw;



		size = p->chunks[i].length_dw;

		cdata = (void __user *)user_chunk.chunk_data;

		cdata = (void __user *)(unsigned long)user_chunk.chunk_data;

		p->chunks[i].user_ptr = cdata;



		p->chunks[i].kdata = drm_malloc_ab(size, sizeof(uint32_t));

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -242,11 +242,11 @@ static struct pci_device_id pciidlist[] = { 
	{0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU},

#endif

	/* topaz */

	{0x1002, 0x6900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ},

	{0x1002, 0x6901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ},

	{0x1002, 0x6902, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ},

	{0x1002, 0x6903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ},

	{0x1002, 0x6907, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ},

	{0x1002, 0x6900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x6901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x6902, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x6903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x6907, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ|AMD_EXP_HW_SUPPORT},

	/* tonga */

	{0x1002, 0x6920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA},

	{0x1002, 0x6921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA},

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+16 −0
Original line number Diff line number Diff line
@@ -402,3 +402,19 @@ bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj) 
		return true;

	return false;

}



void amdgpu_fbdev_restore_mode(struct amdgpu_device *adev)

{

	struct amdgpu_fbdev *afbdev = adev->mode_info.rfbdev;

	struct drm_fb_helper *fb_helper;

	int ret;



	if (!afbdev)

		return;



	fb_helper = &afbdev->helper;



	ret = drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);

	if (ret)

		DRM_DEBUG("failed to restore crtc mode\n");

}

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+4 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
 * Outdated mess for old drm with Xorg being in charge (void function now).

 */

/**

 * amdgpu_driver_firstopen_kms - drm callback for last close

 * amdgpu_driver_lastclose_kms - drm callback for last close

 *

 * @dev: drm dev pointer

 *
@@ -493,6 +493,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
 */

void amdgpu_driver_lastclose_kms(struct drm_device *dev)

{

	struct amdgpu_device *adev = dev->dev_private;



	amdgpu_fbdev_restore_mode(adev);

	vga_switcheroo_process_delayed_switch();

}

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev); 
void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state);

int amdgpu_fbdev_total_size(struct amdgpu_device *adev);

bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj);

void amdgpu_fbdev_restore_mode(struct amdgpu_device *adev);



void amdgpu_fb_output_poll_changed(struct amdgpu_device *adev);