Change-Id: I059b2fb597e2898f11541d35e3348581bddaab0d
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: I04e2b96540b8700bc9345c0e32fd736ac23e43ae

This reverts commit b543b30a.

Change-Id: I76192d8ccd33667df0babf7838f1e4bf459bc5fe

Change-Id: I6adcc90463efc30bfde1e9c7fa5be34afd0d002b
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Conflicts:

	arch/arm/mach-meson8b/include/mach/tvregs.h
	drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c

Change-Id: I927b48c1c9e567b78bffc4415723389f6e6ba6ca

This is the fix for unreliable playback of H265 with Kodi. Reported by wrstaxy
and [1] is relevant thread for this.

 [1] http://forum.kodi.tv/showthread.php?tid=231301



Change-Id: Ib77529837c9d112dfbdfdc30c697df1af81345d8
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

This will enable the features below:
  1) When playing video, system will change HDMI’s fresh rate to video’s fresh rate.
  2) When playing video with resolution/fresh-rate as below, system will change
     HDMI’s fresh rate
        o. 480p59hz,
        o. 720p-50hz,720p-60hz
        o. 1080p-24hz,1080p-50hz,1080p-60hz
        o. 1080i59h
        o. 4k2k:4k2k-24hz, 4k2k-25hz,4k2k-30hz
  3) When playing video with fresh rate 23.97/29.97/59.94, it will fine tune
     HPLL(it won’t change HDMI’s refresh rate)
        o. 1080p-23.97hz
        o. 1080p-59.94hz
        o. 720p-59.94hz
        o. 4k2k-23.97hz
        o. 4k2k-29.97hz

Change-Id: Id22170a4ac561d6e28b0585f78a459e7b328a932
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Conflicts:
	drivers/amlogic/amports/vh264.c
squash commits:
	PD #97124. Add source frame rate notification to display device.
	Change-Id: I8152293ac5a73d47cad71d1076672bf1b8fa049e

	PD #97124: implement frame_rate_automation feature for vout/hdmi for m8/m8b.
	Change-Id: I8cd67544ee9d98f98c9b3f36c0a315621a6051d7

	PD #97124. Add source frame rate notification to display device for more decoder drivers.
	Change-Id: Icd465ccc6b4462082cb2ed84c626edc772e93029

	PD #97124 : fine tune HPLL but not change display mode to implement frame_rate_automation for vout/hdmi for m8/m8b
	Change-Id: Ia5c6fdb6d1153c3e95e32db12bc47b03da22c84b

	PD #97124 : add sync_duration_den/sync_duration_num change notify to video to implement frame_rate_automation for vout/hdmi for m8/m8b
	Change-Id: Icbc9874cbc332ca991cd8d2e4f9fb8d32d56b48d

	PD #97124: fix a handwritting error for 0.999*clk of m8.amlogic-pd-97124
	Change-Id: Ib70f8b353c5e31e93fb432ecbb014e0753ce0db3

Conflicts:

	arch/arm/mach-meson8b/hdmi_tx_hw/hdmi_tx_hw.c
	arch/arm/mach-meson8b/include/mach/tvregs.h
	drivers/amlogic/display/osd/osd_hw.c
	drivers/amlogic/display/vout/enc_clk_config.c
	drivers/amlogic/display/vout/tvconf.c
	drivers/amlogic/display/vout/tvmode.h
	drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c
	drivers/amlogic/hdmi/hdmi_tx/hdmi_tx_edid.c
	include/linux/amlogic/vout/vinfo.h

Change-Id: Id3f4b44396adc27d53d3d623840a5504b304cb0e

Change-Id: I07e6c77c05eb28d10eb3c739a93f6bcbb24674ce

Conflicts:

	drivers/amlogic/display/vout/enc_clk_config.c
	drivers/amlogic/display/vout/tvconf.c
	drivers/amlogic/display/vout/tvmode.h
	include/linux/amlogic/vout/vinfo.h

Change-Id: I9bbd0179d27d6b91ae7ad82d07e908b4798ffb51

Change-Id: Ie5ae276654e9a55eb70e92f29b2a946b96b658c5

Change-Id: I625c6bdee867422a70529ad3a8c2306f7c5e84c3

