diff mbox

[RESEND] drm/edid: add #defines for ELD versions

Message ID 1428911834-26188-1-git-send-email-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula April 13, 2015, 7:57 a.m. UTC
Add ELD versions according to HDA Specification v1.0a.

2 indicates version 2, which supports CEA_Ver 861D or below. Maximum
Baseline ELD size of 80 bytes (15 SAD count).

31 indicates an ELD that has been partially populated through
implementation specific mean of default programming before an external
graphics driver is loaded. Only the field that is called out as "canned"
field will be populated, and audio driver should ignore the non "canned"
field.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 include/drm/drm_edid.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Ville Syrjälä April 13, 2015, 10:15 a.m. UTC | #1
On Mon, Apr 13, 2015 at 10:57:14AM +0300, Jani Nikula wrote:
> Add ELD versions according to HDA Specification v1.0a.
> 
> 2 indicates version 2, which supports CEA_Ver 861D or below. Maximum
> Baseline ELD size of 80 bytes (15 SAD count).
> 
> 31 indicates an ELD that has been partially populated through
> implementation specific mean of default programming before an external
> graphics driver is loaded. Only the field that is called out as "canned"
> field will be populated, and audio driver should ignore the non "canned"
> field.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Matches the spec.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  include/drm/drm_edid.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index 87d85e81d3a7..799050198323 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -215,6 +215,8 @@ struct detailed_timing {
>  #define DRM_ELD_VER			0
>  # define DRM_ELD_VER_SHIFT		3
>  # define DRM_ELD_VER_MASK		(0x1f << 3)
> +# define DRM_ELD_VER_CEA861D		(2 << 3) /* supports 861D or below */
> +# define DRM_ELD_VER_CANNED		(0x1f << 3)
>  
>  #define DRM_ELD_BASELINE_ELD_LEN	2	/* in dwords! */
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter April 13, 2015, 1 p.m. UTC | #2
On Mon, Apr 13, 2015 at 01:15:49PM +0300, Ville Syrjälä wrote:
> On Mon, Apr 13, 2015 at 10:57:14AM +0300, Jani Nikula wrote:
> > Add ELD versions according to HDA Specification v1.0a.
> > 
> > 2 indicates version 2, which supports CEA_Ver 861D or below. Maximum
> > Baseline ELD size of 80 bytes (15 SAD count).
> > 
> > 31 indicates an ELD that has been partially populated through
> > implementation specific mean of default programming before an external
> > graphics driver is loaded. Only the field that is called out as "canned"
> > field will be populated, and audio driver should ignore the non "canned"
> > field.
> > 
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> Matches the spec.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Merged to topic/drm-misc, will send a pull request for 4.1 still to Dave
tomorrow or so.

Thanks, Daniel
diff mbox

Patch

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 87d85e81d3a7..799050198323 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -215,6 +215,8 @@  struct detailed_timing {
 #define DRM_ELD_VER			0
 # define DRM_ELD_VER_SHIFT		3
 # define DRM_ELD_VER_MASK		(0x1f << 3)
+# define DRM_ELD_VER_CEA861D		(2 << 3) /* supports 861D or below */
+# define DRM_ELD_VER_CANNED		(0x1f << 3)
 
 #define DRM_ELD_BASELINE_ELD_LEN	2	/* in dwords! */