shinys000114/kernel_common_drivers
1
0
Fork 0
mirror of https://github.com/hardkernel/kernel_common_drivers.git synced 2026-06-25 12:03:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

hdmitx: move vinfo out from format_para [1/1]

Browse Source 
PD#SWPL-125155

Problem:
vinfo is defined for other drivers, and is not
part of hdmitx ip/hw.

Solution:
move vinfo to hdmitx_common as temp solution,
will move to drm driver level later.

Verify:
verify on ohm.

Test:
DRM-TX-17, DRM-TX-19, DRM-TX-8

Change-Id: I9682e256eddf50a35688e9efaaede0c614b82b24
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
This commit is contained in:
sky zhou
2023-05-23 23:19:51 +08:00
committed by gerrit autosubmit
parent 419a23e440
commit 1f858a9ac0
10 changed files with 93 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/vout/hdmitx/hdmi_common/hdmi_parameters.c
+66 -66
View File
@@ -38,7 +38,7 @@ static struct hdmi_format_para fmt_para_1920x1080p60_16x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -88,7 +88,7 @@ static struct hdmi_format_para fmt_para_1920x1080p120_16x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080p120hz",
.mode = VMODE_HDMI,
.width = 1920,
@@ -137,7 +137,7 @@ static struct hdmi_format_para fmt_para_1920x1080p30_16x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080p30hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -186,7 +186,7 @@ static struct hdmi_format_para fmt_para_1920x1080p50_16x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080p50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -235,7 +235,7 @@ static struct hdmi_format_para fmt_para_1920x1080p25_16x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080p25hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -285,7 +285,7 @@ static struct hdmi_format_para fmt_para_1920x1080p24_16x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080p24hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -335,7 +335,7 @@ static struct hdmi_format_para fmt_para_3840x2160p30_16x9 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p30hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -385,7 +385,7 @@ static struct hdmi_format_para fmt_para_3840x2160p60_16x9 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -434,7 +434,7 @@ static struct hdmi_format_para fmt_para_3840x2160p50_16x9 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -483,7 +483,7 @@ static struct hdmi_format_para fmt_para_3840x2160p25_16x9 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p25hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -533,7 +533,7 @@ static struct hdmi_format_para fmt_para_3840x2160p24_16x9 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p24hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -582,7 +582,7 @@ static struct hdmi_format_para fmt_para_4096x2160p24_256x135 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte24hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -631,7 +631,7 @@ static struct hdmi_format_para fmt_para_4096x2160p25_256x135 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte25hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -681,7 +681,7 @@ static struct hdmi_format_para fmt_para_4096x2160p30_256x135 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte30hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -730,7 +730,7 @@ static struct hdmi_format_para fmt_para_4096x2160p50_256x135 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -780,7 +780,7 @@ static struct hdmi_format_para fmt_para_4096x2160p60_256x135 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -830,7 +830,7 @@ static struct hdmi_format_para fmt_para_1920x1080i60_16x9 = {
.v_back = 15,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080i60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -879,7 +879,7 @@ static struct hdmi_format_para fmt_para_1920x1080i50_16x9 = {
.v_back = 15,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1080i50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -929,7 +929,7 @@ static struct hdmi_format_para fmt_para_1280x720p60_16x9 = {
.v_back = 20,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "720p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -978,7 +978,7 @@ static struct hdmi_format_para fmt_para_1280x720p50_16x9 = {
.v_back = 20,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "720p50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1028,7 +1028,7 @@ static struct hdmi_format_para fmt_para_720x480p60_4x3 = {
.v_back = 30,
.v_sync_ln = 7,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "480p60hz_4x3",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1078,7 +1078,7 @@ static struct hdmi_format_para fmt_para_720x480p60_16x9 = {
.v_back = 30,
.v_sync_ln = 7,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "480p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1128,7 +1128,7 @@ static struct hdmi_format_para fmt_para_720x480i60_4x3 = {
.v_back = 15,
.v_sync_ln = 4,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "480i60hz_4x3",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1178,7 +1178,7 @@ static struct hdmi_format_para fmt_para_720x480i60_16x9 = {
.v_back = 15,
.v_sync_ln = 4,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "480i60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1227,7 +1227,7 @@ static struct hdmi_format_para fmt_para_720x576p50_4x3 = {
.v_back = 39,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "576p50hz_4x3",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1276,7 +1276,7 @@ static struct hdmi_format_para fmt_para_720x576p50_16x9 = {
.v_back = 39,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "576p50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1325,7 +1325,7 @@ static struct hdmi_format_para fmt_para_720x576i50_4x3 = {
.v_back = 19,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "576i50hz_4x3",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1374,7 +1374,7 @@ static struct hdmi_format_para fmt_para_720x576i50_16x9 = {
.v_back = 19,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "576i50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1425,7 +1425,7 @@ static struct hdmi_format_para fmt_para_3840x2160p50_16x9_y420 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p50hz420",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1474,7 +1474,7 @@ static struct hdmi_format_para fmt_para_4096x2160p50_256x135_y420 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte50hz420",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1524,7 +1524,7 @@ static struct hdmi_format_para fmt_para_3840x2160p60_16x9_y420 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160p60hz420",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1574,7 +1574,7 @@ static struct hdmi_format_para fmt_para_4096x2160p60_256x135_y420 = {
.v_back = 72,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "smpte60hz420",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1598,7 +1598,7 @@ static struct hdmi_format_para fmt_para_non_hdmi_fmt = {
.vic = HDMI_UNKNOWN,
.name = "invalid",
.sname = "invalid",
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "invalid",
.mode = VMODE_MAX,
.width = 1920,
@@ -1646,7 +1646,7 @@ static struct hdmi_format_para fmt_para_2560x1080p50_64x27 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2560x1080p50hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1694,7 +1694,7 @@ static struct hdmi_format_para fmt_para_2560x1080p60_64x27 = {
.v_back = 11,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2560x1080p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1745,7 +1745,7 @@ static struct hdmi_format_para fmt_para_vesa_640x480p60_4x3 = {
.v_back = 33,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "640x480p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1794,7 +1794,7 @@ static struct hdmi_format_para fmt_para_vesa_800x480p60_4x3 = {
.v_back = 10,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "800x480p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1843,7 +1843,7 @@ static struct hdmi_format_para fmt_para_vesa_800x600p60_4x3 = {
.v_back = 23,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "800x600p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1892,7 +1892,7 @@ static struct hdmi_format_para fmt_para_vesa_852x480p60_213x120 = {
.v_back = 40,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "852x480p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1941,7 +1941,7 @@ static struct hdmi_format_para fmt_para_vesa_854x480p60_427x240 = {
.v_back = 39,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "854x480p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -1990,7 +1990,7 @@ static struct hdmi_format_para fmt_para_vesa_1024x600p60_17x10 = {
.v_back = 29,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1024x600p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2039,7 +2039,7 @@ static struct hdmi_format_para fmt_para_vesa_1024x768p60_4x3 = {
.v_back = 29,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1024x768p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2087,7 +2087,7 @@ static struct hdmi_format_para fmt_para_vesa_1152x864p75_4x3 = {
.v_sync = 3,
.v_back = 32,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1152x864p75hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2135,7 +2135,7 @@ static struct hdmi_format_para fmt_para_vesa_1280x768p60_5x3 = {
.v_sync = 7,
.v_back = 20,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1280x768p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2184,7 +2184,7 @@ static struct hdmi_format_para fmt_para_vesa_1280x800p60_8x5 = {
.v_back = 14,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1280x800p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2232,7 +2232,7 @@ static struct hdmi_format_para fmt_para_vesa_1280x960p60_4x3 = {
.v_sync = 3,
.v_back = 36,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1280x960p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2281,7 +2281,7 @@ static struct hdmi_format_para fmt_para_vesa_1280x1024p60_5x4 = {
.v_back = 38,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1280x1024p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2330,7 +2330,7 @@ static struct hdmi_format_para fmt_para_vesa_1360x768p60_16x9 = {
.v_back = 18,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1360x768p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2379,7 +2379,7 @@ static struct hdmi_format_para fmt_para_vesa_1366x768p60_16x9 = {
.v_back = 24,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1366x768p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2428,7 +2428,7 @@ static struct hdmi_format_para fmt_para_vesa_1400x1050p60_4x3 = {
.v_back = 32,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1400x1050p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2477,7 +2477,7 @@ static struct hdmi_format_para fmt_para_vesa_1440x900p60_8x5 = {
.v_back = 25,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1440x900p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2527,7 +2527,7 @@ static struct hdmi_format_para fmt_para_vesa_1440x2560p60_9x16 = {
.v_back = 16,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1440x2560p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2576,7 +2576,7 @@ static struct hdmi_format_para fmt_para_vesa_1600x900p60_16x9 = {
.v_back = 96,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1600x900p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2625,7 +2625,7 @@ static struct hdmi_format_para fmt_para_vesa_1600x1200p60_4x3 = {
.v_back = 46,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1600x1200p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2674,7 +2674,7 @@ static struct hdmi_format_para fmt_para_vesa_1680x1050p60_8x5 = {
.v_back = 30,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1680x1050p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2723,7 +2723,7 @@ static struct hdmi_format_para fmt_para_vesa_1920x1200p60_8x5 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "1920x1200p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2772,7 +2772,7 @@ static struct hdmi_format_para fmt_para_vesa_2048x1080p24_256x135 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2048x1080p24hz",
.mode = VMODE_HDMI,
.width = 2048,
@@ -2820,7 +2820,7 @@ static struct hdmi_format_para fmt_para_vesa_2160x1200p90_9x5 = {
.v_back = 3,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2160x1200p90hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2869,7 +2869,7 @@ static struct hdmi_format_para fmt_para_vesa_2560x1440p60_16x9 = {
.v_back = 33,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2560x1440p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2918,7 +2918,7 @@ static struct hdmi_format_para fmt_para_vesa_2560x1600p60_8x5 = {
.v_back = 49,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2560x1600p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -2966,7 +2966,7 @@ static struct hdmi_format_para fmt_para_vesa_3440x1440p60_43x18 = {
.v_back = 28,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "3440x1440p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -3015,7 +3015,7 @@ static struct hdmi_format_para fmt_para_vesa_2400x1200p90_2x1 = {
.v_back = 30,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "2400x1200p90hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -3064,7 +3064,7 @@ static struct hdmi_format_para fmt_para_vesa_3840x1080p60_32x9 = {
.v_back = 36,
.v_sync_ln = 1,
},
.hdmitx_vinfo = {
.deprecated_vinfo = {
.name = "3840x1080p60hz",
.mode = VMODE_HDMI,
.frac = 0,
@@ -3478,11 +3478,11 @@ struct vinfo_s *hdmi_get_valid_vinfo(char *mode)
mode_[i] = 0;
for (i = 0; all_fmt_paras[i]; i++) {
if (all_fmt_paras[i]->hdmitx_vinfo.mode == VMODE_MAX)
if (all_fmt_paras[i]->deprecated_vinfo.mode == VMODE_MAX)
continue;
if (strncmp(all_fmt_paras[i]->hdmitx_vinfo.name, mode_,
if (strncmp(all_fmt_paras[i]->deprecated_vinfo.name, mode_,
strlen(mode_)) == 0) {
info = &all_fmt_paras[i]->hdmitx_vinfo;
info = &all_fmt_paras[i]->deprecated_vinfo;
break;
}
}
drivers/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
+12 -9
View File
@@ -765,8 +765,8 @@ static int set_disp_mode_auto(void)
vic = hdmitx_edid_get_VIC(hdev, mode, 1);
if (vic != HDMI_0_UNKNOWN && vic != para->vic) {
const struct hdmi_format_para *tmp = hdmi_get_fmt_paras(vic);
enum hdmi_color_depth cd = tx_comm->fmt_para.hdmitx_vinfo.cd;
enum hdmi_colorspace cs = tx_comm->fmt_para.hdmitx_vinfo.cs;
enum hdmi_color_depth cd = tx_comm->hdmitx_vinfo.cd;
enum hdmi_colorspace cs = tx_comm->hdmitx_vinfo.cs;
pr_info("%s update (%d) to new vic (%d-%s)\n",
__func__, para->vic, vic, tmp->sname);
@@ -1767,8 +1767,11 @@ static void update_current_para_from_mode(struct hdmitx_dev *hdev, const char *n
para->sname ? para->sname : para->name);
memcpy(&tx_comm->fmt_para, para, sizeof(struct hdmi_format_para));
tx_comm->fmt_para.hdmitx_vinfo.cs = para->cs;
tx_comm->fmt_para.hdmitx_vinfo.cd = para->cd;
memcpy(&tx_comm->hdmitx_vinfo, &para->deprecated_vinfo, sizeof(struct vinfo_s));
/*dynamic info, always need set.s*/
tx_comm->hdmitx_vinfo.cs = para->cs;
tx_comm->hdmitx_vinfo.cd = para->cd;
}
struct vsif_debug_save vsif_debug_info;
@@ -7826,11 +7829,11 @@ static int drm_hdmitx_get_timing_para(int vic, struct drm_hdmitx_timing_para *pa
timing = &hdmi_para->timing;
strncpy(para->name, hdmi_para->hdmitx_vinfo.name, DRM_DISPLAY_MODE_LEN);
para->sync_dura_num = hdmi_para->hdmitx_vinfo.sync_duration_num;
para->sync_dura_den = hdmi_para->hdmitx_vinfo.sync_duration_den;
if (hdmi_para->hdmitx_vinfo.field_height !=
hdmi_para->hdmitx_vinfo.height)
strncpy(para->name, hdmi_para->deprecated_vinfo.name, DRM_DISPLAY_MODE_LEN);
para->sync_dura_num = hdmi_para->deprecated_vinfo.sync_duration_num;
para->sync_dura_den = hdmi_para->deprecated_vinfo.sync_duration_den;
if (hdmi_para->deprecated_vinfo.field_height !=
hdmi_para->deprecated_vinfo.height)
para->pi_mode = 0;
else
para->pi_mode = 1;
drivers/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c
+2 -2
View File
@@ -1010,7 +1010,7 @@ next:
set_vid_clk_div(hdev, p_enc[j].vid_clk_div);
set_hdmi_tx_pixel_div(hdev, p_enc[j].hdmi_tx_pixel_div);
if (hdev->tx_comm.fmt_para.hdmitx_vinfo.viu_mux == VIU_MUX_ENCI) {
if (hdev->tx_comm.hdmitx_vinfo.viu_mux == VIU_MUX_ENCI) {
set_enci_div(hdev, p_enc[j].enci_div);
hdmitx_enable_enci_clk(hdev);
} else {
@@ -1167,7 +1167,7 @@ void hdmitx_set_clk(struct hdmitx_dev *hdev)
void hdmitx_disable_clk(struct hdmitx_dev *hdev)
{
/* cts_encp/enci_clk */
if (hdev->tx_comm.fmt_para.hdmitx_vinfo.viu_mux == VIU_MUX_ENCI)
if (hdev->tx_comm.hdmitx_vinfo.viu_mux == VIU_MUX_ENCI)
hdmitx_disable_enci_clk(hdev);
else
hdmitx_disable_encp_clk(hdev);
drivers/media/vout/hdmitx21/hdmi_param.c
+1 -2
View File
@@ -319,8 +319,7 @@ int hdmitx21_get_fmtpara(const char *mode, const char *attr, struct hdmi_format_
{
struct hdmitx_dev *hdev = get_hdmitx21_device();
struct hdmitx_common *tx_comm = &hdev->tx_comm;
// struct hdmi_format_para *para = &tx_comm->fmt_para;
struct vinfo_s *tx_vinfo = &para->hdmitx_vinfo;
struct vinfo_s *tx_vinfo = &tx_comm->hdmitx_vinfo;
const struct hdmi_timing *timing;
if (!mode || !attr)
drivers/media/vout/hdmitx21/hdmi_tx_main.c
+5 -8
View File
@@ -911,10 +911,7 @@ static ssize_t disp_mode_show(struct device *dev,
struct hdmitx_dev *hdev = get_hdmitx21_device();
struct hdmi_format_para *para = &hdev->tx_comm.fmt_para;
struct hdmi_timing *timing = &para->timing;
struct vinfo_s *vinfo = &para->hdmitx_vinfo;
if (!para)
return pos;
struct vinfo_s *vinfo = &hdev->tx_comm.hdmitx_vinfo;
pos += snprintf(buf + pos, PAGE_SIZE, "cd/cs/cr: %d/%d/%d\n", para->cd,
para->cs, para->cr);
@@ -4577,7 +4574,7 @@ static struct vinfo_s *hdmitx_get_current_vinfo(void *data)
{
struct hdmitx_dev *hdev = get_hdmitx21_device();
return &hdev->tx_comm.fmt_para.hdmitx_vinfo;
return &hdev->tx_comm.hdmitx_vinfo;
}
static int hdmitx_set_current_vmode(enum vmode_e mode, void *data)
@@ -4639,8 +4636,8 @@ static enum vmode_e hdmitx_validate_vmode(char *_mode, u32 frac, void *data)
*else
* hdev->frac_rate_policy = 0;
*/
para->hdmitx_vinfo.info_3d = NON_3D;
para->hdmitx_vinfo.vout_device = &hdmitx_vdev;
hdev->tx_comm.hdmitx_vinfo.info_3d = NON_3D;
hdev->tx_comm.hdmitx_vinfo.vout_device = &hdmitx_vdev;
return VMODE_HDMI;
}
return VMODE_MAX;
@@ -6722,7 +6719,7 @@ static bool drm_hdmitx_chk_mode_attr_sup(char *mode, char *attr)
para = hdmitx21_tst_fmt_name(mode, attr);
if (para) {
pr_info("sname = %s\n", para->hdmitx_vinfo.name);
pr_info("sname = %s\n", hdmitx21_device.tx_comm.hdmitx_vinfo.name);
pr_info("char_clk = %d\n", para->tmds_clk);
pr_info("cd = %d\n", para->cd);
pr_info("cs = %d\n", para->cs);
drivers/media/vout/hdmitx21/hdmi_tx_vrr.c
+1 -1
View File
@@ -1010,7 +1010,7 @@ static struct vinfo_s *hdmitx_get_curvinfo(void *data)
{
struct hdmitx_dev *hdev = get_hdmitx21_device();
return &hdev->tx_comm.fmt_para.hdmitx_vinfo;
return &hdev->tx_comm.hdmitx_vinfo;
}
void hdmitx_register_vrr(struct hdmitx_dev *hdev)
drivers/media/vout/hdmitx21/hw/hdmi_tx_hw.c
+2 -4
View File
@@ -1650,7 +1650,7 @@ static void hdmitx_debug(struct hdmitx_dev *hdev, const char *buf)
unsigned long value = 0;
static enum hdmitx_event event_type = HDMITX_NONE_EVENT;
struct hdmi_format_para *para = &hdev->tx_comm.fmt_para;
struct vinfo_s *vinfo;
struct vinfo_s *vinfo = &hdev->tx_comm.hdmitx_vinfo;
if (!buf)
return;
@@ -1721,7 +1721,6 @@ static void hdmitx_debug(struct hdmitx_dev *hdev, const char *buf)
hdev->tx_hw.cntlmisc(&hdev->tx_hw, MISC_I2C_REACTIVE, 0);
return;
} else if (strncmp(tmpbuf, "bist", 4) == 0) {
vinfo = &para->hdmitx_vinfo;
if (strncmp(tmpbuf + 4, "off", 3) == 0) {
if (vinfo->viu_mux == VIU_MUX_ENCI) {
hd21_write_reg(ENCI_TST_EN, 0);
@@ -1987,9 +1986,8 @@ static char *hdmitx_bist_str[] = {
static void hdmitx_debug_bist(struct hdmitx_dev *hdev, u32 num)
{
u32 h_active, video_start;
struct vinfo_s *vinfo;
struct vinfo_s *vinfo = &hdev->tx_comm.hdmitx_vinfo;
vinfo = &hdev->tx_comm.fmt_para.hdmitx_vinfo;
switch (num) {
case 1:
case 2:
drivers/media/vout/hdmitx21/hw/hw_clk.c
+1 -1
View File
@@ -1412,7 +1412,7 @@ void hdmitx21_set_clk(struct hdmitx_dev *hdev)
void hdmitx21_disable_clk(struct hdmitx_dev *hdev)
{
/* cts_encp/enci_clk */
if (hdev->tx_comm.fmt_para.hdmitx_vinfo.viu_mux == VIU_MUX_ENCI)
if (hdev->tx_comm.hdmitx_vinfo.viu_mux == VIU_MUX_ENCI)
hdmitx_disable_enci_clk(hdev);
else
hdmitx_disable_encp_clk(hdev);
include/linux/amlogic/media/vout/hdmitx_common/hdmitx_common.h
+1
View File
@@ -36,6 +36,7 @@ struct hdmitx_common {
u32 cur_VIC;
/*current format para.*/
struct hdmi_format_para fmt_para;
struct vinfo_s hdmitx_vinfo;
/* allm_mode: 1/on 0/off */
u32 allm_mode;
include/linux/amlogic/media/vout/hdmitx_common/hdmitx_types.h
+2 -1
View File
@@ -33,7 +33,8 @@ struct hdmi_format_para {
/*valid info end*/
struct hdmi_timing timing;
struct vinfo_s hdmitx_vinfo;
/*TODO:will removed later, dont use anymore.*/
struct vinfo_s deprecated_vinfo;
/*valid info*/
u32 frac_mode;