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

Commit 864ee9e6 authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Inki Dae
Browse files

drm/exynos: Add plane support with fimd 



The exynos fimd supports 5 window overlays. Only one window overlay of
fimd is used by the crtc, so we need plane feature to use the rest
window overlays.

This creates one ioctl exynos specific - DRM_EXYNOS_PLANE_SET_ZPOS, it
is the ioctl to decide for user to assign which window overlay.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
parent cb91f6a0

drivers/gpu/drm/exynos/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/exynos

exynosdrm-y := exynos_drm_drv.o exynos_drm_encoder.o exynos_drm_connector.o \

		exynos_drm_crtc.o exynos_drm_fbdev.o exynos_drm_fb.o \

		exynos_drm_buf.o exynos_drm_gem.o exynos_drm_core.o

		exynos_drm_buf.o exynos_drm_gem.o exynos_drm_core.o \

		exynos_drm_plane.o



obj-$(CONFIG_DRM_EXYNOS) += exynosdrm.o

obj-$(CONFIG_DRM_EXYNOS_FIMD) += exynos_drm_fimd.o

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ 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;

	crtc = &exynos_crtc->drm_crtc;



	private->crtc[nr] = crtc;

drivers/gpu/drm/exynos/exynos_drm_drv.c

+9 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "exynos_drm_fbdev.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_gem.h"

#include "exynos_drm_plane.h"



#define DRIVER_NAME	"exynos-drm"

#define DRIVER_DESC	"Samsung SoC DRM"
@@ -77,6 +78,12 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) 
			goto err_crtc;

	}



	for (nr = 0; nr < MAX_PLANE; nr++) {

		ret = exynos_plane_init(dev, nr);

		if (ret)

			goto err_crtc;

	}



	ret = drm_vblank_init(dev, MAX_CRTC);

	if (ret)

		goto err_crtc;
@@ -163,6 +170,8 @@ static struct drm_ioctl_desc exynos_ioctls[] = { 
			DRM_AUTH),

	DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP,

			exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH),

	DRM_IOCTL_DEF_DRV(EXYNOS_PLANE_SET_ZPOS, exynos_plane_set_zpos_ioctl,

			DRM_UNLOCKED | DRM_AUTH),

};



static const struct file_operations exynos_drm_driver_fops = {

drivers/gpu/drm/exynos/exynos_drm_drv.h

+6 −2
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include "drm.h"



#define MAX_CRTC	2

#define MAX_PLANE	5

#define DEFAULT_ZPOS	-1



struct drm_device;

struct exynos_drm_overlay;
@@ -57,8 +59,8 @@ enum exynos_drm_output_type { 
struct exynos_drm_overlay_ops {

	void (*mode_set)(struct device *subdrv_dev,

			 struct exynos_drm_overlay *overlay);

	void (*commit)(struct device *subdrv_dev);

	void (*disable)(struct device *subdrv_dev);

	void (*commit)(struct device *subdrv_dev, int zpos);

	void (*disable)(struct device *subdrv_dev, int zpos);

};



/*
@@ -83,6 +85,7 @@ struct exynos_drm_overlay_ops { 
 * @dma_addr: bus(accessed by dma) address to the memory region allocated

 *	for a overlay.

 * @vaddr: virtual memory addresss to this overlay.

 * @zpos: order of overlay layer(z position).

 * @default_win: a window to be enabled.

 * @color_key: color key on or off.

 * @index_color: if using color key feature then this value would be used
@@ -111,6 +114,7 @@ struct exynos_drm_overlay { 
	unsigned int pitch;

	dma_addr_t dma_addr;

	void __iomem *vaddr;

	int zpos;



	bool default_win;

	bool color_key;

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+22 −4
Original line number Diff line number Diff line
@@ -294,12 +294,27 @@ void exynos_drm_disable_vblank(struct drm_encoder *encoder, void *data) 
		manager_ops->disable_vblank(manager->dev);

}



void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data)

void exynos_drm_encoder_crtc_plane_commit(struct drm_encoder *encoder,

					  void *data)

{

	struct exynos_drm_manager *manager =

		to_exynos_encoder(encoder)->manager;

	struct exynos_drm_overlay_ops *overlay_ops = manager->overlay_ops;

	int zpos = DEFAULT_ZPOS;



	if (data)

		zpos = *(int *)data;



	if (overlay_ops && overlay_ops->commit)

		overlay_ops->commit(manager->dev, zpos);

}



void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data)

{

	struct exynos_drm_manager *manager =

		to_exynos_encoder(encoder)->manager;

	int crtc = *(int *)data;

	int zpos = DEFAULT_ZPOS;



	DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -309,8 +324,7 @@ void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data) 
	 */

	manager->pipe = crtc;



	if (overlay_ops && overlay_ops->commit)

		overlay_ops->commit(manager->dev);

	exynos_drm_encoder_crtc_plane_commit(encoder, &zpos);

}



void exynos_drm_encoder_dpms_from_crtc(struct drm_encoder *encoder, void *data)
@@ -375,11 +389,15 @@ void exynos_drm_encoder_crtc_disable(struct drm_encoder *encoder, void *data) 
	struct exynos_drm_manager *manager =

		to_exynos_encoder(encoder)->manager;

	struct exynos_drm_overlay_ops *overlay_ops = manager->overlay_ops;

	int zpos = DEFAULT_ZPOS;



	DRM_DEBUG_KMS("\n");



	if (data)

		zpos = *(int *)data;



	if (overlay_ops && overlay_ops->disable)

		overlay_ops->disable(manager->dev);

		overlay_ops->disable(manager->dev, zpos);

}



MODULE_AUTHOR("Inki Dae <inki.dae@samsung.com>");