diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
commit | 326f3abf19360014dfae968aa3ab891d25599618 (patch) | |
tree | a57251231cb889e4e6b0f26d023990578b7bd98e /drivers/gpu/drm/i915/intel_sdvo_regs.h | |
parent | ef405e04abd0d4bc3f7082d241517f6db3f5c06d (diff) | |
parent | 64a574344dadbee5d01819d9d73b594d3cbe448e (diff) |
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo_regs.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo_regs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h index 9d030142ee43..770bdd6ecd9f 100644 --- a/drivers/gpu/drm/i915/intel_sdvo_regs.h +++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h @@ -708,6 +708,8 @@ struct intel_sdvo_enhancements_arg { #define SDVO_CMD_SET_AUDIO_STAT 0x91 #define SDVO_CMD_GET_AUDIO_STAT 0x92 #define SDVO_CMD_SET_HBUF_INDEX 0x93 + #define SDVO_HBUF_INDEX_ELD 0 + #define SDVO_HBUF_INDEX_AVI_IF 1 #define SDVO_CMD_GET_HBUF_INDEX 0x94 #define SDVO_CMD_GET_HBUF_INFO 0x95 #define SDVO_CMD_SET_HBUF_AV_SPLIT 0x96 |