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

Commit 5efb54b2 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-tv: add dv_timings support for hdmi 



This just adds dv_timings support without modifying existing dv_preset
support.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Tested-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Acked-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8cf2f7ad

drivers/media/platform/s5p-tv/hdmi_drv.c

+81 −13
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/clk.h>

#include <linux/regulator/consumer.h>

#include <linux/v4l2-dv-timings.h>



#include <media/s5p_hdmi.h>

#include <media/v4l2-common.h>
@@ -93,6 +94,8 @@ struct hdmi_device { 
	int cur_conf_dirty;

	/** current preset */

	u32 cur_preset;

	/** current timings */

	struct v4l2_dv_timings cur_timings;

	/** other resources */

	struct hdmi_resources res;

};
@@ -477,19 +480,21 @@ static const struct hdmi_timings hdmi_timings_1080p50 = { 


static const struct {

	u32 preset;

	const struct hdmi_timings *timings;

	bool reduced_fps;

	const struct v4l2_dv_timings dv_timings;

	const struct hdmi_timings *hdmi_timings;

} hdmi_timings[] = {

	{ V4L2_DV_480P59_94, &hdmi_timings_480p },

	{ V4L2_DV_576P50, &hdmi_timings_576p50 },

	{ V4L2_DV_720P50, &hdmi_timings_720p50 },

	{ V4L2_DV_720P59_94, &hdmi_timings_720p60 },

	{ V4L2_DV_720P60, &hdmi_timings_720p60 },

	{ V4L2_DV_1080P24, &hdmi_timings_1080p24 },

	{ V4L2_DV_1080P30, &hdmi_timings_1080p60 },

	{ V4L2_DV_1080P50, &hdmi_timings_1080p50 },

	{ V4L2_DV_1080I50, &hdmi_timings_1080i50 },

	{ V4L2_DV_1080I60, &hdmi_timings_1080i60 },

	{ V4L2_DV_1080P60, &hdmi_timings_1080p60 },

	{ V4L2_DV_480P59_94, false, V4L2_DV_BT_CEA_720X480P59_94, &hdmi_timings_480p },

	{ V4L2_DV_576P50, false, V4L2_DV_BT_CEA_720X576P50, &hdmi_timings_576p50 },

	{ V4L2_DV_720P50, false, V4L2_DV_BT_CEA_1280X720P50, &hdmi_timings_720p50 },

	{ V4L2_DV_720P59_94, true, V4L2_DV_BT_CEA_1280X720P60, &hdmi_timings_720p60 },

	{ V4L2_DV_720P60, false, V4L2_DV_BT_CEA_1280X720P60, &hdmi_timings_720p60 },

	{ V4L2_DV_1080P24, false, V4L2_DV_BT_CEA_1920X1080P24, &hdmi_timings_1080p24 },

	{ V4L2_DV_1080P30, false, V4L2_DV_BT_CEA_1920X1080P30, &hdmi_timings_1080p60 },

	{ V4L2_DV_1080P50, false, V4L2_DV_BT_CEA_1920X1080P50, &hdmi_timings_1080p50 },

	{ V4L2_DV_1080I50, false, V4L2_DV_BT_CEA_1920X1080I50, &hdmi_timings_1080i50 },

	{ V4L2_DV_1080I60, false, V4L2_DV_BT_CEA_1920X1080I60, &hdmi_timings_1080i60 },

	{ V4L2_DV_1080P60, false, V4L2_DV_BT_CEA_1920X1080P60, &hdmi_timings_1080p60 },

};



static const struct hdmi_timings *hdmi_preset2timings(u32 preset)
@@ -498,7 +503,7 @@ static const struct hdmi_timings *hdmi_preset2timings(u32 preset) 


	for (i = 0; i < ARRAY_SIZE(hdmi_timings); ++i)

		if (hdmi_timings[i].preset == preset)

			return  hdmi_timings[i].timings;

			return  hdmi_timings[i].hdmi_timings;

	return NULL;

}
@@ -647,6 +652,36 @@ static int hdmi_g_dv_preset(struct v4l2_subdev *sd, 
	return 0;

}



static int hdmi_s_dv_timings(struct v4l2_subdev *sd,

	struct v4l2_dv_timings *timings)

{

	struct hdmi_device *hdev = sd_to_hdmi_dev(sd);

	struct device *dev = hdev->dev;

	int i;



	for (i = 0; i < ARRAY_SIZE(hdmi_timings); i++)

		if (v4l_match_dv_timings(&hdmi_timings[i].dv_timings,

					timings, 0))

			break;

	if (i == ARRAY_SIZE(hdmi_timings)) {

		dev_err(dev, "timings not supported\n");

		return -EINVAL;

	}

	hdev->cur_conf = hdmi_timings[i].hdmi_timings;

	hdev->cur_conf_dirty = 1;

	hdev->cur_timings = *timings;

	if (!hdmi_timings[i].reduced_fps)

		hdev->cur_timings.bt.flags &= ~V4L2_DV_FL_CAN_REDUCE_FPS;

	return 0;

}



static int hdmi_g_dv_timings(struct v4l2_subdev *sd,

	struct v4l2_dv_timings *timings)

{

	*timings = sd_to_hdmi_dev(sd)->cur_timings;

	return 0;

}



static int hdmi_g_mbus_fmt(struct v4l2_subdev *sd,

	  struct v4l2_mbus_framefmt *fmt)

{
@@ -679,6 +714,35 @@ static int hdmi_enum_dv_presets(struct v4l2_subdev *sd, 
		preset);

}



static int hdmi_enum_dv_timings(struct v4l2_subdev *sd,

	struct v4l2_enum_dv_timings *timings)

{

	if (timings->index >= ARRAY_SIZE(hdmi_timings))

		return -EINVAL;

	timings->timings = hdmi_timings[timings->index].dv_timings;

	if (!hdmi_timings[timings->index].reduced_fps)

		timings->timings.bt.flags &= ~V4L2_DV_FL_CAN_REDUCE_FPS;

	return 0;

}



static int hdmi_dv_timings_cap(struct v4l2_subdev *sd,

	struct v4l2_dv_timings_cap *cap)

{

	struct hdmi_device *hdev = sd_to_hdmi_dev(sd);



	/* Let the phy fill in the pixelclock range */

	v4l2_subdev_call(hdev->phy_sd, video, dv_timings_cap, cap);

	cap->type = V4L2_DV_BT_656_1120;

	cap->bt.min_width = 720;

	cap->bt.max_width = 1920;

	cap->bt.min_height = 480;

	cap->bt.max_height = 1080;

	cap->bt.standards = V4L2_DV_BT_STD_CEA861;

	cap->bt.capabilities = V4L2_DV_BT_CAP_INTERLACED |

			       V4L2_DV_BT_CAP_PROGRESSIVE;

	return 0;

}



static const struct v4l2_subdev_core_ops hdmi_sd_core_ops = {

	.s_power = hdmi_s_power,

};
@@ -687,6 +751,10 @@ static const struct v4l2_subdev_video_ops hdmi_sd_video_ops = { 
	.s_dv_preset = hdmi_s_dv_preset,

	.g_dv_preset = hdmi_g_dv_preset,

	.enum_dv_presets = hdmi_enum_dv_presets,

	.s_dv_timings = hdmi_s_dv_timings,

	.g_dv_timings = hdmi_g_dv_timings,

	.enum_dv_timings = hdmi_enum_dv_timings,

	.dv_timings_cap = hdmi_dv_timings_cap,

	.g_mbus_fmt = hdmi_g_mbus_fmt,

	.s_stream = hdmi_s_stream,

};