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

Commit 58b58f6e authored by Dave Airlie's avatar Dave Airlie
Browse files

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

a few fixes for 4.12..

* 'msm-fixes-4.12-rc4' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: Fix the check for the command size
  drm/msm: Take the mutex before calling msm_gem_new_impl
  drm/msm: for array in-fences, check if all backing fences are from our own context before waiting
  drm/msm: constify irq_domain_ops
  drm/msm/mdp5: release hwpipe(s) for unused planes
  drm/msm: Reuse dma_fence_release.
  drm/msm: Expose our reservation object when exporting a dmabuf.
  drm/msm/gpu: check legacy clk names in get_clocks()
  drm/msm/mdp5: use __drm_atomic_helper_plane_duplicate_state()
  drm/msm: select PM_OPP
parents 25f480e8 d72fea53

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config DRM_MSM 
	select QCOM_SCM

	select SND_SOC_HDMI_CODEC if SND_SOC

	select SYNC_FILE

	select PM_OPP

	default y

	help

	  DRM/KMS driver for MSM/snapdragon.

drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int mdss_hw_irqdomain_map(struct irq_domain *d, unsigned int irq, 
	return 0;

}



static struct irq_domain_ops mdss_hw_irqdomain_ops = {

static const struct irq_domain_ops mdss_hw_irqdomain_ops = {

	.map = mdss_hw_irqdomain_map,

	.xlate = irq_domain_xlate_onecell,

};

drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c

+7 −2
Original line number Diff line number Diff line
@@ -225,9 +225,10 @@ mdp5_plane_duplicate_state(struct drm_plane *plane) 


	mdp5_state = kmemdup(to_mdp5_plane_state(plane->state),

			sizeof(*mdp5_state), GFP_KERNEL);

	if (!mdp5_state)

		return NULL;



	if (mdp5_state && mdp5_state->base.fb)

		drm_framebuffer_reference(mdp5_state->base.fb);

	__drm_atomic_helper_plane_duplicate_state(plane, &mdp5_state->base);



	return &mdp5_state->base;

}
@@ -444,6 +445,10 @@ static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state, 
			mdp5_pipe_release(state->state, old_hwpipe);

			mdp5_pipe_release(state->state, old_right_hwpipe);

		}

	} else {

		mdp5_pipe_release(state->state, mdp5_state->hwpipe);

		mdp5_pipe_release(state->state, mdp5_state->r_hwpipe);

		mdp5_state->hwpipe = mdp5_state->r_hwpipe = NULL;

	}



	return 0;

drivers/gpu/drm/msm/msm_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -830,6 +830,7 @@ static struct drm_driver msm_driver = { 
	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export   = drm_gem_prime_export,

	.gem_prime_import   = drm_gem_prime_import,

	.gem_prime_res_obj  = msm_gem_prime_res_obj,

	.gem_prime_pin      = msm_gem_prime_pin,

	.gem_prime_unpin    = msm_gem_prime_unpin,

	.gem_prime_get_sg_table = msm_gem_prime_get_sg_table,

drivers/gpu/drm/msm/msm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj); 
void *msm_gem_prime_vmap(struct drm_gem_object *obj);

void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);

struct reservation_object *msm_gem_prime_res_obj(struct drm_gem_object *obj);

struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,

		struct dma_buf_attachment *attach, struct sg_table *sg);

int msm_gem_prime_pin(struct drm_gem_object *obj);