From 4971f30ce71c80a0290b03e685157af4fcf5d3a0 Mon Sep 17 00:00:00 2001 From: Vinu Deokaran Date: Thu, 19 Nov 2015 10:36:56 -0500 Subject: [PATCH] msm: mdss: add support to report display id Add support to report display ID back to user space through panel_info node. Change-Id: I0d711400b02f441bce17b27bd747034bd5b61b1a Signed-off-by: Vinu Deokaran --- drivers/video/fbdev/msm/mdss_fb.c | 4 ++-- drivers/video/fbdev/msm/mdss_panel.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index dcc29621529c..e64d5986065f 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -541,14 +541,14 @@ static ssize_t mdss_fb_get_panel_info(struct device *dev, "pu_en=%d\nxstart=%d\nwalign=%d\nystart=%d\nhalign=%d\n" "min_w=%d\nmin_h=%d\nroi_merge=%d\ndyn_fps_en=%d\n" "min_fps=%d\nmax_fps=%d\npanel_name=%s\n" - "primary_panel=%d\nis_pluggable=%d\n", + "primary_panel=%d\nis_pluggable=%d\ndisplay_id=%s\n", pinfo->partial_update_enabled, pinfo->xstart_pix_align, pinfo->width_pix_align, pinfo->ystart_pix_align, pinfo->height_pix_align, pinfo->min_width, pinfo->min_height, pinfo->partial_update_roi_merge, pinfo->dynamic_fps, pinfo->min_fps, pinfo->max_fps, pinfo->panel_name, pinfo->is_prim_panel, - pinfo->is_pluggable); + pinfo->is_pluggable, pinfo->display_id); return ret; } diff --git a/drivers/video/fbdev/msm/mdss_panel.h b/drivers/video/fbdev/msm/mdss_panel.h index 46294fe25583..b55dd952c1f5 100644 --- a/drivers/video/fbdev/msm/mdss_panel.h +++ b/drivers/video/fbdev/msm/mdss_panel.h @@ -142,6 +142,7 @@ struct mdss_rect { #define MDSS_MAX_PANEL_LEN 256 #define MDSS_INTF_MAX_NAME_LEN 5 +#define MDSS_DISPLAY_ID_MAX_LEN 16 struct mdss_panel_intf { char name[MDSS_INTF_MAX_NAME_LEN]; int type; @@ -628,6 +629,7 @@ struct mdss_panel_info { bool is_prim_panel; bool is_pluggable; + char display_id[MDSS_DISPLAY_ID_MAX_LEN]; /* refer sim_panel_modes enum for different modes */ u8 sim_panel_mode;