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

Commit d65d3138 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2017-11-07' of... 

Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Fixes for 4.15 merge window:

Just the cherry-picked vc4 fix plus a GFP_NOFAIL annotation (there's
apparently some new options in-flight to change/audit
too-small-to-fail kmalloc semantics or something like that).

* tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/vc4: Fix wrong printk format in vc4_bo_stats_debugfs()
  drm: Require __GFP_NOFAIL for the legacy drm_modeset_lock_all
parents 8a6fb5b5 e073db5c

drivers/gpu/drm/drm_modeset_lock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ void drm_modeset_lock_all(struct drm_device *dev) 
	struct drm_modeset_acquire_ctx *ctx;

	struct drm_modeset_acquire_ctx *ctx;

	int ret;

	int ret;





	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL | __GFP_NOFAIL);

	if (WARN_ON(!ctx))

	if (WARN_ON(!ctx))

		return;

		return;

drivers/gpu/drm/vc4/vc4_bo.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -88,11 +88,11 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *unused) 




	mutex_lock(&vc4->purgeable.lock);

	mutex_lock(&vc4->purgeable.lock);

	if (vc4->purgeable.num)

	if (vc4->purgeable.num)

		seq_printf(m, "%30s: %6dkb BOs (%d)\n", "userspace BO cache",

		seq_printf(m, "%30s: %6zdkb BOs (%d)\n", "userspace BO cache",

			   vc4->purgeable.size / 1024, vc4->purgeable.num);

			   vc4->purgeable.size / 1024, vc4->purgeable.num);





	if (vc4->purgeable.purged_num)

	if (vc4->purgeable.purged_num)

		seq_printf(m, "%30s: %6dkb BOs (%d)\n", "total purged BO",

		seq_printf(m, "%30s: %6zdkb BOs (%d)\n", "total purged BO",

			   vc4->purgeable.purged_size / 1024,

			   vc4->purgeable.purged_size / 1024,

			   vc4->purgeable.purged_num);

			   vc4->purgeable.purged_num);

	mutex_unlock(&vc4->purgeable.lock);

	mutex_unlock(&vc4->purgeable.lock);