#include <linux/delay.h>
+#include <sound/pcm_params.h>
#include "rockchip-hdmi.h"
#include "rockchip-hdmi-cec.h"
struct delayed_work work;
struct hdmi *hdmi;
int event;
+ int sync;
void *data;
};
static int uboot_vic;
static void hdmi_work_queue(struct work_struct *work);
-struct delayed_work *hdmi_submit_work(struct hdmi *hdmi,
- int event, int delay, void *data)
+void hdmi_submit_work(struct hdmi *hdmi,
+ int event, int delay, int sync)
{
struct hdmi_delayed_work *work;
- DBG("%s event %04x delay %d", __func__, event, delay);
+ DBG("%s event %04x delay %d sync %d\n",
+ __func__, event, delay, sync);
work = kmalloc(sizeof(*work), GFP_ATOMIC);
INIT_DELAYED_WORK(&work->work, hdmi_work_queue);
work->hdmi = hdmi;
work->event = event;
- work->data = data;
+ work->data = NULL;
+ work->sync = sync;
queue_delayed_work(hdmi->workqueue,
&work->work,
msecs_to_jiffies(delay));
+ if (sync) {
+ flush_delayed_work(&work->work);
+ kfree(work);
+ }
} else {
pr_warn("HDMI: Cannot allocate memory to create work\n");
- return 0;
}
-
- return &work->work;
}
static void hdmi_send_uevent(struct hdmi *hdmi, int uevent)
static inline void hdmi_wq_set_output(struct hdmi *hdmi, int mute)
{
- DBG("%s mute %d", __func__, mute);
+ DBG("%s mute %d\n", __func__, mute);
if (hdmi->ops->setmute)
hdmi->ops->setmute(hdmi, mute);
}
static inline void hdmi_wq_set_audio(struct hdmi *hdmi)
{
- DBG("%s", __func__);
+ DBG("%s\n", __func__);
if (hdmi->ops->setaudio)
hdmi->ops->setaudio(hdmi, &hdmi->audio);
}
static void hdmi_wq_set_video(struct hdmi *hdmi)
{
- struct hdmi_video video;
+ struct hdmi_video *video = &(hdmi->video);
+ int deepcolor;
- DBG("%s", __func__);
+ DBG("%s\n", __func__);
+
+ video->sink_hdmi = hdmi->edid.sink_hdmi;
+ video->format_3d = hdmi->mode_3d;
+ video->colorimetry = hdmi->colorimetry;
+ video->color_output_depth = 8;
+ if (hdmi->autoset)
+ hdmi->vic = hdmi_find_best_mode(hdmi, 0);
+ else
+ hdmi->vic = hdmi_find_best_mode(hdmi, hdmi->vic);
+
+ if (hdmi->vic == 0)
+ hdmi->vic = hdmi->property->defaultmode;
- video.vic = hdmi->vic & HDMI_VIC_MASK;
- video.sink_hdmi = hdmi->edid.sink_hdmi;
- video.format_3d = hdmi->mode_3d;
/* For DVI, output RGB */
- if (hdmi->edid.sink_hdmi == 0) {
- video.color_output = HDMI_COLOR_RGB_0_255;
+ if (video->sink_hdmi == 0) {
+ video->color_output = HDMI_COLOR_RGB_0_255;
} else {
if (hdmi->colormode == HDMI_COLOR_AUTO) {
if (hdmi->edid.ycbcr444)
- video.color_output = HDMI_COLOR_YCBCR444;
+ video->color_output = HDMI_COLOR_YCBCR444;
else if (hdmi->edid.ycbcr422)
- video.color_output = HDMI_COLOR_YCBCR422;
+ video->color_output = HDMI_COLOR_YCBCR422;
else
- video.color_output = HDMI_COLOR_RGB_16_235;
+ video->color_output = HDMI_COLOR_RGB_16_235;
} else {
- video.color_output = hdmi->colormode;
+ video->color_output = hdmi->colormode;
}
+ if (hdmi->vic & HDMI_VIDEO_YUV420) {
+ video->color_output = HDMI_COLOR_YCBCR420;
+ deepcolor = hdmi->edid.deepcolor_420;
+ } else {
+ deepcolor = hdmi->edid.deepcolor;
+ }
+ if ((hdmi->property->feature & SUPPORT_DEEP_10BIT) &&
+ (deepcolor & HDMI_DEEP_COLOR_30BITS) &&
+ (hdmi->colordepth == HDMI_DEPP_COLOR_AUTO ||
+ hdmi->colordepth == 10))
+ video->color_output_depth = 10;
}
- if ((hdmi->property->feature & SUPPORT_DEEP_10BIT) &&
- (hdmi->edid.deepcolor & HDMI_DEEP_COLOR_30BITS)) {
- if (hdmi->colordepth == HDMI_DEPP_COLOR_AUTO ||
- hdmi->colordepth == 10)
- video.color_output_depth = 10;
+ pr_info("hdmi output corlor mode is %d\n", video->color_output);
+ if ((hdmi->property->feature & SUPPORT_YCBCR_INPUT) &&
+ (video->color_output == HDMI_COLOR_YCBCR444 ||
+ video->color_output == HDMI_COLOR_YCBCR422))
+ video->color_input = HDMI_COLOR_YCBCR444;
+ else if (video->color_output == HDMI_COLOR_YCBCR420)
+ video->color_input = HDMI_COLOR_YCBCR420;
+ else
+ video->color_input = HDMI_COLOR_RGB_0_255;
+
+ if (hdmi->vic & HDMI_VIDEO_DMT) {
+ video->vic = hdmi->vic;
+ video->color_output_depth = 8;
} else {
- video.color_output_depth = 8;
+ video->vic = hdmi->vic & HDMI_VIC_MASK;
}
- if (hdmi->vic & HDMI_VIDEO_YUV420)
- video.color_output = HDMI_COLOR_YCBCR420;
- pr_info("hdmi output corlor mode is %d\n", video.color_output);
- video.color_input = HDMI_COLOR_RGB_0_255;
- if (hdmi->property->feature & SUPPORT_YCBCR_INPUT) {
- if (video.color_output == HDMI_COLOR_YCBCR444 ||
- video.color_output == HDMI_COLOR_YCBCR422)
- video.color_input = HDMI_COLOR_YCBCR444;
- else if (video.color_output == HDMI_COLOR_YCBCR420)
- video.color_input = HDMI_COLOR_YCBCR420;
- }
- hdmi->colormode_input = video.color_input;
hdmi_set_lcdc(hdmi);
if (hdmi->ops->setvideo)
- hdmi->ops->setvideo(hdmi, &video);
+ hdmi->ops->setvideo(hdmi, video);
}
static void hdmi_wq_parse_edid(struct hdmi *hdmi)
if (hdmi == NULL)
return;
- DBG("%s", __func__);
+ DBG("%s\n", __func__);
pedid = &(hdmi->edid);
fb_destroy_modelist(&pedid->modelist);
INIT_LIST_HEAD(&pedid->modelist);
pedid->raw[0] = kmalloc(HDMI_EDID_BLOCK_SIZE, GFP_KERNEL);
- if (pedid->raw[0] == NULL) {
- dev_err(hdmi->dev,
- "[%s] can not allocate memory for edid buff.\n",
- __func__);
+ if (!pedid->raw[0]) {
rc = HDMI_ERROR_FALSE;
goto out;
}
for (trytimes = 0; trytimes < 3; trytimes++) {
if (trytimes)
msleep(50);
- memset(pedid->raw[0], 0 , HDMI_EDID_BLOCK_SIZE);
+ memset(pedid->raw[0], 0, HDMI_EDID_BLOCK_SIZE);
rc = hdmi->ops->getedid(hdmi, 0, pedid->raw[0]);
if (rc) {
dev_err(hdmi->dev,
for (trytimes = 0; trytimes < 3; trytimes++) {
if (trytimes)
msleep(20);
- memset(pedid->raw[i], 0 , HDMI_EDID_BLOCK_SIZE);
+ memset(pedid->raw[i], 0, HDMI_EDID_BLOCK_SIZE);
rc = hdmi->ops->getedid(hdmi, i, pedid->raw[i]);
if (rc) {
dev_err(hdmi->dev,
static void hdmi_wq_insert(struct hdmi *hdmi)
{
- DBG("%s", __func__);
+ DBG("%s\n", __func__);
if (hdmi->ops->insert)
hdmi->ops->insert(hdmi);
hdmi_wq_parse_edid(hdmi);
#endif
hdmi_wq_set_audio(hdmi);
hdmi_wq_set_output(hdmi, hdmi->mute);
- if (hdmi->ops->hdcp_cb)
- hdmi->ops->hdcp_cb(hdmi);
+ hdmi_submit_work(hdmi, HDMI_ENABLE_HDCP, 100, 0);
if (hdmi->ops->setcec)
hdmi->ops->setcec(hdmi);
}
struct rk_screen screen;
int i;
- DBG("%s", __func__);
+ DBG("%s\n", __func__);
if (hdmi->ops->remove)
hdmi->ops->remove(hdmi);
+ if (hdmi->property->feature & SUPPORT_CEC)
+ rockchip_hdmi_cec_set_pa(0);
if (hdmi->hotplug == HDMI_HPD_ACTIVED) {
screen.type = SCREEN_HDMI;
rk_fb_switch_screen(&screen, 0, hdmi->lcdc->id);
#ifdef CONFIG_SWITCH
switch_set_state(&(hdmi->switchdev), 0);
#endif
- mutex_lock(&hdmi->ddev->lock);
list_for_each_safe(pos, n, &hdmi->edid.modelist) {
list_del(pos);
kfree(pos);
}
- mutex_unlock(&hdmi->ddev->lock);
for (i = 0; i < HDMI_MAX_EDID_BLOCK; i++)
kfree(hdmi->edid.raw[i]);
kfree(hdmi->edid.audio);
int event = hdmi_w->event;
int hpd = HDMI_HPD_REMOVED;
- mutex_lock(&hdmi->lock);
+ mutex_lock(&hdmi->ddev->lock);
DBG("\nhdmi_work_queue() - evt= %x %d\n",
(event & 0xFF00) >> 8,
break;
case HDMI_DISABLE_CTL:
if (hdmi->enable) {
+ if (hdmi->hotplug == HDMI_HPD_ACTIVED)
+ hdmi_wq_set_output(hdmi,
+ HDMI_VIDEO_MUTE |
+ HDMI_AUDIO_MUTE);
if (!hdmi->sleep) {
if (hdmi->ops->disable)
hdmi->ops->disable(hdmi);
break;
case HDMI_SUSPEND_CTL:
if (!hdmi->sleep) {
- hdmi_wq_set_output(hdmi,
- HDMI_VIDEO_MUTE | HDMI_AUDIO_MUTE);
+ if (hdmi->hotplug == HDMI_HPD_ACTIVED)
+ hdmi_wq_set_output(hdmi,
+ HDMI_VIDEO_MUTE |
+ HDMI_AUDIO_MUTE);
if (hdmi->ops->disable)
hdmi->ops->disable(hdmi);
if (hdmi->enable)
case HDMI_HPD_CHANGE:
if (hdmi->ops->getstatus)
hpd = hdmi->ops->getstatus(hdmi);
- DBG("hdmi_work_queue() - hpd is %d hotplug is %d",
+ DBG("hdmi_work_queue() - hpd is %d hotplug is %d\n",
hpd, hdmi->hotplug);
if (hpd != hdmi->hotplug) {
if (hpd == HDMI_HPD_ACTIVED) {
hdmi->mute & (~HDMI_AUDIO_MUTE));
break;
case HDMI_SET_3D:
- if (hdmi->ops->setvsi) {
- if (hdmi->mode_3d != HDMI_3D_NONE)
+ if (hdmi->ops->setvsi && hdmi->edid.sink_hdmi) {
+ if (hdmi->mode_3d == HDMI_3D_FRAME_PACKING ||
+ hdmi->video.format_3d ==
+ HDMI_3D_FRAME_PACKING) {
+ hdmi_wq_set_output(hdmi,
+ HDMI_VIDEO_MUTE |
+ HDMI_AUDIO_MUTE);
+ msleep(100);
+ hdmi_wq_set_video(hdmi);
+ hdmi_wq_set_audio(hdmi);
+ hdmi_wq_set_output(hdmi, hdmi->mute);
+ } else if (hdmi->mode_3d != HDMI_3D_NONE) {
hdmi->ops->setvsi(hdmi, hdmi->mode_3d,
HDMI_VIDEO_FORMAT_3D);
- else if ((hdmi->vic & HDMI_TYPE_MASK) == 0)
+ } else if ((hdmi->vic & HDMI_TYPE_MASK) == 0) {
hdmi->ops->setvsi(hdmi, hdmi->vic,
HDMI_VIDEO_FORMAT_NORMAL);
+ }
}
break;
case HDMI_SET_COLOR:
if (hdmi->hotplug == HDMI_HPD_ACTIVED && hdmi->ops->hdcp_cb)
hdmi->ops->hdcp_cb(hdmi);
break;
+ case HDMI_HDCP_AUTH_2ND:
+ if (hdmi->hotplug == HDMI_HPD_ACTIVED &&
+ hdmi->ops->hdcp_auth2nd)
+ hdmi->ops->hdcp_auth2nd(hdmi);
+ break;
default:
pr_err("HDMI: hdmi_work_queue() unkown event\n");
break;
}
kfree(hdmi_w->data);
- kfree(hdmi_w);
+ if (!hdmi_w->sync)
+ kfree(hdmi_w);
DBG("\nhdmi_work_queue() - exit evt= %x %d\n",
(event & 0xFF00) >> 8,
event & 0xFF);
- mutex_unlock(&hdmi->lock);
+ mutex_unlock(&hdmi->ddev->lock);
}
struct hdmi *rockchip_hdmi_register(struct hdmi_property *property,
if (i == HDMI_MAX_ID)
return NULL;
- DBG("hdmi_register() - video source %d display %d",
+ DBG("hdmi_register() - video source %d display %d\n",
property->videosrc, property->display);
hdmi = kmalloc(sizeof(*hdmi), GFP_KERNEL);
- if (!hdmi) {
- pr_err("HDMI: no memory to allocate hdmi device.\n");
+ if (!hdmi)
return NULL;
- }
+
memset(hdmi, 0, sizeof(struct hdmi));
mutex_init(&hdmi->lock);
hdmi->hotplug = HDMI_HPD_REMOVED;
hdmi->autoset = HDMI_AUTO_CONFIG;
if (uboot_vic > 0) {
- hdmi->vic = uboot_vic;
- hdmi->uboot = 1;
+ hdmi->vic = uboot_vic & HDMI_UBOOT_VIC_MASK;
+ if (uboot_vic & HDMI_UBOOT_NOT_INIT)
+ hdmi->uboot = 0;
+ else
+ hdmi->uboot = 1;
hdmi->autoset = 0;
} else if (hdmi->autoset) {
hdmi->vic = 0;
}
hdmi->colormode = HDMI_VIDEO_DEFAULT_COLORMODE;
hdmi->colordepth = HDMI_DEPP_COLOR_AUTO;
+ hdmi->colorimetry = HDMI_COLORIMETRY_NO_DATA;
hdmi->mode_3d = HDMI_3D_NONE;
hdmi->audio.type = HDMI_AUDIO_DEFAULT_TYPE;
hdmi->audio.channel = HDMI_AUDIO_DEFAULT_CHANNEL;
hdmi->audio.word_length = HDMI_AUDIO_DEFAULT_WORDLENGTH;
hdmi->xscale = 100;
hdmi->yscale = 100;
- hdmi_init_modelist(hdmi);
if (hdmi->property->videosrc == DISPLAY_SOURCE_LCDC0)
hdmi->lcdc = rk_get_lcdc_drv("lcdc0");
else
hdmi->lcdc = rk_get_lcdc_drv("lcdc1");
-
+ if (!hdmi->lcdc)
+ goto err_create_wq;
if (hdmi->lcdc->prop == EXTEND)
hdmi->property->display = DISPLAY_AUX;
else
goto err_register_display;
}
hdmi->id = i;
+ hdmi_init_modelist(hdmi);
#ifdef CONFIG_SWITCH
if (hdmi->id == 0) {
hdmi->switchdev.name = "hdmi";
if (ref_info[i].ref == 0)
continue;
hdmi = ref_info[i].hdmi;
-
- /*
- if (memcmp(audio, &hdmi->audio, sizeof(struct hdmi_audio)) == 0)
- continue;
- */
- /*for (j = 0; j < hdmi->edid.audio_num; j++) {
- if (audio->type == hdmi->edid.audio_num)
- break;
- }*/
-
- /*if ( (j == hdmi->edid.audio_num) ||
- (audio->channel > hdmi->edid.audio[j].channel) ||
- ((audio->rate & hdmi->edid.audio[j].rate) == 0)||
- ((audio->type == HDMI_AUDIO_LPCM) &&
- ((audio->word_length &
- hdmi->edid.audio[j].word_length) == 0)) ) {
- pr_warn("[%s] warning : input audio type
- not supported in hdmi sink\n", __func__);
- continue;
- }*/
memcpy(&hdmi->audio, audio, sizeof(struct hdmi_audio));
if (hdmi->hotplug == HDMI_HPD_ACTIVED)
- hdmi_submit_work(hdmi, HDMI_SET_AUDIO, 0, NULL);
+ hdmi_submit_work(hdmi, HDMI_SET_AUDIO, 0, 0);
}
return 0;
}
+int snd_config_hdmi_audio(struct snd_pcm_hw_params *params)
+{
+ struct hdmi_audio audio_cfg;
+ u32 rate;
+
+ switch (params_rate(params)) {
+ case 32000:
+ rate = HDMI_AUDIO_FS_32000;
+ break;
+ case 44100:
+ rate = HDMI_AUDIO_FS_44100;
+ break;
+ case 48000:
+ rate = HDMI_AUDIO_FS_48000;
+ break;
+ case 88200:
+ rate = HDMI_AUDIO_FS_88200;
+ break;
+ case 96000:
+ rate = HDMI_AUDIO_FS_96000;
+ break;
+ case 176400:
+ rate = HDMI_AUDIO_FS_176400;
+ break;
+ case 192000:
+ rate = HDMI_AUDIO_FS_192000;
+ break;
+ default:
+ pr_err("rate %d unsupport.\n", params_rate(params));
+ rate = HDMI_AUDIO_FS_44100;
+ }
+
+ audio_cfg.rate = rate;
+
+ if (params->flags == HW_PARAMS_FLAG_NLPCM)
+ audio_cfg.type = HDMI_AUDIO_NLPCM;
+ else
+ audio_cfg.type = HDMI_AUDIO_LPCM;
+
+ audio_cfg.channel = params_channels(params);
+ audio_cfg.word_length = HDMI_AUDIO_WORD_LENGTH_16bit;
+
+ return hdmi_config_audio(&audio_cfg);
+}
+EXPORT_SYMBOL(snd_config_hdmi_audio);
+
void hdmi_audio_mute(int mute)
{
int i;
hdmi = ref_info[i].hdmi;
if (mute)
- hdmi_submit_work(hdmi, HDMI_MUTE_AUDIO, 0, NULL);
+ hdmi_submit_work(hdmi, HDMI_MUTE_AUDIO, 0, 0);
else
- hdmi_submit_work(hdmi, HDMI_UNMUTE_AUDIO, 0, NULL);
+ hdmi_submit_work(hdmi, HDMI_UNMUTE_AUDIO, 0, 0);
}
}
projects / firefly-linux-kernel-4.4.55.git / blobdiff