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

Commit 9813527a authored by Dave Airlie's avatar Dave Airlie
Browse files

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

* 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: bump driver version for some new features
  drm/amdgpu: validate paramaters in the gem ioctl
  drm/amd/amdgpu: fix console deadlock if late init failed
parents 31aec642 a5b11dac

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

+4 −1
Original line number Diff line number Diff line
@@ -2094,8 +2094,11 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 
	}



	r = amdgpu_late_init(adev);

	if (r)

	if (r) {

		if (fbcon)

			console_unlock();

		return r;

	}



	/* pin cursors */

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

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

+2 −1
Original line number Diff line number Diff line
@@ -59,9 +59,10 @@ 
 * - 3.7.0 - Add support for VCE clock list packet

 * - 3.8.0 - Add support raster config init in the kernel

 * - 3.9.0 - Add support for memory query info about VRAM and GTT.

 * - 3.10.0 - Add support for new fences ioctl, new gem ioctl flags

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	9

#define KMS_DRIVER_MINOR	10

#define KMS_DRIVER_PATCHLEVEL	0



int amdgpu_vram_limit = 0;

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

+21 −0
Original line number Diff line number Diff line
@@ -202,6 +202,27 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
	bool kernel = false;

	int r;



	/* reject invalid gem flags */

	if (args->in.domain_flags & ~(AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				      AMDGPU_GEM_CREATE_NO_CPU_ACCESS |

				      AMDGPU_GEM_CREATE_CPU_GTT_USWC |

				      AMDGPU_GEM_CREATE_VRAM_CLEARED|

				      AMDGPU_GEM_CREATE_SHADOW |

				      AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)) {

		r = -EINVAL;

		goto error_unlock;

	}

	/* reject invalid gem domains */

	if (args->in.domains & ~(AMDGPU_GEM_DOMAIN_CPU |

				 AMDGPU_GEM_DOMAIN_GTT |

				 AMDGPU_GEM_DOMAIN_VRAM |

				 AMDGPU_GEM_DOMAIN_GDS |

				 AMDGPU_GEM_DOMAIN_GWS |

				 AMDGPU_GEM_DOMAIN_OA)) {

		r = -EINVAL;

		goto error_unlock;

	}



	/* create a gem object to contain this object in */

	if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |

	    AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {