| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-12-21 12:42:25 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-12-21 12:42:25 (GMT) |
| commit | c7f003b07e257329573c17607b2af794689328cf (patch) | |
| tree | db7c46d9ca12bf1fc15d4c8724196afd768af711 | |
| parent | 11d289ddadcd64afd7d48a1edda8d99df0246525 (diff) | |
| parent | 5ff381acf9ea78c4c559d6f7b5c5abfaa0f617af (diff) | |
| download | common-c7f003b07e257329573c17607b2af794689328cf.zip common-c7f003b07e257329573c17607b2af794689328cf.tar.gz common-c7f003b07e257329573c17607b2af794689328cf.tar.bz2 | |
Merge "dv: use dv code to do hdr function in atom [2/2]" into p-tv-atom
| -rw-r--r-- | drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c index f95d717..2e1d643 100644 --- a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c +++ b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c @@ -3466,15 +3466,7 @@ static int dolby_vision_policy_process( mode_change = 0; return mode_change; } - if (vinfo && sink_support_dolby_vision(vinfo)) { - /* TV support DOVI, All -> DOVI */ - if (dolby_vision_mode != - DOLBY_VISION_OUTPUT_MODE_IPT_TUNNEL) { - pr_dolby_dbg("dovi output -> DOLBY_VISION_OUTPUT_MODE_IPT_TUNNEL\n"); - *mode = DOLBY_VISION_OUTPUT_MODE_IPT_TUNNEL; - mode_change = 1; - } - } else if (vinfo && sink_support_hdr(vinfo) + if (vinfo && sink_support_hdr(vinfo) && (dolby_vision_hdr10_policy & 2)) { /* TV support HDR, All -> HDR */ if (dolby_vision_mode != |