Conflicts:
	drivers/hardkernel/Kconfig
	drivers/hardkernel/Makefile

Change-Id: I908ba112ca715aab2f46ce5b60129d02b2f36638

/* Dell P2314T USB capacitive Screen */
USB_VENDOR_ID_DELL	I0x2149
USB_DEVICE_ID_P2314T_TOUCH	I0x2316

USB_VENDOR_ID_IRTOUCHSYSTEMS	0x6615
USB_DEVICE_ID_IRTOUCH_TOUCH	0x0001

Change-Id: I64cd5f71d14f5e851bb547ffe7ae899038cbbc18

This patch is picked from [1].

[1] https://github.com/runnerway/linux/commit/498f38d051bce31f31190158d9afb62c5850c2ab

Change-Id: I874ba568943ace33a05fdcabe06abefd0e72ca62

http://forum.odroid.com/viewtopic.php?f=111&t=9972#p110751

Change-Id: I045d1254959037574d6f94885b0d5fad6267201e

Change-Id: I87d7f1825a0b51c129a0cfcd3343ac0cb39d687d

Merge "ODROID-C1: add voutmode_* functions to identify the display port." into odroidc-3.10.y-android

Need this device to grab data for DIY Ambilight Project with hyperion on odroid-c1.

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

Change-Id: I02fd9972e1065996d3c5ee609beac84426d086b4

Conflicts:
	arch/arm/boot/dts/amlogic/meson8b_odroidc.dtd
	arch/arm/configs/odroidc_defconfig

Change-Id: If25881e9a2ad3cdbb2fb37b046032cab32e6f0d8

Change-Id: Ice54b00ad9692eb0f368ec9a420d12685c692d82

1. thread 1 is here https://github.com/codesnake/linux-amlogic/blob/master/drivers/amlogic/display/ge2d/ge2d_wq.c#L147
2. thread 2 is here https://github.com/codesnake/linux-amlogic/blob/master/drivers/amlogic/display/ge2d/ge2d_wq.c#L855
3. thread 2 is running and enters the if condition because state is GE2D_STATE_RUNNING
4. thread 2 gets interrupted by thread 1 thread 1 jumps over the if and sets GE2D_STATE_IDLE and is done
5. back to thread 2 which now sets state GE2D_STATE_REMOVING_WQ and calls wait_for_completion
6. thread2 will never return because thread 1 is done already and won't signal the event

destroy_ge2d_work_queue is called from https://github.com/codesnake/linux-amlogic/blob/master/drivers/amlogic/amports/amvideocap.c#L320 in my use case and will block there forever - and basically blocks down to the read in the userspace which tries to read the current captured frame

Change-Id: I02afaab090357af88bfbfcb0f9ff6a8d81542109

Change-Id: I81d8ed21cdd947f1707a2632b0a0be039fcea564

Conflicts:
	arch/arm/configs/odroidc_defconfig

Change-Id: I15aaff08623c2586ef3be64432cc3976aab30fb2

Change-Id: I291e3ca5498ffbae2f09339abfd79c5278a2d96a

Change-Id: I6a410acac4675d097586ab933854adc30cb3ce1b

This patch adds below inline functions to identify the display port by the
kernel parameter with 'vout=*' where one of <hdmi|dvi|vga>. The display port
is set as HDMI by default if the parameter 'vout=*' is missing.

static inline int voutmode_hdmi(void);
static inline int voutmode_dvi(void);
static inline int voutmode_vga(void);
static inline int voutmode_dvi_vga(void);

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

There is fuzzy picture on legacy VGA monitor when ODROID-C1 is connected through
HDMI-to-VGA adaptor for low resolutions like 1024x768 or 1280x1024. Hence this
patch adds a fake/lazy workaround to set PLL register for proper picture while
previous PLL settings, for improved HPLL settings and 23.976fps video support,
to prevent the display failure not tested.

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

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