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

Commit d8524ae9 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:
 - some small fixes for msm and exynos
 - a regression revert affecting nouveau users with old userspace
 - intel pageflip deadlock and gpu hang fixes, hsw modesetting hangs

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (22 commits)
  Revert "drm: mark context support as a legacy subsystem"
  drm/i915: Don't enable the cursor on a disable pipe
  drm/i915: do not update cursor in crtc mode set
  drm/exynos: fix return value check in lowlevel_buffer_allocate()
  drm/exynos: Fix address space warnings in exynos_drm_fbdev.c
  drm/exynos: Fix address space warning in exynos_drm_buf.c
  drm/exynos: Remove redundant OF dependency
  drm/msm: drop unnecessary set_need_resched()
  drm/i915: kill set_need_resched
  drm/msm: fix potential NULL pointer dereference
  drm/i915/dvo: set crtc timings again for panel fixed modes
  drm/i915/sdvo: Robustify the dtd<->drm_mode conversions
  drm/msm: workaround for missing irq
  drm/msm: return -EBUSY if bo still active
  drm/msm: fix return value check in ERR_PTR()
  drm/msm: fix cmdstream size check
  drm/msm: hangcheck harder
  drm/msm: handle read vs write fences
  drm/i915/sdvo: Fully translate sync flags in the dtd->mode conversion
  drm/i915: Use proper print format for debug prints
  ...
parents 68cf8d0c 6ddf2ed6

drivers/gpu/drm/drm_context.c

+8 −65
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ 


#include <drm/drmP.h>



/******************************************************************/

/** \name Context bitmap support */

/*@{*/



/**

 * Free a handle from the context bitmap.

 *
@@ -52,48 +56,13 @@ 
 * in drm_device::ctx_idr, while holding the drm_device::struct_mutex

 * lock.

 */

static void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)

void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)

{

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return;



	mutex_lock(&dev->struct_mutex);

	idr_remove(&dev->ctx_idr, ctx_handle);

	mutex_unlock(&dev->struct_mutex);

}



/******************************************************************/

/** \name Context bitmap support */

/*@{*/



void drm_legacy_ctxbitmap_release(struct drm_device *dev,

				  struct drm_file *file_priv)

{

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return;



	mutex_lock(&dev->ctxlist_mutex);

	if (!list_empty(&dev->ctxlist)) {

		struct drm_ctx_list *pos, *n;



		list_for_each_entry_safe(pos, n, &dev->ctxlist, head) {

			if (pos->tag == file_priv &&

			    pos->handle != DRM_KERNEL_CONTEXT) {

				if (dev->driver->context_dtor)

					dev->driver->context_dtor(dev,

								  pos->handle);



				drm_ctxbitmap_free(dev, pos->handle);



				list_del(&pos->head);

				kfree(pos);

				--dev->ctx_count;

			}

		}

	}

	mutex_unlock(&dev->ctxlist_mutex);

}



/**

 * Context bitmap allocation.

 *
@@ -121,12 +90,10 @@ static int drm_ctxbitmap_next(struct drm_device * dev) 
 *

 * Initialise the drm_device::ctx_idr

 */

void drm_legacy_ctxbitmap_init(struct drm_device * dev)

int drm_ctxbitmap_init(struct drm_device * dev)

{

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return;



	idr_init(&dev->ctx_idr);

	return 0;

}



/**
@@ -137,7 +104,7 @@ void drm_legacy_ctxbitmap_init(struct drm_device * dev) 
 * Free all idr members using drm_ctx_sarea_free helper function

 * while holding the drm_device::struct_mutex lock.

 */

void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)

void drm_ctxbitmap_cleanup(struct drm_device * dev)

