Skip to content

Commit

Permalink
drm/bridge: adv7511: Use work_struct to defer hotplug handing to out …
Browse files Browse the repository at this point in the history
…of irq context

I was recently seeing issues with EDID probing, where
the logic to wait for the EDID read bit to be set by the
IRQ wasn't happening and the code would time out and fail.

Digging deeper, I found this was due to the fact that
IRQs were disabled as we were running in IRQ context from
the HPD signal.

Thus this patch changes the logic to handle the HPD signal
via a work_struct so we can be out of irq context.

With this patch, the EDID probing on hotplug does not time
out.

Cc: David Airlie <[email protected]>
Cc: Archit Taneja <[email protected]>
Cc: Wolfram Sang <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: [email protected]
Reviewed-by: Laurent Pinchart <[email protected]>
Tested-by: Laurent Pinchart <[email protected]>
Signed-off-by: John Stultz <[email protected]>
---
v3: Rename irq_work to hpd_work and remove extra whitespace, as
    suggested by Laurent
  • Loading branch information
johnstultz-work committed Feb 21, 2017
1 parent 3be564f commit 1053486
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/bridge/adv7511/adv7511.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ struct adv7511 {
bool edid_read;

wait_queue_head_t wq;
struct work_struct hpd_work;

struct drm_bridge bridge;
struct drm_connector connector;

Expand Down
11 changes: 10 additions & 1 deletion drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,13 @@ static bool adv7511_hpd(struct adv7511 *adv7511)
return false;
}

static void adv7511_hpd_work(struct work_struct *work)
{
struct adv7511 *adv7511 = container_of(work, struct adv7511, hpd_work);

drm_helper_hpd_irq_event(adv7511->connector.dev);
}

static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)
{
unsigned int irq0, irq1;
Expand All @@ -419,7 +426,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)
regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1);

if (process_hpd && irq0 & ADV7511_INT0_HPD && adv7511->bridge.encoder)
drm_helper_hpd_irq_event(adv7511->connector.dev);
schedule_work(&adv7511->hpd_work);

if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) {
adv7511->edid_read = true;
Expand Down Expand Up @@ -1006,6 +1013,8 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
goto err_i2c_unregister_edid;
}

INIT_WORK(&adv7511->hpd_work, adv7511_hpd_work);

if (i2c->irq) {
init_waitqueue_head(&adv7511->wq);

Expand Down

0 comments on commit 1053486

Please sign in to comment.