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

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

Merge branch 'msm-fixes-3.12-rc2' of git://people.freedesktop.org/~robclark/linux into drm-fixes 

A small fix + deal with fallout of iommu changes + use new
drm_gem_dumb_destroy helper.

* 'msm-fixes-3.12-rc2' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: use drm_gem_dumb_destroy helper
  drm/msm: deal with mach/iommu.h removal
  drm/msm: Remove iommu include from mdp4_kms.c
  drm/msm: Odd PTR_ERR usage
parents 41ed7fe9 30600a90

drivers/gpu/drm/msm/mdp4/mdp4_kms.c

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include "msm_drv.h"

#include "mdp4_kms.h"



#include <mach/iommu.h>



static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev);



static int mdp4_hw_init(struct msm_kms *kms)

drivers/gpu/drm/msm/msm_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include "msm_drv.h"

#include "msm_gpu.h"



#include <mach/iommu.h>



static void msm_fb_output_poll_changed(struct drm_device *dev)

{

	struct msm_drm_private *priv = dev->dev_private;
@@ -62,6 +60,8 @@ int msm_iommu_attach(struct drm_device *dev, struct iommu_domain *iommu, 
	int i, ret;



	for (i = 0; i < cnt; i++) {

		/* TODO maybe some day msm iommu won't require this hack: */

		struct device *msm_iommu_get_ctx(const char *ctx_name);

		struct device *ctx = msm_iommu_get_ctx(names[i]);

		if (!ctx)

			continue;
@@ -199,7 +199,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags) 
		 * imx drm driver on iMX5

		 */

		dev_err(dev->dev, "failed to load kms\n");

		ret = PTR_ERR(priv->kms);

		ret = PTR_ERR(kms);

		goto fail;

	}
@@ -697,7 +697,7 @@ static struct drm_driver msm_driver = { 
	.gem_vm_ops         = &vm_ops,

	.dumb_create        = msm_gem_dumb_create,

	.dumb_map_offset    = msm_gem_dumb_map_offset,

	.dumb_destroy       = msm_gem_dumb_destroy,

	.dumb_destroy       = drm_gem_dumb_destroy,

#ifdef CONFIG_DEBUG_FS

	.debugfs_init       = msm_debugfs_init,

	.debugfs_cleanup    = msm_debugfs_cleanup,

drivers/gpu/drm/msm/msm_gem.c

+0 −7
Original line number Diff line number Diff line
@@ -319,13 +319,6 @@ int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, 
			MSM_BO_SCANOUT | MSM_BO_WC, &args->handle);

}



int msm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,

		uint32_t handle)

{

	/* No special work needed, drop the reference and see what falls out */

	return drm_gem_handle_delete(file, handle);

}



int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,

		uint32_t handle, uint64_t *offset)

{