| Message ID | 1496146430-11430-5-git-send-email-shashank.sharma@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 30, 2017 at 05:43:43PM +0530, Shashank Sharma wrote: > CEA-861-F spec adds ycbcr420 deep color support information > in hf-vsdb block. This patch extends the existing hf-vsdb parsing > function by adding parsing of ycbcr420 deep color support from the > EDID and adding it into display information stored. > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Jose Abreu <joabreu@synopsys.com> > Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> > --- > drivers/gpu/drm/drm_edid.c | 15 +++++++++++++++ > include/drm/drm_connector.h | 3 +++ > include/drm/drm_edid.h | 5 +++++ > 3 files changed, 23 insertions(+) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index ce86528..50fa96e 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -4142,6 +4142,19 @@ drm_default_rgb_quant_range(const struct drm_display_mode *mode) > } > EXPORT_SYMBOL(drm_default_rgb_quant_range); > > +static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector, > + const u8 *db) > +{ > + struct drm_hdmi_info *info = &connector->display_info.hdmi; > + > + if (db[7] & DRM_EDID_YCBCR420_DC_48) > + info->ycbcr420_dc_modes |= DRM_EDID_YCBCR420_DC_48; > + if (db[7] & DRM_EDID_YCBCR420_DC_36) > + info->ycbcr420_dc_modes |= DRM_EDID_YCBCR420_DC_36; > + if (db[7] & DRM_EDID_YCBCR420_DC_30) > + info->ycbcr420_dc_modes |= DRM_EDID_YCBCR420_DC_30; > +} > + > static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, > const u8 *hf_vsdb) > { > @@ -4182,6 +4195,8 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, > scdc->scrambling.low_rates = true; > } > } > + > + drm_parse_ycbcr420_deep_color_info(connector, hf_vsdb); > } > > static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector, > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 07b10ab..49cc38c 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -148,6 +148,9 @@ struct drm_hdmi_info { > > /** @ycbcr420_vcb_map: bitmap of SVD index, to extraxt vcb modes */ > u64 ycbcr420_vcb_map; > + > + /** @ycbcr420_dc_modes: bitmap of deep color support index */ > + u8 ycbcr420_dc_modes; We seem to be wasting quite a few bits by reusing the EDID bit definition directly. Maybe we should consider packing these better? But I suppose we can look into that later. > }; > > /** > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index c07eb81..a4d174e7 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -213,6 +213,11 @@ struct detailed_timing { > #define DRM_EDID_HDMI_DC_30 (1 << 4) > #define DRM_EDID_HDMI_DC_Y444 (1 << 3) > > +/* YCBCR 420 deep color modes */ > +#define DRM_EDID_YCBCR420_DC_48 (1 << 6) > +#define DRM_EDID_YCBCR420_DC_36 (1 << 5) > +#define DRM_EDID_YCBCR420_DC_30 (1 << 4) > + > /* ELD Header Block */ > #define DRM_ELD_HEADER_BLOCK_SIZE 4 > > -- > 2.7.4
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index ce86528..50fa96e 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4142,6 +4142,19 @@ drm_default_rgb_quant_range(const struct drm_display_mode *mode) } EXPORT_SYMBOL(drm_default_rgb_quant_range); +static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector, + const u8 *db) +{ + struct drm_hdmi_info *info = &connector->display_info.hdmi; + + if (db[7] & DRM_EDID_YCBCR420_DC_48) + info->ycbcr420_dc_modes |= DRM_EDID_YCBCR420_DC_48; + if (db[7] & DRM_EDID_YCBCR420_DC_36) + info->ycbcr420_dc_modes |= DRM_EDID_YCBCR420_DC_36; + if (db[7] & DRM_EDID_YCBCR420_DC_30) + info->ycbcr420_dc_modes |= DRM_EDID_YCBCR420_DC_30; +} + static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, const u8 *hf_vsdb) { @@ -4182,6 +4195,8 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, scdc->scrambling.low_rates = true; } } + + drm_parse_ycbcr420_deep_color_info(connector, hf_vsdb); } static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector, diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 07b10ab..49cc38c 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -148,6 +148,9 @@ struct drm_hdmi_info { /** @ycbcr420_vcb_map: bitmap of SVD index, to extraxt vcb modes */ u64 ycbcr420_vcb_map; + + /** @ycbcr420_dc_modes: bitmap of deep color support index */ + u8 ycbcr420_dc_modes; }; /** diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index c07eb81..a4d174e7 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -213,6 +213,11 @@ struct detailed_timing { #define DRM_EDID_HDMI_DC_30 (1 << 4) #define DRM_EDID_HDMI_DC_Y444 (1 << 3) +/* YCBCR 420 deep color modes */ +#define DRM_EDID_YCBCR420_DC_48 (1 << 6) +#define DRM_EDID_YCBCR420_DC_36 (1 << 5) +#define DRM_EDID_YCBCR420_DC_30 (1 << 4) + /* ELD Header Block */ #define DRM_ELD_HEADER_BLOCK_SIZE 4
CEA-861-F spec adds ycbcr420 deep color support information in hf-vsdb block. This patch extends the existing hf-vsdb parsing function by adding parsing of ycbcr420 deep color support from the EDID and adding it into display information stored. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Jose Abreu <joabreu@synopsys.com> Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> --- drivers/gpu/drm/drm_edid.c | 15 +++++++++++++++ include/drm/drm_connector.h | 3 +++ include/drm/drm_edid.h | 5 +++++ 3 files changed, 23 insertions(+)