Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (219c6734) · Commits · 戴 / test

drivers/gpu/drm/exynos/exynos_drm_connector.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -196,7 +196,8 @@ static int exynos_drm_connector_mode_valid(struct drm_connector *connector,
		return ret;
		}

		struct drm_encoder exynos_drm_best_encoder(struct drm_connector connector)
		static struct drm_encoder *exynos_drm_best_encoder(
		struct drm_connector *connector)
		{
		struct drm_device *dev = connector->dev;
		struct exynos_drm_connector *exynos_connector =

drivers/gpu/drm/exynos/exynos_drm_core.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@
		#include "exynos_drm_fbdev.h"

		static LIST_HEAD(exynos_drm_subdrv_list);
		static struct drm_device *drm_dev;

		static int exynos_drm_subdrv_probe(struct drm_device *dev,
		struct exynos_drm_subdrv *subdrv)
		@@ -120,8 +119,6 @@ int exynos_drm_device_register(struct drm_device *dev)
		if (!dev)
		return -EINVAL;

		drm_dev = dev;

		list_for_each_entry_safe(subdrv, n, &exynos_drm_subdrv_list, list) {
		subdrv->drm_dev = dev;
		err = exynos_drm_subdrv_probe(dev, subdrv);
		@@ -149,8 +146,6 @@ int exynos_drm_device_unregister(struct drm_device *dev)
		list_for_each_entry(subdrv, &exynos_drm_subdrv_list, list)
		exynos_drm_subdrv_remove(dev, subdrv);

		drm_dev = NULL;

		return 0;
		}
		EXPORT_SYMBOL_GPL(exynos_drm_device_unregister);

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+128 −166

Original line number	Diff line number	Diff line
		@@ -29,21 +29,23 @@
		#include "drmP.h"
		#include "drm_crtc_helper.h"

		#include "exynos_drm_crtc.h"
		#include "exynos_drm_drv.h"
		#include "exynos_drm_fb.h"
		#include "exynos_drm_encoder.h"
		#include "exynos_drm_gem.h"
		#include "exynos_drm_plane.h"

		#define to_exynos_crtc(x) container_of(x, struct exynos_drm_crtc,\
		drm_crtc)

		enum exynos_crtc_mode {
		CRTC_MODE_NORMAL, /* normal mode */
		CRTC_MODE_BLANK, /* The private plane of crtc is blank */
		};

		/*
		* Exynos specific crtc structure.
		*
		* @drm_crtc: crtc object.
		* @overlay: contain information common to display controller and hdmi and
		* contents of this overlay object would be copied to sub driver size.
		* @drm_plane: pointer of private plane object for this crtc
		* @pipe: a crtc index created at load() with a new crtc object creation
		* and the crtc object would be set to private->crtc array
		* to get a crtc object corresponding to this pipe from private->crtc
		@@ -52,115 +54,16 @@
		* we can refer to the crtc to current hardware interrupt occured through
		* this pipe value.
		* @dpms: store the crtc dpms value
		* @mode: store the crtc mode value
		*/
		struct exynos_drm_crtc {
		struct drm_crtc drm_crtc;
		struct exynos_drm_overlay overlay;
		struct drm_plane *plane;
		unsigned int pipe;
		unsigned int dpms;
		enum exynos_crtc_mode mode;
		};

		static void exynos_drm_crtc_apply(struct drm_crtc *crtc)
		{
		struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
		struct exynos_drm_overlay *overlay = &exynos_crtc->overlay;

		exynos_drm_fn_encoder(crtc, overlay,
		exynos_drm_encoder_crtc_mode_set);
		exynos_drm_fn_encoder(crtc, &exynos_crtc->pipe,
		exynos_drm_encoder_crtc_commit);
		}

		int exynos_drm_overlay_update(struct exynos_drm_overlay *overlay,
		struct drm_framebuffer *fb,
		struct drm_display_mode *mode,
		struct exynos_drm_crtc_pos *pos)
		{
		struct exynos_drm_gem_buf *buffer;
		unsigned int actual_w;
		unsigned int actual_h;
		int nr = exynos_drm_format_num_buffers(fb->pixel_format);
		int i;

		for (i = 0; i < nr; i++) {
		buffer = exynos_drm_fb_buffer(fb, i);
		if (!buffer) {
		DRM_LOG_KMS("buffer is null\n");
		return -EFAULT;
		}

		overlay->dma_addr[i] = buffer->dma_addr;
		overlay->vaddr[i] = buffer->kvaddr;

		DRM_DEBUG_KMS("buffer: %d, vaddr = 0x%lx, dma_addr = 0x%lx\n",
		i, (unsigned long)overlay->vaddr[i],
		(unsigned long)overlay->dma_addr[i]);
		}

		actual_w = min((mode->hdisplay - pos->crtc_x), pos->crtc_w);
		actual_h = min((mode->vdisplay - pos->crtc_y), pos->crtc_h);

		/* set drm framebuffer data. */
		overlay->fb_x = pos->fb_x;
		overlay->fb_y = pos->fb_y;
		overlay->fb_width = fb->width;
		overlay->fb_height = fb->height;
		overlay->src_width = pos->src_w;
		overlay->src_height = pos->src_h;
		overlay->bpp = fb->bits_per_pixel;
		overlay->pitch = fb->pitches[0];
		overlay->pixel_format = fb->pixel_format;

		/* set overlay range to be displayed. */
		overlay->crtc_x = pos->crtc_x;
		overlay->crtc_y = pos->crtc_y;
		overlay->crtc_width = actual_w;
		overlay->crtc_height = actual_h;

		/* set drm mode data. */
		overlay->mode_width = mode->hdisplay;
		overlay->mode_height = mode->vdisplay;
		overlay->refresh = mode->vrefresh;
		overlay->scan_flag = mode->flags;

		DRM_DEBUG_KMS("overlay : offset_x/y(%d,%d), width/height(%d,%d)",
		overlay->crtc_x, overlay->crtc_y,
		overlay->crtc_width, overlay->crtc_height);

		return 0;
		}

		static int exynos_drm_crtc_update(struct drm_crtc *crtc)
		{
		struct exynos_drm_crtc *exynos_crtc;
		struct exynos_drm_overlay *overlay;
		struct exynos_drm_crtc_pos pos;
		struct drm_display_mode *mode = &crtc->mode;
		struct drm_framebuffer *fb = crtc->fb;

		if (!mode \|\| !fb)
		return -EINVAL;

		exynos_crtc = to_exynos_crtc(crtc);
		overlay = &exynos_crtc->overlay;

		memset(&pos, 0, sizeof(struct exynos_drm_crtc_pos));

		/* it means the offset of framebuffer to be displayed. */
		pos.fb_x = crtc->x;
		pos.fb_y = crtc->y;

		/* OSD position to be displayed. */
		pos.crtc_x = 0;
		pos.crtc_y = 0;
		pos.crtc_w = fb->width - crtc->x;
		pos.crtc_h = fb->height - crtc->y;
		pos.src_w = pos.crtc_w;
		pos.src_h = pos.crtc_h;

		return exynos_drm_overlay_update(overlay, crtc->fb, mode, &pos);
		}

		static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
		{
		struct drm_device *dev = crtc->dev;
		@@ -175,23 +78,8 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode)

		mutex_lock(&dev->struct_mutex);

		switch (mode) {
		case DRM_MODE_DPMS_ON:
		exynos_drm_fn_encoder(crtc, &mode,
		exynos_drm_encoder_crtc_dpms);
		exynos_drm_fn_encoder(crtc, &mode, exynos_drm_encoder_crtc_dpms);
		exynos_crtc->dpms = mode;
		break;
		case DRM_MODE_DPMS_STANDBY:
		case DRM_MODE_DPMS_SUSPEND:
		case DRM_MODE_DPMS_OFF:
		exynos_drm_fn_encoder(crtc, &mode,
		exynos_drm_encoder_crtc_dpms);
		exynos_crtc->dpms = mode;
		break;
		default:
		DRM_ERROR("unspecified mode %d\n", mode);
		break;
		}

		mutex_unlock(&dev->struct_mutex);
		}
		@@ -209,30 +97,8 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc)

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

		/*
		* when set_crtc is requested from user or at booting time,
		* crtc->commit would be called without dpms call so if dpms is
		* no power on then crtc->dpms should be called
		* with DRM_MODE_DPMS_ON for the hardware power to be on.
		*/
		if (exynos_crtc->dpms != DRM_MODE_DPMS_ON) {
		int mode = DRM_MODE_DPMS_ON;

		/*
		* enable hardware(power on) to all encoders hdmi connected
		* to current crtc.
		*/
		exynos_drm_crtc_dpms(crtc, mode);
		/*
		* enable dma to all encoders connected to current crtc and
		* lcd panel.
		*/
		exynos_drm_fn_encoder(crtc, &mode,
		exynos_drm_encoder_dpms_from_crtc);
		}

		exynos_drm_fn_encoder(crtc, &exynos_crtc->pipe,
		exynos_drm_encoder_crtc_commit);
		exynos_plane_commit(exynos_crtc->plane);
		exynos_plane_dpms(exynos_crtc->plane, DRM_MODE_DPMS_ON);
		}

		static bool
		@@ -251,31 +117,61 @@ exynos_drm_crtc_mode_set(struct drm_crtc crtc, struct drm_display_mode mode,
		struct drm_display_mode *adjusted_mode, int x, int y,
		struct drm_framebuffer *old_fb)
		{
		struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
		struct drm_plane *plane = exynos_crtc->plane;
		unsigned int crtc_w;
		unsigned int crtc_h;
		int pipe = exynos_crtc->pipe;
		int ret;

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

		exynos_drm_crtc_dpms(crtc, DRM_MODE_DPMS_ON);

		/*
		* copy the mode data adjusted by mode_fixup() into crtc->mode
		* so that hardware can be seet to proper mode.
		*/
		memcpy(&crtc->mode, adjusted_mode, sizeof(*adjusted_mode));

		return exynos_drm_crtc_update(crtc);
		crtc_w = crtc->fb->width - x;
		crtc_h = crtc->fb->height - y;

		ret = exynos_plane_mode_set(plane, crtc, crtc->fb, 0, 0, crtc_w, crtc_h,
		x, y, crtc_w, crtc_h);
		if (ret)
		return ret;

		plane->crtc = crtc;
		plane->fb = crtc->fb;

		exynos_drm_fn_encoder(crtc, &pipe, exynos_drm_encoder_crtc_pipe);

		return 0;
		}

		static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
		struct drm_framebuffer *old_fb)
		{
		struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
		struct drm_plane *plane = exynos_crtc->plane;
		unsigned int crtc_w;
		unsigned int crtc_h;
		int ret;

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

		ret = exynos_drm_crtc_update(crtc);
		crtc_w = crtc->fb->width - x;
		crtc_h = crtc->fb->height - y;

		ret = exynos_plane_mode_set(plane, crtc, crtc->fb, 0, 0, crtc_w, crtc_h,
		x, y, crtc_w, crtc_h);
		if (ret)
		return ret;

		exynos_drm_crtc_apply(crtc);
		exynos_drm_crtc_commit(crtc);

		return ret;
		return 0;
		}

		static void exynos_drm_crtc_load_lut(struct drm_crtc *crtc)
		@@ -284,6 +180,16 @@ static void exynos_drm_crtc_load_lut(struct drm_crtc *crtc)
		/* drm framework doesn't check NULL */
		}

		static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
		{
		struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);

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

		exynos_plane_dpms(exynos_crtc->plane, DRM_MODE_DPMS_OFF);
		exynos_drm_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
		}

		static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
		.dpms = exynos_drm_crtc_dpms,
		.prepare = exynos_drm_crtc_prepare,
		@@ -292,6 +198,7 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
		.mode_set = exynos_drm_crtc_mode_set,
		.mode_set_base = exynos_drm_crtc_mode_set_base,
		.load_lut = exynos_drm_crtc_load_lut,
		.disable = exynos_drm_crtc_disable,
		};

		static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
		@@ -327,7 +234,8 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
		&dev_priv->pageflip_event_list);

		crtc->fb = fb;
		ret = exynos_drm_crtc_update(crtc);
		ret = exynos_drm_crtc_mode_set_base(crtc, crtc->x, crtc->y,
		NULL);
		if (ret) {
		crtc->fb = old_fb;
		drm_vblank_put(dev, exynos_crtc->pipe);
		@@ -335,14 +243,6 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,

		goto out;
		}

		/*
		* the values related to a buffer of the drm framebuffer
		* to be applied should be set at here. because these values
		* first, are set to shadow registers and then to
		* real registers at vsync front porch period.
		*/
		exynos_drm_crtc_apply(crtc);
		}
		out:
		mutex_unlock(&dev->struct_mutex);
		@@ -362,18 +262,73 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc)
		kfree(exynos_crtc);
		}

		static int exynos_drm_crtc_set_property(struct drm_crtc *crtc,
		struct drm_property *property,
		uint64_t val)
		{
		struct drm_device *dev = crtc->dev;
		struct exynos_drm_private *dev_priv = dev->dev_private;
		struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);

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

		if (property == dev_priv->crtc_mode_property) {
		enum exynos_crtc_mode mode = val;

		if (mode == exynos_crtc->mode)
		return 0;

		exynos_crtc->mode = mode;

		switch (mode) {
		case CRTC_MODE_NORMAL:
		exynos_drm_crtc_commit(crtc);
		break;
		case CRTC_MODE_BLANK:
		exynos_plane_dpms(exynos_crtc->plane,
		DRM_MODE_DPMS_OFF);
		break;
		default:
		break;
		}

		return 0;
		}

		return -EINVAL;
		}

		static struct drm_crtc_funcs exynos_crtc_funcs = {
		.set_config = drm_crtc_helper_set_config,
		.page_flip = exynos_drm_crtc_page_flip,
		.destroy = exynos_drm_crtc_destroy,
		.set_property = exynos_drm_crtc_set_property,
		};

		static const struct drm_prop_enum_list mode_names[] = {
		{ CRTC_MODE_NORMAL, "normal" },
		{ CRTC_MODE_BLANK, "blank" },
		};

		struct exynos_drm_overlay get_exynos_drm_overlay(struct drm_device dev,
		struct drm_crtc *crtc)
		static void exynos_drm_crtc_attach_mode_property(struct drm_crtc *crtc)
		{
		struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
		struct drm_device *dev = crtc->dev;
		struct exynos_drm_private *dev_priv = dev->dev_private;
		struct drm_property *prop;

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

		return &exynos_crtc->overlay;
		prop = dev_priv->crtc_mode_property;
		if (!prop) {
		prop = drm_property_create_enum(dev, 0, "mode", mode_names,
		ARRAY_SIZE(mode_names));
		if (!prop)
		return;

		dev_priv->crtc_mode_property = prop;
		}

		drm_object_attach_property(&crtc->base, prop, 0);
		}

		int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)
		@@ -392,7 +347,12 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)

		exynos_crtc->pipe = nr;
		exynos_crtc->dpms = DRM_MODE_DPMS_OFF;
		exynos_crtc->overlay.zpos = DEFAULT_ZPOS;
		exynos_crtc->plane = exynos_plane_init(dev, 1 << nr, true);
		if (!exynos_crtc->plane) {
		kfree(exynos_crtc);
		return -ENOMEM;
		}

		crtc = &exynos_crtc->drm_crtc;

		private->crtc[nr] = crtc;
		@@ -400,6 +360,8 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)
		drm_crtc_init(dev, crtc, &exynos_crtc_funcs);
		drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs);

		exynos_drm_crtc_attach_mode_property(crtc);

		return 0;
		}

