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

Commit 955f6be8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux into drm-fixes 

A few msm fixes for 3.19:
 * hdmi regulators fix
 * hdmi fix for spurious HPD interrupts
 * fix for sync atomic update after async update (which could show
   up with a setcrtc following a pageflip)
 * couple little Coccinelle cleanups

* 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux:
  drm/msm/hdmi: rework HDMI IRQ handler
  drm/msm/hdmi: enable regulators before clocks to avoid warnings
  drm/msm/mdp5: update irqs on crtc<->encoder link change
  drm/msm: block incoming update on pending updates
  drm/msm: Deletion of unnecessary checks before the function call "release_firmware"
  drm/msm: Deletion of unnecessary checks before two function calls
parents 2036eaa7 ff2f974e

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+2 −4
Original line number Diff line number Diff line
@@ -386,9 +386,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *gpu) 
			msm_gem_put_iova(gpu->memptrs_bo, gpu->base.id);

		drm_gem_object_unreference(gpu->memptrs_bo);

	}

	if (gpu->pm4)

	release_firmware(gpu->pm4);

	if (gpu->pfp)

	release_firmware(gpu->pfp);

	msm_gpu_cleanup(&gpu->base);

}

drivers/gpu/drm/msm/hdmi/hdmi_connector.c

+22 −31
Original line number Diff line number Diff line
@@ -141,6 +141,15 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) 
	uint32_t hpd_ctrl;

	int i, ret;



	for (i = 0; i < config->hpd_reg_cnt; i++) {

		ret = regulator_enable(hdmi->hpd_regs[i]);

		if (ret) {

			dev_err(dev->dev, "failed to enable hpd regulator: %s (%d)\n",

					config->hpd_reg_names[i], ret);

			goto fail;

		}

	}



	ret = gpio_config(hdmi, true);

	if (ret) {

		dev_err(dev->dev, "failed to configure GPIOs: %d\n", ret);
@@ -164,15 +173,6 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) 
		}

	}



	for (i = 0; i < config->hpd_reg_cnt; i++) {

		ret = regulator_enable(hdmi->hpd_regs[i]);

		if (ret) {

			dev_err(dev->dev, "failed to enable hpd regulator: %s (%d)\n",

					config->hpd_reg_names[i], ret);

			goto fail;

		}

	}



	hdmi_set_mode(hdmi, false);

	phy->funcs->reset(phy);

	hdmi_set_mode(hdmi, true);
@@ -200,7 +200,7 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) 
	return ret;

}



static int hdp_disable(struct hdmi_connector *hdmi_connector)

static void hdp_disable(struct hdmi_connector *hdmi_connector)

{

	struct hdmi *hdmi = hdmi_connector->hdmi;

	const struct hdmi_platform_config *config = hdmi->config;
@@ -212,28 +212,19 @@ static int hdp_disable(struct hdmi_connector *hdmi_connector) 


	hdmi_set_mode(hdmi, false);



	for (i = 0; i < config->hpd_reg_cnt; i++) {

		ret = regulator_disable(hdmi->hpd_regs[i]);

		if (ret) {

			dev_err(dev->dev, "failed to disable hpd regulator: %s (%d)\n",

					config->hpd_reg_names[i], ret);

			goto fail;

		}

	}



	for (i = 0; i < config->hpd_clk_cnt; i++)

		clk_disable_unprepare(hdmi->hpd_clks[i]);



	ret = gpio_config(hdmi, false);

	if (ret) {

		dev_err(dev->dev, "failed to unconfigure GPIOs: %d\n", ret);

		goto fail;

	}



	return 0;

	if (ret)

		dev_warn(dev->dev, "failed to unconfigure GPIOs: %d\n", ret);



fail:

	return ret;

	for (i = 0; i < config->hpd_reg_cnt; i++) {

		ret = regulator_disable(hdmi->hpd_regs[i]);

		if (ret)

			dev_warn(dev->dev, "failed to disable hpd regulator: %s (%d)\n",

					config->hpd_reg_names[i], ret);

	}

}



