openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/exynos/hdmi: remove redundant configuration fields 

The patch removes redundant fields from hdmi_conf_regs. Their values
can be calculated from current_mode. This patch is the first step to remove
whole hdmi_conf_regs structure.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Andrzej Hajda 2015-07-09 16:28:10 +02:00 committed by Inki Dae
parent cd240cde91
commit c93aaebfd1
1 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/gpu/drm/exynos/exynos_hdmi.c
View File

@ -169,14 +169,9 @@ struct hdmi_v14_conf {
struct hdmi_tg_regs tg; struct hdmi_tg_regs tg;
}; };
struct hdmi_conf_regs { union hdmi_conf_regs {
int pixel_clock; struct hdmi_v13_conf v13_conf;
int cea_video_id; struct hdmi_v14_conf v14_conf;
enum hdmi_picture_aspect aspect_ratio;
union {
struct hdmi_v13_conf v13_conf;
struct hdmi_v14_conf v14_conf;
} conf;
}; };
struct hdmi_context { struct hdmi_context {
@ -197,7 +192,8 @@ struct hdmi_context {
/* current hdmiphy conf regs */ /* current hdmiphy conf regs */
struct drm_display_mode current_mode; struct drm_display_mode current_mode;
struct hdmi_conf_regs mode_conf; u8 cea_video_id;
union hdmi_conf_regs mode_conf;
struct hdmi_resources res; struct hdmi_resources res;
const struct hdmi_driver_data *drv_data; const struct hdmi_driver_data *drv_data;
@ -951,7 +947,7 @@ static void hdmi_reg_infoframe(struct hdmi_context *hdata,
u32 hdr_sum; u32 hdr_sum;
u8 chksum; u8 chksum;
u32 mod; u32 mod;
u32 vic; u8 ar;
mod = hdmi_reg_read(hdata, HDMI_MODE_SEL); mod = hdmi_reg_read(hdata, HDMI_MODE_SEL);
if (hdata->dvi_mode) { if (hdata->dvi_mode) {
@ -982,27 +978,22 @@ static void hdmi_reg_infoframe(struct hdmi_context *hdata,
* Set the aspect ratio as per the mode, mentioned in * Set the aspect ratio as per the mode, mentioned in
* Table 9 AVI InfoFrame Data Byte 2 of CEA-861-D Standard * Table 9 AVI InfoFrame Data Byte 2 of CEA-861-D Standard
*/ */
switch (hdata->mode_conf.aspect_ratio) { ar = hdata->current_mode.picture_aspect_ratio;
switch (ar) {
case HDMI_PICTURE_ASPECT_4_3: case HDMI_PICTURE_ASPECT_4_3:
hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), ar |= AVI_4_3_CENTER_RATIO;
hdata->mode_conf.aspect_ratio |
AVI_4_3_CENTER_RATIO);
break; break;
case HDMI_PICTURE_ASPECT_16_9: case HDMI_PICTURE_ASPECT_16_9:
hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), ar |= AVI_16_9_CENTER_RATIO;
hdata->mode_conf.aspect_ratio |
AVI_16_9_CENTER_RATIO);
break; break;
case HDMI_PICTURE_ASPECT_NONE: case HDMI_PICTURE_ASPECT_NONE:
default: default:
hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), ar |= AVI_SAME_AS_PIC_ASPECT_RATIO;
hdata->mode_conf.aspect_ratio |
AVI_SAME_AS_PIC_ASPECT_RATIO);
break; break;
} }
hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), ar);
vic = hdata->mode_conf.cea_video_id; hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(4), hdata->cea_video_id);
hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(4), vic);
chksum = hdmi_chksum(hdata, HDMI_AVI_BYTE(1), chksum = hdmi_chksum(hdata, HDMI_AVI_BYTE(1),
infoframe->any.length, hdr_sum); infoframe->any.length, hdr_sum);
@ -1418,9 +1409,8 @@ static void hdmi_conf_init(struct hdmi_context *hdata)
static void hdmi_v13_mode_apply(struct hdmi_context *hdata) static void hdmi_v13_mode_apply(struct hdmi_context *hdata)
{ {
const struct hdmi_tg_regs *tg = &hdata->mode_conf.conf.v13_conf.tg; const struct hdmi_tg_regs *tg = &hdata->mode_conf.v13_conf.tg;
const struct hdmi_v13_core_regs *core = const struct hdmi_v13_core_regs *core = &hdata->mode_conf.v13_conf.core;
&hdata->mode_conf.conf.v13_conf.core;
int tries; int tries;
/* setting core registers */ /* setting core registers */
@ -1502,9 +1492,8 @@ static void hdmi_v13_mode_apply(struct hdmi_context *hdata)
static void hdmi_v14_mode_apply(struct hdmi_context *hdata) static void hdmi_v14_mode_apply(struct hdmi_context *hdata)
{ {
const struct hdmi_tg_regs *tg = &hdata->mode_conf.conf.v14_conf.tg; const struct hdmi_tg_regs *tg = &hdata->mode_conf.v14_conf.tg;
const struct hdmi_v14_core_regs *core = const struct hdmi_v14_core_regs *core = &hdata->mode_conf.v14_conf.core;
&hdata->mode_conf.conf.v14_conf.core;
int tries; int tries;
/* setting core registers */ /* setting core registers */
@ -1742,7 +1731,7 @@ static void hdmiphy_conf_apply(struct hdmi_context *hdata)
int i; int i;
/* pixel clock */ /* pixel clock */
i = hdmi_find_phy_conf(hdata, hdata->mode_conf.pixel_clock); i = hdmi_find_phy_conf(hdata, hdata->current_mode.clock * 1000);
if (i < 0) { if (i < 0) {
DRM_ERROR("failed to find hdmiphy conf\n"); DRM_ERROR("failed to find hdmiphy conf\n");
return; return;
@ -1794,15 +1783,10 @@ static void hdmi_set_reg(u8 *reg_pair, int num_bytes, u32 value)
static void hdmi_v13_mode_set(struct hdmi_context *hdata, static void hdmi_v13_mode_set(struct hdmi_context *hdata,
struct drm_display_mode *m) struct drm_display_mode *m)
{ {
struct hdmi_v13_core_regs *core = &hdata->mode_conf.conf.v13_conf.core; struct hdmi_v13_core_regs *core = &hdata->mode_conf.v13_conf.core;
struct hdmi_tg_regs *tg = &hdata->mode_conf.conf.v13_conf.tg; struct hdmi_tg_regs *tg = &hdata->mode_conf.v13_conf.tg;
unsigned int val; unsigned int val;
hdata->mode_conf.cea_video_id =
drm_match_cea_mode((struct drm_display_mode *)m);
hdata->mode_conf.pixel_clock = m->clock * 1000;
hdata->mode_conf.aspect_ratio = m->picture_aspect_ratio;
hdmi_set_reg(core->h_blank, 2, m->htotal - m->hdisplay); hdmi_set_reg(core->h_blank, 2, m->htotal - m->hdisplay);
hdmi_set_reg(core->h_v_line, 3, (m->htotal << 12) | m->vtotal); hdmi_set_reg(core->h_v_line, 3, (m->htotal << 12) | m->vtotal);
@ -1891,14 +1875,8 @@ static void hdmi_v13_mode_set(struct hdmi_context *hdata,
static void hdmi_v14_mode_set(struct hdmi_context *hdata, static void hdmi_v14_mode_set(struct hdmi_context *hdata,
struct drm_display_mode *m) struct drm_display_mode *m)
{ {
struct hdmi_tg_regs *tg = &hdata->mode_conf.conf.v14_conf.tg; struct hdmi_tg_regs *tg = &hdata->mode_conf.v14_conf.tg;
struct hdmi_v14_core_regs *core = struct hdmi_v14_core_regs *core = &hdata->mode_conf.v14_conf.core;
&hdata->mode_conf.conf.v14_conf.core;
hdata->mode_conf.cea_video_id =
drm_match_cea_mode((struct drm_display_mode *)m);
hdata->mode_conf.pixel_clock = m->clock * 1000;
hdata->mode_conf.aspect_ratio = m->picture_aspect_ratio;
hdmi_set_reg(core->h_blank, 2, m->htotal - m->hdisplay); hdmi_set_reg(core->h_blank, 2, m->htotal - m->hdisplay);
hdmi_set_reg(core->v_line, 2, m->vtotal); hdmi_set_reg(core->v_line, 2, m->vtotal);
@ -2014,6 +1992,8 @@ static void hdmi_mode_set(struct exynos_drm_display *display,
/* preserve mode information for later use. */ /* preserve mode information for later use. */
drm_mode_copy(&hdata->current_mode, mode); drm_mode_copy(&hdata->current_mode, mode);
hdata->cea_video_id = drm_match_cea_mode(mode);
if (hdata->drv_data->type == HDMI_TYPE13) if (hdata->drv_data->type == HDMI_TYPE13)
hdmi_v13_mode_set(hdata, mode); hdmi_v13_mode_set(hdata, mode);
else else