drivers/gpu/drm/exynos/exynos_drm_crtc.h

+0 −31

Original line number	Diff line number	Diff line
		@@ -29,39 +29,8 @@
		#ifndef _EXYNOS_DRM_CRTC_H_
		#define _EXYNOS_DRM_CRTC_H_

		struct exynos_drm_overlay get_exynos_drm_overlay(struct drm_device dev,
		struct drm_crtc *crtc);
		int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr);
		int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc);
		void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int crtc);

		/*
		* Exynos specific crtc postion structure.
		*
		* @fb_x: offset x on a framebuffer to be displyed
		* - the unit is screen coordinates.
		* @fb_y: offset y on a framebuffer to be displayed
		* - the unit is screen coordinates.
		* @src_w: width of source area to be displayed from a framebuffer.
		* @src_h: height of source area to be displayed from a framebuffer.
		* @crtc_x: offset x on hardware screen.
		* @crtc_y: offset y on hardware screen.
		* @crtc_w: width of hardware screen.
		* @crtc_h: height of hardware screen.
		*/
		struct exynos_drm_crtc_pos {
		unsigned int fb_x;
		unsigned int fb_y;
		unsigned int src_w;
		unsigned int src_h;
		unsigned int crtc_x;
		unsigned int crtc_y;
		unsigned int crtc_w;
		unsigned int crtc_h;
		};

		int exynos_drm_overlay_update(struct exynos_drm_overlay *overlay,
		struct drm_framebuffer *fb,
		struct drm_display_mode *mode,
		struct exynos_drm_crtc_pos *pos);
		#endif

