diff options
| author | Simon Glass <sjg@chromium.org> | 2016-11-13 14:22:07 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-11-25 17:59:31 -0700 |
| commit | 1b68283b64a7a1847410eff20886bd7bbfd8f9a6 (patch) | |
| tree | 223069f02f6b0612d54217498c596c8e1bc3f1ce | |
| parent | 7981394e550094bbbb2eb5e62065fa14c2ca77b0 (diff) | |
| download | u-boot-1b68283b64a7a1847410eff20886bd7bbfd8f9a6.tar.gz u-boot-1b68283b64a7a1847410eff20886bd7bbfd8f9a6.tar.bz2 u-boot-1b68283b64a7a1847410eff20886bd7bbfd8f9a6.zip | |
video: Track whether a display is in use
Mark a display as in use when display_enable() is called. This can avoid
a display being used by multiple video-output devices.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/video/display-uclass.c | 18 | ||||
| -rw-r--r-- | include/display.h | 10 |
2 files changed, 27 insertions, 1 deletions
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c index e4763de73d..e752eb07c4 100644 --- a/drivers/video/display-uclass.c +++ b/drivers/video/display-uclass.c @@ -23,10 +23,19 @@ int display_enable(struct udevice *dev, int panel_bpp, const struct display_timing *timing) { struct dm_display_ops *ops = display_get_ops(dev); + struct display_plat *disp_uc_plat; + int ret; if (!ops || !ops->enable) return -ENOSYS; - return ops->enable(dev, panel_bpp, timing); + ret = ops->enable(dev, panel_bpp, timing); + if (ret) + return ret; + + disp_uc_plat = dev_get_uclass_platdata(dev); + disp_uc_plat->in_use = true; + + return 0; } int display_read_timing(struct udevice *dev, struct display_timing *timing) @@ -48,6 +57,13 @@ int display_read_timing(struct udevice *dev, struct display_timing *timing) return edid_get_timing(buf, ret, timing, &panel_bits_per_colour); } +bool display_in_use(struct udevice *dev) +{ + struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + + return disp_uc_plat->in_use; +} + UCLASS_DRIVER(display) = { .id = UCLASS_DISPLAY, .name = "display", diff --git a/include/display.h b/include/display.h index b1c476628b..d0a08d4aaa 100644 --- a/include/display.h +++ b/include/display.h @@ -16,10 +16,12 @@ struct display_timing; * @source_id: ID for the source of the display data, typically a video * controller * @src_dev: Source device providing the video + * @in_use: Display is being used */ struct display_plat { int source_id; struct udevice *src_dev; + bool in_use; }; /** @@ -41,6 +43,14 @@ int display_read_timing(struct udevice *dev, struct display_timing *timing); int display_enable(struct udevice *dev, int panel_bpp, const struct display_timing *timing); +/** + * display_in_use() - Check if a display is in use by any device + * + * @return true if the device is in use (display_enable() has been called + * successfully), else false + */ +bool display_in_use(struct udevice *dev); + struct dm_display_ops { /** * read_timing() - Read information directly |