Commit 8da0e152 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2019-05-15' of... 

Merge tag 'drm-misc-next-fixes-2019-05-15' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

- A couple new panfrost fixes
- Fix the low refresh rate register in adv7511
- A handful of msm fixes that fell out of 5.1 bringup on SDM845
- Fix spinlock initialization in pl111

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190515201729.GA89093@art_vandelay
parents dc28d574 2b117451

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -748,11 +748,11 @@ static void adv7511_mode_set(struct adv7511 *adv7511, 
			vsync_polarity = 1;

	}



	if (mode->vrefresh <= 24000)

	if (drm_mode_vrefresh(mode) <= 24)

		low_refresh_rate = ADV7511_LOW_REFRESH_RATE_24HZ;

	else if (mode->vrefresh <= 25000)

	else if (drm_mode_vrefresh(mode) <= 25)

		low_refresh_rate = ADV7511_LOW_REFRESH_RATE_25HZ;

	else if (mode->vrefresh <= 30000)

	else if (drm_mode_vrefresh(mode) <= 30)

		low_refresh_rate = ADV7511_LOW_REFRESH_RATE_30HZ;

	else

		low_refresh_rate = ADV7511_LOW_REFRESH_RATE_NONE;

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

+3 −3
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) 
	 * will make sure that the refcounting is correct in case we need to

	 * bring down the GX after a GMU failure

	 */

	if (!IS_ERR(gmu->gxpd))

	if (!IS_ERR_OR_NULL(gmu->gxpd))

		pm_runtime_get(gmu->gxpd);



out:
@@ -863,7 +863,7 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu) 
	 * domain. Usually the GMU does this but only if the shutdown sequence

	 * was successful

	 */

	if (!IS_ERR(gmu->gxpd))

	if (!IS_ERR_OR_NULL(gmu->gxpd))

		pm_runtime_put_sync(gmu->gxpd);



	clk_bulk_disable_unprepare(gmu->nr_clocks, gmu->clocks);
@@ -1234,7 +1234,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) 


	pm_runtime_disable(gmu->dev);



	if (!IS_ERR(gmu->gxpd)) {

	if (!IS_ERR_OR_NULL(gmu->gxpd)) {

		pm_runtime_disable(gmu->gxpd);

		dev_pm_domain_detach(gmu->gxpd, false);

	}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "dpu_hwio.h"

#include "dpu_hw_lm.h"

#include "dpu_hw_mdss.h"

#include "dpu_kms.h"



#define LM_OP_MODE                        0x00

#define LM_OUT_SIZE                       0x04

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+1 −3
Original line number Diff line number Diff line
@@ -780,7 +780,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, 
	struct dpu_plane_state *pstate = to_dpu_plane_state(new_state);

	struct dpu_hw_fmt_layout layout;

	struct drm_gem_object *obj;

	struct msm_gem_object *msm_obj;

	struct dma_fence *fence;

	struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base);

	int ret;
@@ -799,8 +798,7 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, 
	 *       implicit fence and fb prepare by hand here.

	 */

	obj = msm_framebuffer_bo(new_state->fb, 0);

	msm_obj = to_msm_bo(obj);

	fence = reservation_object_get_excl_rcu(msm_obj->resv);

	fence = reservation_object_get_excl_rcu(obj->resv);

	if (fence)

		drm_atomic_set_fence_for_plane(new_state, fence);

drivers/gpu/drm/msm/msm_atomic.c

+1 −3
Original line number Diff line number Diff line
@@ -49,15 +49,13 @@ int msm_atomic_prepare_fb(struct drm_plane *plane, 
	struct msm_drm_private *priv = plane->dev->dev_private;

	struct msm_kms *kms = priv->kms;

	struct drm_gem_object *obj;

	struct msm_gem_object *msm_obj;

	struct dma_fence *fence;



	if (!new_state->fb)

		return 0;



	obj = msm_framebuffer_bo(new_state->fb, 0);

	msm_obj = to_msm_bo(obj);

	fence = reservation_object_get_excl_rcu(msm_obj->resv);

	fence = reservation_object_get_excl_rcu(obj->resv);



	drm_atomic_set_fence_for_plane(new_state, fence);

CRA Git | Maintained and supported by SUSTech CRA and CCSE