drm/omap: Use consistent name for struct videomode
Use 'vm' to refer to a struct videomode instead of 'p', 't', 'timings' or something else. The code will be easier to follow if we use consistent names. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:

committed by
Tomi Valkeinen

parent
4520ff28aa
commit
da11bbbb10
@@ -172,7 +172,7 @@ static void hdmi_power_off_core(struct omap_dss_device *dssdev)
|
||||
static int hdmi_power_on_full(struct omap_dss_device *dssdev)
|
||||
{
|
||||
int r;
|
||||
struct videomode *p;
|
||||
struct videomode *vm;
|
||||
enum omap_channel channel = dssdev->dispc_channel;
|
||||
struct dss_pll_clock_info hdmi_cinfo = { 0 };
|
||||
unsigned pc;
|
||||
@@ -181,13 +181,13 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
p = &hdmi.cfg.timings;
|
||||
vm = &hdmi.cfg.vm;
|
||||
|
||||
DSSDBG("hdmi_power_on hactive= %d vactive = %d\n", p->hactive,
|
||||
p->vactive);
|
||||
DSSDBG("hdmi_power_on hactive= %d vactive = %d\n", vm->hactive,
|
||||
vm->vactive);
|
||||
|
||||
pc = p->pixelclock;
|
||||
if (p->flags & DISPLAY_FLAGS_DOUBLECLK)
|
||||
pc = vm->pixelclock;
|
||||
if (vm->flags & DISPLAY_FLAGS_DOUBLECLK)
|
||||
pc *= 2;
|
||||
|
||||
/* DSS_HDMI_TCLK is bitclk / 10 */
|
||||
@@ -227,7 +227,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
|
||||
hdmi5_configure(&hdmi.core, &hdmi.wp, &hdmi.cfg);
|
||||
|
||||
/* tv size */
|
||||
dss_mgr_set_timings(channel, p);
|
||||
dss_mgr_set_timings(channel, vm);
|
||||
|
||||
r = dss_mgr_enable(channel);
|
||||
if (r)
|
||||
@@ -273,30 +273,30 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev)
|
||||
}
|
||||
|
||||
static int hdmi_display_check_timing(struct omap_dss_device *dssdev,
|
||||
struct videomode *timings)
|
||||
struct videomode *vm)
|
||||
{
|
||||
if (!dispc_mgr_timings_ok(dssdev->dispc_channel, timings))
|
||||
if (!dispc_mgr_timings_ok(dssdev->dispc_channel, vm))
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void hdmi_display_set_timing(struct omap_dss_device *dssdev,
|
||||
struct videomode *timings)
|
||||
struct videomode *vm)
|
||||
{
|
||||
mutex_lock(&hdmi.lock);
|
||||
|
||||
hdmi.cfg.timings = *timings;
|
||||
hdmi.cfg.vm = *vm;
|
||||
|
||||
dispc_set_tv_pclk(timings->pixelclock);
|
||||
dispc_set_tv_pclk(vm->pixelclock);
|
||||
|
||||
mutex_unlock(&hdmi.lock);
|
||||
}
|
||||
|
||||
static void hdmi_display_get_timings(struct omap_dss_device *dssdev,
|
||||
struct videomode *timings)
|
||||
struct videomode *vm)
|
||||
{
|
||||
*timings = hdmi.cfg.timings;
|
||||
*vm = hdmi.cfg.vm;
|
||||
}
|
||||
|
||||
static void hdmi_dump_regs(struct seq_file *s)
|
||||
@@ -379,7 +379,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
|
||||
|
||||
if (hdmi.audio_configured) {
|
||||
r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config,
|
||||
hdmi.cfg.timings.pixelclock);
|
||||
hdmi.cfg.vm.pixelclock);
|
||||
if (r) {
|
||||
DSSERR("Error restoring audio configuration: %d", r);
|
||||
hdmi.audio_abort_cb(&hdmi.pdev->dev);
|
||||
@@ -670,7 +670,7 @@ static int hdmi_audio_config(struct device *dev,
|
||||
}
|
||||
|
||||
ret = hdmi5_audio_config(&hd->core, &hd->wp, dss_audio,
|
||||
hd->cfg.timings.pixelclock);
|
||||
hd->cfg.vm.pixelclock);
|
||||
|
||||
if (!ret) {
|
||||
hd->audio_configured = true;
|
||||
|
Reference in New Issue
Block a user