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

Commit 0e333751 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-05-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 

dw-hdmi: Fix Oops regression from rc1 (Neil)

Cc: Neil Armstrong <narmstrong@baylibre.com>

* tag 'drm-misc-fixes-2018-05-30' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/bridge/synopsys: dw-hdmi: fix dw_hdmi_setup_rx_sense
parents 2b85352e c32048d9

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

+4 −11
Original line number Diff line number Diff line
@@ -2077,7 +2077,7 @@ static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id) 
	return ret;

}



void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense)

void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense)

{

	mutex_lock(&hdmi->mutex);
@@ -2103,13 +2103,6 @@ void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense) 
	}

	mutex_unlock(&hdmi->mutex);

}



void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense)

{

	struct dw_hdmi *hdmi = dev_get_drvdata(dev);



	__dw_hdmi_setup_rx_sense(hdmi, hpd, rx_sense);

}

EXPORT_SYMBOL_GPL(dw_hdmi_setup_rx_sense);



static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
@@ -2145,7 +2138,7 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) 
	 */

	if (intr_stat &

	    (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) {

		__dw_hdmi_setup_rx_sense(hdmi,

		dw_hdmi_setup_rx_sense(hdmi,

				       phy_stat & HDMI_PHY_HPD,

				       phy_stat & HDMI_PHY_RX_SENSE);

drivers/gpu/drm/meson/meson_dw_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static irqreturn_t dw_hdmi_top_thread_irq(int irq, void *dev_id) 
		if (stat & HDMITX_TOP_INTR_HPD_RISE)

			hpd_connected = true;



		dw_hdmi_setup_rx_sense(dw_hdmi->dev, hpd_connected,

		dw_hdmi_setup_rx_sense(dw_hdmi->hdmi, hpd_connected,

				       hpd_connected);



		drm_helper_hpd_irq_event(dw_hdmi->encoder.dev);

include/drm/bridge/dw_hdmi.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, 
			     struct drm_encoder *encoder,

			     const struct dw_hdmi_plat_data *plat_data);



void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense);

void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);



void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate);

void dw_hdmi_audio_enable(struct dw_hdmi *hdmi);