{

	mutex_lock(&dev->struct_mutex);

	idr_destroy(&dev->ctx_idr);
@@ -169,9 +136,6 @@ int drm_getsareactx(struct drm_device *dev, void *data, 
	struct drm_local_map *map;

	struct drm_map_list *_entry;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->struct_mutex);



	map = idr_find(&dev->ctx_idr, request->ctx_id);
@@ -216,9 +180,6 @@ int drm_setsareactx(struct drm_device *dev, void *data, 
	struct drm_local_map *map = NULL;

	struct drm_map_list *r_list = NULL;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->struct_mutex);

	list_for_each_entry(r_list, &dev->maplist, head) {

		if (r_list->map
@@ -319,9 +280,6 @@ int drm_resctx(struct drm_device *dev, void *data, 
	struct drm_ctx ctx;

	int i;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	if (res->count >= DRM_RESERVED_CONTEXTS) {

		memset(&ctx, 0, sizeof(ctx));

		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
@@ -352,9 +310,6 @@ int drm_addctx(struct drm_device *dev, void *data, 
	struct drm_ctx_list *ctx_entry;

	struct drm_ctx *ctx = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	ctx->handle = drm_ctxbitmap_next(dev);

	if (ctx->handle == DRM_KERNEL_CONTEXT) {

		/* Skip kernel's context and get a new one. */
@@ -398,9 +353,6 @@ int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv) 
{

	struct drm_ctx *ctx = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	/* This is 0, because we don't handle any context flags */

	ctx->flags = 0;
@@ -423,9 +375,6 @@ int drm_switchctx(struct drm_device *dev, void *data, 
{

	struct drm_ctx *ctx = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	DRM_DEBUG("%d\n", ctx->handle);

	return drm_context_switch(dev, dev->last_context, ctx->handle);

}
@@ -446,9 +395,6 @@ int drm_newctx(struct drm_device *dev, void *data, 
{

	struct drm_ctx *ctx = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	DRM_DEBUG("%d\n", ctx->handle);

	drm_context_switch_complete(dev, file_priv, ctx->handle);
@@ -471,9 +417,6 @@ int drm_rmctx(struct drm_device *dev, void *data, 
{

	struct drm_ctx *ctx = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	DRM_DEBUG("%d\n", ctx->handle);

	if (ctx->handle != DRM_KERNEL_CONTEXT) {

		if (dev->driver->context_dtor)

drivers/gpu/drm/drm_fops.c

+20 −1
Original line number Diff line number Diff line
@@ -439,7 +439,26 @@ int drm_release(struct inode *inode, struct file *filp) 
	if (dev->driver->driver_features & DRIVER_GEM)

		drm_gem_release(dev, file_priv);



	drm_legacy_ctxbitmap_release(dev, file_priv);

	mutex_lock(&dev->ctxlist_mutex);

	if (!list_empty(&dev->ctxlist)) {

		struct drm_ctx_list *pos, *n;



		list_for_each_entry_safe(pos, n, &dev->ctxlist, head) {

			if (pos->tag == file_priv &&

			    pos->handle != DRM_KERNEL_CONTEXT) {

				if (dev->driver->context_dtor)

					dev->driver->context_dtor(dev,

								  pos->handle);



				drm_ctxbitmap_free(dev, pos->handle);



				list_del(&pos->head);

				kfree(pos);

				--dev->ctx_count;

			}

		}

	}

	mutex_unlock(&dev->ctxlist_mutex);



	mutex_lock(&dev->struct_mutex);

drivers/gpu/drm/drm_stub.c

+8 −2
Original line number Diff line number Diff line
@@ -292,7 +292,13 @@ int drm_fill_in_dev(struct drm_device *dev, 
			goto error_out_unreg;

	}



	drm_legacy_ctxbitmap_init(dev);





	retcode = drm_ctxbitmap_init(dev);

	if (retcode) {

		DRM_ERROR("Cannot allocate memory for context bitmap.\n");

		goto error_out_unreg;

	}



	if (driver->driver_features & DRIVER_GEM) {

		retcode = drm_gem_init(dev);
@@ -446,7 +452,7 @@ void drm_put_dev(struct drm_device *dev) 
		drm_rmmap(dev, r_list->map);

	drm_ht_remove(&dev->map_hash);



	drm_legacy_ctxbitmap_cleanup(dev);

	drm_ctxbitmap_cleanup(dev);



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		drm_put_minor(&dev->control);

drivers/gpu/drm/exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ config DRM_EXYNOS_IPP 


config DRM_EXYNOS_FIMC

	bool "Exynos DRM FIMC"

	depends on DRM_EXYNOS_IPP && MFD_SYSCON && OF

	depends on DRM_EXYNOS_IPP && MFD_SYSCON

	help

	  Choose this option if you want to use Exynos FIMC for DRM.

drivers/gpu/drm/exynos/exynos_drm_buf.c

+4 −3
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ static int lowlevel_buffer_allocate(struct drm_device *dev, 
			return -ENOMEM;

		}



		buf->kvaddr = dma_alloc_attrs(dev->dev, buf->size,

		buf->kvaddr = (void __iomem *)dma_alloc_attrs(dev->dev,

					buf->size,

					&buf->dma_addr, GFP_KERNEL,

					&buf->dma_attrs);

		if (!buf->kvaddr) {
@@ -90,9 +91,9 @@ static int lowlevel_buffer_allocate(struct drm_device *dev, 
	}



	buf->sgt = drm_prime_pages_to_sg(buf->pages, nr_pages);

	if (!buf->sgt) {

	if (IS_ERR(buf->sgt)) {

		DRM_ERROR("failed to get sg table.\n");

		ret = -ENOMEM;

		ret = PTR_ERR(buf->sgt);

		goto err_free_attrs;

	}