Commit 2d5c7cd3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes

* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
  drm/exynos: fixed blending for hdmi graphic layer
  drm/exynos: Remove dummy encoder get_crtc operation implementation
  drm/exynos: Keep a reference to frame buffer GEM objects
  drm/exynos: Don't cast GEM object to Exynos GEM object when not needed
  drm/exynos: DRIVER_BUS_PLATFORM is not a driver feature
  drm/exynos: fixed size type.
  drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M}
parents 6cf98d6e 5736603b

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -244,8 +244,8 @@ static const struct file_operations exynos_drm_driver_fops = { 
};



static struct drm_driver exynos_drm_driver = {

	.driver_features	= DRIVER_HAVE_IRQ | DRIVER_BUS_PLATFORM |

				  DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,

	.driver_features	= DRIVER_HAVE_IRQ | DRIVER_MODESET |

					DRIVER_GEM | DRIVER_PRIME,

	.load			= exynos_drm_load,

	.unload			= exynos_drm_unload,

	.open			= exynos_drm_open,

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+0 −7
Original line number Diff line number Diff line
@@ -172,19 +172,12 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder) 
		manager_ops->commit(manager->dev);

}



static struct drm_crtc *

exynos_drm_encoder_get_crtc(struct drm_encoder *encoder)

{

	return encoder->crtc;

}



static struct drm_encoder_helper_funcs exynos_encoder_helper_funcs = {

	.dpms		= exynos_drm_encoder_dpms,

	.mode_fixup	= exynos_drm_encoder_mode_fixup,

	.mode_set	= exynos_drm_encoder_mode_set,

	.prepare	= exynos_drm_encoder_prepare,

	.commit		= exynos_drm_encoder_commit,

	.get_crtc	= exynos_drm_encoder_get_crtc,

};



static void exynos_drm_encoder_destroy(struct drm_encoder *encoder)

drivers/gpu/drm/exynos/exynos_drm_fb.c

+14 −5
Original line number Diff line number Diff line
@@ -51,11 +51,22 @@ struct exynos_drm_fb { 
static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)

{

	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);

	unsigned int i;



	DRM_DEBUG_KMS("%s\n", __FILE__);



	drm_framebuffer_cleanup(fb);



	for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {

		struct drm_gem_object *obj;



		if (exynos_fb->exynos_gem_obj[i] == NULL)

			continue;



		obj = &exynos_fb->exynos_gem_obj[i]->base;

		drm_gem_object_unreference_unlocked(obj);

	}



	kfree(exynos_fb);

	exynos_fb = NULL;

}
@@ -134,11 +145,11 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
		return ERR_PTR(-ENOENT);

	}



	drm_gem_object_unreference_unlocked(obj);



	fb = exynos_drm_framebuffer_init(dev, mode_cmd, obj);

	if (IS_ERR(fb))

	if (IS_ERR(fb)) {

		drm_gem_object_unreference_unlocked(obj);

		return fb;

	}



	exynos_fb = to_exynos_fb(fb);

	nr = exynos_drm_format_num_buffers(fb->pixel_format);
@@ -152,8 +163,6 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
			return ERR_PTR(-ENOENT);

		}



		drm_gem_object_unreference_unlocked(obj);



		exynos_fb->exynos_gem_obj[i] = to_exynos_gem_obj(obj);

	}

drivers/gpu/drm/exynos/exynos_drm_fb.h

+2 −2
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ 
static inline int exynos_drm_format_num_buffers(uint32_t format)

{

	switch (format) {

	case DRM_FORMAT_NV12M:

	case DRM_FORMAT_NV12:

	case DRM_FORMAT_NV12MT:

		return 2;

	case DRM_FORMAT_YUV420M:

	case DRM_FORMAT_YUV420:

		return 3;

	default:

		return 1;

drivers/gpu/drm/exynos/exynos_drm_gem.c

+3 −6
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv, 
				   struct drm_device *dev, uint32_t handle,

				   uint64_t *offset)

{

	struct exynos_drm_gem_obj *exynos_gem_obj;

	struct drm_gem_object *obj;

	int ret = 0;
@@ -710,15 +709,13 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv, 
		goto unlock;

	}



	exynos_gem_obj = to_exynos_gem_obj(obj);



	if (!exynos_gem_obj->base.map_list.map) {

		ret = drm_gem_create_mmap_offset(&exynos_gem_obj->base);

	if (!obj->map_list.map) {

		ret = drm_gem_create_mmap_offset(obj);

		if (ret)

			goto out;

	}



	*offset = (u64)exynos_gem_obj->base.map_list.hash.key << PAGE_SHIFT;

	*offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;

	DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset);



out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE