Skip to content

Commit

Permalink
Merge pull request torvalds#178 from xin3liang/hikey-3.18-720p-boot-i…
Browse files Browse the repository at this point in the history
…ssue

fix: Only 720p reset dsi when detect dsi transfer error
  • Loading branch information
docularxu committed Jan 26, 2016
2 parents ea86c8f + ac4a46e commit 54e6524
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/gpu/drm/i2c/adv7511.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511)
{
unsigned int irq0, irq1, state;
struct drm_encoder *encoder = adv7511->encoder;
struct drm_display_mode *mode = &adv7511->curr_mode;
struct hisi_dsi *dsi;
bool powered = adv7511->powered;
int ret;
Expand Down Expand Up @@ -599,8 +600,10 @@ static int adv7511_irq_process(struct adv7511 *adv7511)
regmap_update_bits(adv7511->regmap_cec, 0x38, BIT(1), BIT(1));
regmap_update_bits(adv7511->regmap_cec, 0x38, BIT(1), 0);

dsi = encoder_to_dsi(encoder);
dsi->reset(encoder);
if (mode->hdisplay == 1280 && mode->vdisplay == 720) {
dsi = encoder_to_dsi(encoder);
dsi->reset(encoder);
}
}

return 0;
Expand Down

0 comments on commit 54e6524

Please sign in to comment.