PD #98409-3. H264 video decoder: Error handling improvement. Disable DBLK douple buffer to avoid HW dead lock with error data. Adjust error watchdog timeout threashold. Use lighter reset for fatal error reset.

Conflicts:

	drivers/amlogic/amports/vh264.c

Change-Id: If6019d6b69df83843000c59837e11a64ccbd7ea9

Change-Id: I3ad2f983318c83fbd24356a51aa29371411a5b66

Change-Id: Ie9350577c2dc5885e3de97060017e06bca743493

Change-Id: I487fe9c66991ce80f288cdd5fc91c73d5cf8767d

Change-Id: I8b09c831ef96ea4aa452a2adac7080e7d7a1ec58

PD #98083. H.264 video decoder: Improve I only mode playback, including frame PTS process and error correction enhancement in ucode for I only mode.

Change-Id: If09715743f49a3def74414473da4c6e4099321cb

PD #98085 H.264 video decoder: Error frame display control moved out of ucode. Avoid entering video PTS discontinious process when error frames last more than discontinue threshold.

Change-Id: Iea1dc903e4480d6957d6dd386f750a62441ffc77

Change-Id: I395fb100747b634626555a962e0a72c7e0ba49f9

Change-Id: I1659af4e08f3a78c087572078399d9ce4f8b9482

PD #94872-2. H264 video decoder: Use kfifo API and code clean up for HLS resolution switching. Fix sync fense frame generation condition.

Change-Id: I72c83dd53924ae4464fda222653c3eeb50d5618a

Change-Id: I3863c01bb337a30f9bdd9db036c2492ba78fcc42

Change-Id: I98ec2367e3092848e2e597f8edff8aac448e444e

Change-Id: Ie4f19fb2fdf436c2f72da23507a4cc817796188d

Change-Id: Ifea8c807cefddc22a30a115c3ae6b20c2d641d11

Video decoder: Code clean up to use platform device with driver data instead of resource data structure.

Change-Id: I468267e943a19454fde2be393b1ac6d584505a14

Change-Id: Ia3f633542df8de6eed3bb8706de801222a85eed4

Conflicts:

	arch/arm/boot/dts/amlogic/meson8_k200b_1G_emmc_sdhc.dtd

Change-Id: Ie2271fc4e253da23022730d9fa57040178f4887f

PD #94888. MPEG video decoder: Change buffer management routines with kfifo API with frame buffer pointer checking. Add video frame provider reset event processing in video driver to handle fatal error reset when video reciver is dirrectly connected to decoder driver in debug mode.

Change-Id: I0030b6e0c328d646cc3248527d0740c40b9f69ef

Conflicts:

	drivers/amlogic/amports/vmpeg12.c

Change-Id: I838bc6938cde439a5410fdc7b38e00d73e6a3d96

These resolutions missed while merging the commit, 553ce69c

.

Change-Id: Ife43ac1e2a75aad41b44d384b00fb55b99afb87e
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: I3755e5d9524903840cb029559a94f084f645b724
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

To support MMC's reset from UHS-I mode, power must be back to 3.3V for its bus
and MMC Card's power must be done by power reset. Otherwise MMC card won't be
back from UHS mode and can not be initiated on next warm boot.

Change-Id: Ie1cb6bdafd791a10c7acbf389c02e24d6719c9c8
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: If5b9fa15afd829cf17646b0cba2047ac21c032c8
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Squashed commit of the following:

commit 0fa46efbdb1eae9771c3d5cf9b1f558ac725301f
Author: zongdong.jiao <zongdong.jiao@amlogic.com>
Date:   Fri Oct 10 21:37:53 2014 +0800

    PD #96169: hdmitx: update hpll setting

commit 795cefa28525f39e6ba5a8f113caf4f01f6466ba
Author: zongdong.jiao <zongdong.jiao@amlogic.com>
Date:   Fri Oct 10 21:37:10 2014 +0800

    PD #96169: hdmitx: merge 97042 commit to a single commit

Change-Id: Ib5ad1cc6bd390eeba093eb6b34fc256de470b595
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Conflicts:
	arch/arm/boot/dts/meson8b_odroidc.dts

Change-Id: I646ca2c20e25218da630ce965a1c43efcde2fbed