static void
@@ -260,11 +251,11 @@ void hdmi_connector_irq(struct drm_connector *connector) 
			(hpd_int_status & HDMI_HPD_INT_STATUS_INT)) {

		bool detected = !!(hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED);



		DBG("status=%04x, ctrl=%04x", hpd_int_status, hpd_int_ctrl);



		/* ack the irq: */

		/* ack & disable (temporarily) HPD events: */

		hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,

				hpd_int_ctrl | HDMI_HPD_INT_CTRL_INT_ACK);

			HDMI_HPD_INT_CTRL_INT_ACK);



		DBG("status=%04x, ctrl=%04x", hpd_int_status, hpd_int_ctrl);



		/* detect disconnect if we are connected or visa versa: */

		hpd_int_ctrl = HDMI_HPD_INT_CTRL_INT_EN;

drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c

+1 −10
Original line number Diff line number Diff line
@@ -331,17 +331,8 @@ static int mdp4_crtc_atomic_check(struct drm_crtc *crtc, 
		struct drm_crtc_state *state)

{

	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);

	struct drm_device *dev = crtc->dev;



	DBG("%s: check", mdp4_crtc->name);



	if (mdp4_crtc->event) {

		dev_err(dev->dev, "already pending flip!\n");

		return -EBUSY;

	}



	// TODO anything else to check?



	return 0;

}
@@ -357,7 +348,7 @@ static void mdp4_crtc_atomic_flush(struct drm_crtc *crtc) 
	struct drm_device *dev = crtc->dev;

	unsigned long flags;



	DBG("%s: flush", mdp4_crtc->name);

	DBG("%s: event: %p", mdp4_crtc->name, crtc->state->event);



	WARN_ON(mdp4_crtc->event);

drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

+2 −10
Original line number Diff line number Diff line
@@ -303,11 +303,6 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc, 


	DBG("%s: check", mdp5_crtc->name);



	if (mdp5_crtc->event) {

		dev_err(dev->dev, "already pending flip!\n");

		return -EBUSY;

	}



	/* request a free CTL, if none is already allocated for this CRTC */

	if (state->enable && !mdp5_crtc->ctl) {

		mdp5_crtc->ctl = mdp5_ctlm_request(mdp5_kms->ctlm, crtc);
@@ -364,7 +359,7 @@ static void mdp5_crtc_atomic_flush(struct drm_crtc *crtc) 
	struct drm_device *dev = crtc->dev;

	unsigned long flags;



	DBG("%s: flush", mdp5_crtc->name);

	DBG("%s: event: %p", mdp5_crtc->name, crtc->state->event);



	WARN_ON(mdp5_crtc->event);
@@ -460,10 +455,7 @@ void mdp5_crtc_set_intf(struct drm_crtc *crtc, int intf, 
	/* now that we know what irq's we want: */

	mdp5_crtc->err.irqmask = intf2err(intf);

	mdp5_crtc->vblank.irqmask = intf2vblank(intf);



	/* when called from modeset_init(), skip the rest until later: */

	if (!mdp5_kms)

		return;

	mdp_irq_update(&mdp5_kms->base);



	spin_lock_irqsave(&mdp5_kms->resource_lock, flags);

	intf_sel = mdp5_read(mdp5_kms, REG_MDP5_DISP_INTF_SEL);

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c

+1 −11
Original line number Diff line number Diff line
@@ -216,17 +216,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms) 
		goto fail;

	}



	/* NOTE: the vsync and error irq's are actually associated with

	 * the INTF/encoder.. the easiest way to deal with this (ie. what

	 * we do now) is assume a fixed relationship between crtc's and

	 * encoders.  I'm not sure if there is ever a need to more freely

	 * assign crtcs to encoders, but if there is then we need to take

	 * care of error and vblank irq's that the crtc has registered,

	 * and also update user-requested vblank_mask.

	 */

	encoder->possible_crtcs = BIT(0);

	mdp5_crtc_set_intf(priv->crtcs[0], 3, INTF_HDMI);



	encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;;

	priv->encoders[priv->num_encoders++] = encoder;



	/* Construct bridge/connector for HDMI: */