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

Commit 90516d89 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

two minor msm fixes.

* 'msm-fixes-4.6-rc1' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: fix typo in the !COMMON_CLK case
  drm/msm: fix bug after preclose removal
parents 2f4fcb3e 0a69509f

drivers/gpu/drm/msm/hdmi/hdmi.h

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void __exit msm_hdmi_phy_driver_unregister(void); 
int msm_hdmi_pll_8960_init(struct platform_device *pdev);

int msm_hdmi_pll_8996_init(struct platform_device *pdev);

#else

static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev);

static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev)

{

	return -ENODEV;

}

drivers/gpu/drm/msm/msm_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -467,9 +467,6 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file) 
	struct msm_file_private *ctx = file->driver_priv;

	struct msm_kms *kms = priv->kms;



	if (kms)

		kms->funcs->preclose(kms, file);



	mutex_lock(&dev->struct_mutex);

	if (ctx == priv->lastctx)

		priv->lastctx = NULL;

drivers/gpu/drm/msm/msm_kms.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ struct msm_kms_funcs { 
			struct drm_encoder *slave_encoder,

			bool is_cmd_mode);

	/* cleanup: */

	void (*preclose)(struct msm_kms *kms, struct drm_file *file);

	void (*destroy)(struct msm_kms *kms);

};