Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c674948 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: bridge: dw-hdmi: Detect AHB audio DMA using correct register 



Bit 0 in CONFIG1_ID tells whether the IP core uses an AHB slave
interface for control. The correct way to identify AHB audio DMA support
is through bit 1 in CONFIG3_ID.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-15-laurent.pinchart+renesas@ideasonboard.com
parent 0527e12e

drivers/gpu/drm/bridge/dw-hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -1836,7 +1836,7 @@ __dw_hdmi_probe(struct platform_device *pdev, 
	u8 prod_id0;

	u8 prod_id1;

	u8 config0;

	u8 config1;

	u8 config3;



	hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);

	if (!hdmi)
@@ -1988,9 +1988,9 @@ __dw_hdmi_probe(struct platform_device *pdev, 
	pdevinfo.id = PLATFORM_DEVID_AUTO;



	config0 = hdmi_readb(hdmi, HDMI_CONFIG0_ID);

	config1 = hdmi_readb(hdmi, HDMI_CONFIG1_ID);

	config3 = hdmi_readb(hdmi, HDMI_CONFIG3_ID);



	if (config1 & HDMI_CONFIG1_AHB) {

	if (config3 & HDMI_CONFIG3_AHBAUDDMA) {

		struct dw_hdmi_audio_data audio;



		audio.phys = iores->start;

drivers/gpu/drm/bridge/dw-hdmi.h

+4 −0
Original line number Diff line number Diff line
@@ -559,6 +559,10 @@ enum { 
/* CONFIG1_ID field values */

	HDMI_CONFIG1_AHB = 0x01,



/* CONFIG3_ID field values */

	HDMI_CONFIG3_AHBAUDDMA = 0x02,

	HDMI_CONFIG3_GPAUD = 0x01,



/* IH_FC_INT2 field values */

	HDMI_IH_FC_INT2_OVERFLOW_MASK = 0x03,

	HDMI_IH_FC_INT2_LOW_PRIORITY_OVERFLOW = 0x02,