Commit e2f597a2 authored by Brian Masney's avatar Brian Masney Committed by Sean Paul
Browse files

drm/msm: remove resv fields from msm_gem_object struct 



The msm_gem_object structure contains resv and _resv fields that are
no longer needed since the reservation object is now stored on
drm_gem_object. msm_atomic_prepare_fb() and msm_atomic_prepare_fb()
both referenced the wrong reservation object, and would lead to an
attempt to dereference a NULL pointer. Correct those two cases to
point to the correct reservation object.

Fixes: dd55cf69 ("drm: msm: Switch to use drm_gem_object reservation_object")
Cc: David Airlie <airlied@linux.ie>
Cc: linux-arm-msm@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org
Cc: Rob Herring <robh@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Acked-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190513234105.7531-1-masneyb@onstation.org
parent 67793bd3

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);

drivers/gpu/drm/msm/msm_gem.h

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ struct msm_gem_object { 


	struct llist_node freed;



	/* normally (resv == &_resv) except for imported bo's */

	struct reservation_object *resv;

	struct reservation_object _resv;



	/* For physically contiguous buffers.  Used when we don't have

	 * an IOMMU.  Also used for stolen/splashscreen buffer.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE