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

Commit a6e434e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A few imx fixes I missed from a couple of weeks ago, they still aren't
  that big and fix some regression and a fail to boot problem.

  Other than that, a couple of regression fixes for radeon/amdgpu, one
  regression fix for vmwgfx and one regression fix for tda998x"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  Revert "drm/radeon/pm: adjust display configuration after powerstate"
  drm/amdgpu/dp: add back special handling for NUTMEG
  drm/radeon/dp: add back special handling for NUTMEG
  drm/i2c: tda998x: Choose between atomic or non atomic dpms helper
  drm/vmwgfx: Add back ->detect() and ->fill_modes()
  drm/radeon: Fix error handling in radeon_flip_work_func.
  drm/amdgpu: Fix error handling in amdgpu_flip_work_func.
  drm/imx: Add missing DRM_FORMAT_RGB565 to ipu_plane_formats
  drm/imx: notify DRM core about CRTC vblank state
  gpu: ipu-v3: Reset IPU before activating IRQ
  gpu: ipu-v3: Do not bail out on missing optional port nodes
parents 8205ff1d 848819c5

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void amdgpu_flip_work_func(struct work_struct *__work) 
	 * In practice this won't execute very often unless on very fast

	 * machines because the time window for this to happen is very small.

	 */

	while (amdgpuCrtc->enabled && repcnt--) {

	while (amdgpuCrtc->enabled && --repcnt) {

		/* GET_DISTANCE_TO_VBLANKSTART returns distance to real vblank

		 * start in hpos, and to the "fudged earlier" vblank start in

		 * vpos.
@@ -112,13 +112,13 @@ static void amdgpu_flip_work_func(struct work_struct *__work) 
			break;



		/* Sleep at least until estimated real start of hw vblank */

		spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

		min_udelay = (-hpos + 1) * max(vblank->linedur_ns / 1000, 5);

		if (min_udelay > vblank->framedur_ns / 2000) {

			/* Don't wait ridiculously long - something is wrong */

			repcnt = 0;

			break;

		}

		spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

		usleep_range(min_udelay, 2 * min_udelay);

		spin_lock_irqsave(&crtc->dev->event_lock, flags);

	};

drivers/gpu/drm/amd/amdgpu/atombios_dp.c

+16 −4
Original line number Diff line number Diff line
@@ -265,6 +265,17 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector 
	unsigned max_lane_num = drm_dp_max_lane_count(dpcd);

	unsigned lane_num, i, max_pix_clock;



	if (amdgpu_connector_encoder_get_dp_bridge_encoder_id(connector) ==

	    ENCODER_OBJECT_ID_NUTMEG) {

		for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

			max_pix_clock = (lane_num * 270000 * 8) / bpp;

			if (max_pix_clock >= pix_clock) {

				*dp_lanes = lane_num;

				*dp_rate = 270000;

				return 0;

			}

		}

	} else {

		for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

			for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {

				max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
@@ -275,6 +286,7 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector 
				}

			}

		}

	}



	return -EINVAL;

}

drivers/gpu/drm/i2c/tda998x_drv.c

+9 −1
Original line number Diff line number Diff line
@@ -1382,8 +1382,16 @@ static void tda998x_connector_destroy(struct drm_connector *connector) 
	drm_connector_cleanup(connector);

}



static int tda998x_connector_dpms(struct drm_connector *connector, int mode)

{

	if (drm_core_check_feature(connector->dev, DRIVER_ATOMIC))

		return drm_atomic_helper_connector_dpms(connector, mode);

	else

		return drm_helper_connector_dpms(connector, mode);

}



static const struct drm_connector_funcs tda998x_connector_funcs = {

	.dpms = drm_atomic_helper_connector_dpms,

	.dpms = tda998x_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.detect = tda998x_connector_detect,

drivers/gpu/drm/imx/ipuv3-crtc.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static void ipu_fb_enable(struct ipu_crtc *ipu_crtc) 
	/* Start DC channel and DI after IDMAC */

	ipu_dc_enable_channel(ipu_crtc->dc);

	ipu_di_enable(ipu_crtc->di);

	drm_crtc_vblank_on(&ipu_crtc->base);



	ipu_crtc->enabled = 1;

}
@@ -80,6 +81,7 @@ static void ipu_fb_disable(struct ipu_crtc *ipu_crtc) 
	ipu_di_disable(ipu_crtc->di);

	ipu_plane_disable(ipu_crtc->plane[0]);

	ipu_dc_disable(ipu);

	drm_crtc_vblank_off(&ipu_crtc->base);



	ipu_crtc->enabled = 0;

}

drivers/gpu/drm/imx/ipuv3-plane.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static const uint32_t ipu_plane_formats[] = { 
	DRM_FORMAT_YVYU,

	DRM_FORMAT_YUV420,

	DRM_FORMAT_YVU420,

	DRM_FORMAT_RGB565,

};



int ipu_plane_irq(struct ipu_plane *ipu_plane)