OMAP: DSS2: Taal: Improve taal_power_on() error handling
Check return values and bail out on errors. Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
parent
d803bb6e68
commit
f2a8b75c13
|
@ -696,16 +696,32 @@ static int taal_power_on(struct omap_dss_device *dssdev)
|
||||||
if (id2 == 0x00 || id2 == 0xff || id2 == 0x81)
|
if (id2 == 0x00 || id2 == 0xff || id2 == 0x81)
|
||||||
td->cabc_broken = true;
|
td->cabc_broken = true;
|
||||||
|
|
||||||
taal_dcs_write_1(DCS_BRIGHTNESS, 0xff);
|
r = taal_dcs_write_1(DCS_BRIGHTNESS, 0xff);
|
||||||
taal_dcs_write_1(DCS_CTRL_DISPLAY, (1<<2) | (1<<5)); /* BL | BCTRL */
|
if (r)
|
||||||
|
goto err;
|
||||||
|
|
||||||
taal_dcs_write_1(DCS_PIXEL_FORMAT, 0x7); /* 24bit/pixel */
|
r = taal_dcs_write_1(DCS_CTRL_DISPLAY,
|
||||||
|
(1<<2) | (1<<5)); /* BL | BCTRL */
|
||||||
|
if (r)
|
||||||
|
goto err;
|
||||||
|
|
||||||
taal_set_addr_mode(td->rotate, td->mirror);
|
r = taal_dcs_write_1(DCS_PIXEL_FORMAT, 0x7); /* 24bit/pixel */
|
||||||
if (!td->cabc_broken)
|
if (r)
|
||||||
taal_dcs_write_1(DCS_WRITE_CABC, td->cabc_mode);
|
goto err;
|
||||||
|
|
||||||
taal_dcs_write_0(DCS_DISPLAY_ON);
|
r = taal_set_addr_mode(td->rotate, td->mirror);
|
||||||
|
if (r)
|
||||||
|
goto err;
|
||||||
|
|
||||||
|
if (!td->cabc_broken) {
|
||||||
|
r = taal_dcs_write_1(DCS_WRITE_CABC, td->cabc_mode);
|
||||||
|
if (r)
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = taal_dcs_write_0(DCS_DISPLAY_ON);
|
||||||
|
if (r)
|
||||||
|
goto err;
|
||||||
|
|
||||||
r = _taal_enable_te(dssdev, td->te_enabled);
|
r = _taal_enable_te(dssdev, td->te_enabled);
|
||||||
if (r)
|
if (r)
|
||||||
|
|
Reference in New Issue