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

Commit 6e8f7b09 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:
 "Nothing major, one core oops fixes, some radeon oops fixes, some sti
  driver fixups, msm driver fixes and a minor Kconfig update for the ww
  mutex debugging"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ast: Add missing entry to dclk_table[]
  drm: fix division-by-zero on dumb_create()
  ww-mutex: clarify help text for DEBUG_WW_MUTEX_SLOWPATH
  radeon: Test for PCI root bus before assuming bus->self
  drm/radeon: handle broken disabled rb mask gracefully (6xx/7xx) (v2)
  drm/radeon: save/restore the PD addr on suspend/resume
  drm/msm: Fix missing unlock on error in msm_fbdev_create()
  drm/msm: fix compile error for non-dt builds
  drm/msm/mdp4: request vblank during modeset
  drm/msm: avoid flood of kernel logs on faults
  drm: sti: Add missing dependency on RESET_CONTROLLER
  drm: sti: Make of_device_id array const
  drm: sti: Fix return value check in sti_drm_platform_probe()
  drm: sti: hda: fix return value check in sti_hda_probe()
  drm: sti: hdmi: fix return value check in sti_hdmi_probe()
  drm: sti: tvout: fix return value check in sti_tvout_probe()
parents f1bd473f b8d758d2

drivers/gpu/drm/ast/ast_tables.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static struct ast_vbios_dclk_info dclk_table[] = { 
	{0x25, 0x65, 0x80},					/* 16: VCLK88.75    */

	{0x77, 0x58, 0x80},					/* 17: VCLK119      */

	{0x32, 0x67, 0x80},				    /* 18: VCLK85_5     */

	{0x6a, 0x6d, 0x80},					/* 19: VCLK97_75	*/

};



static struct ast_vbios_stdtable vbios_stdtable[] = {

drivers/gpu/drm/drm_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -4696,8 +4696,9 @@ int drm_mode_create_dumb_ioctl(struct drm_device *dev, 
		return -EINVAL;



	/* overflow checks for 32bit size calculations */

	/* NOTE: DIV_ROUND_UP() can overflow */

	cpp = DIV_ROUND_UP(args->bpp, 8);

	if (cpp > 0xffffffffU / args->width)

	if (!cpp || cpp > 0xffffffffU / args->width)

		return -EINVAL;

	stride = cpp * args->width;

	if (args->height > 0xffffffffU / stride)

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

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ static void mdp4_crtc_prepare(struct drm_crtc *crtc) 
	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);

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

	/* make sure we hold a ref to mdp clks while setting up mode: */

	drm_crtc_vblank_get(crtc);

	mdp4_enable(get_kms(crtc));

	mdp4_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);

}
@@ -407,6 +408,7 @@ static void mdp4_crtc_commit(struct drm_crtc *crtc) 
	crtc_flush(crtc);

	/* drop the ref to mdp clk's that we got in prepare: */

	mdp4_disable(get_kms(crtc));

	drm_crtc_vblank_put(crtc);

}



static int mdp4_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

drivers/gpu/drm/msm/msm_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -974,12 +974,11 @@ static int msm_pdev_probe(struct platform_device *pdev) 


	for (i = 0; i < ARRAY_SIZE(devnames); i++) {

		struct device *dev;

		int ret;



		dev = bus_find_device_by_name(&platform_bus_type,

				NULL, devnames[i]);

		if (!dev) {

			dev_info(master, "still waiting for %s\n", devnames[i]);

			dev_info(&pdev->dev, "still waiting for %s\n", devnames[i]);

			return -EPROBE_DEFER;

		}

drivers/gpu/drm/msm/msm_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, 
	ret = msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);

	if (ret) {

		dev_err(dev->dev, "failed to get buffer obj iova: %d\n", ret);

		goto fail;

		goto fail_unlock;

	}



	fbi = framebuffer_alloc(0, dev->dev);