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

Commit 1c404d88 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Pretty small pull this time around for msm.  Adds some useful debugfs
I'd been carrying around on a branch for a while, plus few fixes.  And
Kconfig update for the great ARCH_MSM -> ARCH_QCOM split.

* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: use correct gfp flag for vram allocation
  drm/msm/mdp5: fix error return value
  drm/msm: remove redundant private plane cleanup
  drm/msm: add perf logging debugfs
  drm/msm: add rd logging debugfs
  drm/msm: update for ARCH_MSM -> ARCH_QCOM
  drm/msm/hdmi: use gpio and HPD polling
  drm/msm/mdp5: fix crash in error/unload paths
parents 04381b98 543d3011

drivers/gpu/drm/msm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ config DRM_MSM 
	tristate "MSM DRM"

	depends on DRM

	depends on MSM_IOMMU

	depends on ARCH_MSM8960 || (ARM && COMPILE_TEST)

	depends on ARCH_QCOM || (ARM && COMPILE_TEST)

	select DRM_KMS_HELPER

	select SHMEM

	select TMPFS

drivers/gpu/drm/msm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ msm-y := \ 
	msm_gem_submit.o \

	msm_gpu.o \

	msm_iommu.o \

	msm_perf.o \

	msm_rd.o \

	msm_ringbuffer.o



msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o

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

+15 −5
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ static int a3xx_hw_init(struct msm_gpu *gpu) 
	/* Turn on performance counters: */

	gpu_write(gpu, REG_A3XX_RBBM_PERFCTR_CTL, 0x01);



	/* Set SP perfcounter 7 to count SP_FS_FULL_ALU_INSTRUCTIONS

	 * we will use this to augment our hang detection:

	 */

	gpu_write(gpu, REG_A3XX_SP_PERFCOUNTER7_SELECT,

			SP_FS_FULL_ALU_INSTRUCTIONS);

	/* Enable the perfcntrs that we use.. */

	for (i = 0; i < gpu->num_perfcntrs; i++) {

		const struct msm_gpu_perfcntr *perfcntr = &gpu->perfcntrs[i];

		gpu_write(gpu, perfcntr->select_reg, perfcntr->select_val);

	}



	gpu_write(gpu, REG_A3XX_RBBM_INT_0_MASK, A3XX_INT0_MASK);
@@ -465,6 +465,13 @@ static const struct adreno_gpu_funcs funcs = { 
	},

};



static const struct msm_gpu_perfcntr perfcntrs[] = {

	{ REG_A3XX_SP_PERFCOUNTER6_SELECT, REG_A3XX_RBBM_PERFCTR_SP_6_LO,

			SP_ALU_ACTIVE_CYCLES, "ALUACTIVE" },

	{ REG_A3XX_SP_PERFCOUNTER7_SELECT, REG_A3XX_RBBM_PERFCTR_SP_7_LO,

			SP_FS_FULL_ALU_INSTRUCTIONS, "ALUFULL" },

};



struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)

{

	struct a3xx_gpu *a3xx_gpu = NULL;
@@ -504,6 +511,9 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) 
	DBG("fast_rate=%u, slow_rate=%u, bus_freq=%u",

			gpu->fast_rate, gpu->slow_rate, gpu->bus_freq);



	gpu->perfcntrs = perfcntrs;

	gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);



	ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, config->rev);

	if (ret)

		goto fail;

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

+33 −19
Original line number Diff line number Diff line
@@ -247,36 +247,49 @@ void hdmi_connector_irq(struct drm_connector *connector) 
	}

}



static enum drm_connector_status detect_reg(struct hdmi *hdmi)

{

	uint32_t hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);

	return (hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED) ?

			connector_status_connected : connector_status_disconnected;

}



static enum drm_connector_status detect_gpio(struct hdmi *hdmi)

{

	const struct hdmi_platform_config *config = hdmi->config;

	return gpio_get_value(config->hpd_gpio) ?

			connector_status_connected :

			connector_status_disconnected;

}



static enum drm_connector_status hdmi_connector_detect(

		struct drm_connector *connector, bool force)

{

	struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);

	struct hdmi *hdmi = hdmi_connector->hdmi;

	const struct hdmi_platform_config *config = hdmi->config;

	uint32_t hpd_int_status;

	enum drm_connector_status stat_gpio, stat_reg;

	int retry = 20;



	hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);

	do {

		stat_gpio = detect_gpio(hdmi);

		stat_reg  = detect_reg(hdmi);



	/* sense seems to in some cases be momentarily de-asserted, don't

	 * let that trick us into thinking the monitor is gone:

	 */

	while (retry-- && !(hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED)) {

		/* hdmi debounce logic seems to get stuck sometimes,

		 * read directly the gpio to get a second opinion:

		 */

		if (gpio_get_value(config->hpd_gpio)) {

			DBG("gpio tells us we are connected!");

			hpd_int_status |= HDMI_HPD_INT_STATUS_CABLE_DETECTED;

		if (stat_gpio == stat_reg)

			break;

		}



		mdelay(10);

		hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);

		DBG("status=%08x", hpd_int_status);

	} while (--retry);



	/* the status we get from reading gpio seems to be more reliable,

	 * so trust that one the most if we didn't manage to get hdmi and

	 * gpio status to agree:

	 */

	if (stat_gpio != stat_reg) {

		DBG("HDMI_HPD_INT_STATUS tells us: %d", stat_reg);

		DBG("hpd gpio tells us: %d", stat_gpio);

	}



	return (hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED) ?

			connector_status_connected : connector_status_disconnected;

	return stat_gpio;

}



static void hdmi_connector_destroy(struct drm_connector *connector)
@@ -389,7 +402,8 @@ struct drm_connector *hdmi_connector_init(struct hdmi *hdmi) 
			DRM_MODE_CONNECTOR_HDMIA);

	drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);



	connector->polled = DRM_CONNECTOR_POLL_HPD;

	connector->polled = DRM_CONNECTOR_POLL_CONNECT |

			DRM_CONNECTOR_POLL_DISCONNECT;



	connector->interlace_allowed = 1;

	connector->doublescan_allowed = 0;

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

+0 −2
Original line number Diff line number Diff line
@@ -217,8 +217,6 @@ static void mdp4_crtc_destroy(struct drm_crtc *crtc) 
{

	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);



	mdp4_crtc->plane->funcs->destroy(mdp4_crtc->plane);



	drm_crtc_cleanup(crtc);

	drm_flip_work_cleanup(&mdp4_crtc->unref_fb_work);

	drm_flip_work_cleanup(&mdp4_crtc->unref_cursor_work);