drivers/gpu/drm/exynos/exynos_drm_dmabuf.c

+25 −8

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@

		#include "drmP.h"
		#include "drm.h"
		#include "exynos_drm.h"
		#include "exynos_drm_drv.h"
		#include "exynos_drm_gem.h"

		@@ -86,6 +87,10 @@ static struct sg_table *
		npages = buf->size / buf->page_size;

		sgt = exynos_pages_to_sg(buf->pages, npages, buf->page_size);
		if (!sgt) {
		DRM_DEBUG_PRIME("exynos_pages_to_sg returned NULL!\n");
		goto err_unlock;
		}
		nents = dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir);

		DRM_DEBUG_PRIME("npages = %d buffer size = 0x%lx page_size = 0x%lx\n",
		@@ -186,7 +191,7 @@ struct drm_gem_object exynos_dmabuf_prime_import(struct drm_device drm_dev,
		struct exynos_drm_gem_obj *exynos_gem_obj;
		struct exynos_drm_gem_buf *buffer;
		struct page *page;
		int ret, i = 0;
		int ret;

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

		@@ -210,7 +215,7 @@ struct drm_gem_object exynos_dmabuf_prime_import(struct drm_device drm_dev,


		sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);
		if (IS_ERR(sgt)) {
		if (IS_ERR_OR_NULL(sgt)) {
		ret = PTR_ERR(sgt);
		goto err_buf_detach;
		}
		@@ -236,8 +241,17 @@ struct drm_gem_object exynos_dmabuf_prime_import(struct drm_device drm_dev,
		}

		sgl = sgt->sgl;
		buffer->dma_addr = sg_dma_address(sgl);

		if (sgt->nents == 1) {
		buffer->dma_addr = sg_dma_address(sgt->sgl);
		buffer->size = sg_dma_len(sgt->sgl);

		/* always physically continuous memory if sgt->nents is 1. */
		exynos_gem_obj->flags \|= EXYNOS_BO_CONTIG;
		} else {
		unsigned int i = 0;

		buffer->dma_addr = sg_dma_address(sgl);
		while (i < sgt->nents) {
		buffer->pages[i] = sg_page(sgl);
		buffer->size += sg_dma_len(sgl);
		@@ -245,6 +259,9 @@ struct drm_gem_object exynos_dmabuf_prime_import(struct drm_device drm_dev,
		i++;
		}

		exynos_gem_obj->flags \|= EXYNOS_BO_NONCONTIG;
		}

		exynos_gem_obj->buffer = buffer;
		buffer->sgt = sgt;
		exynos_gem_obj->base.import_attach = attach;

Admin message