aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/msm/hdmi/hdmi.h2
-rw-r--r--drivers/gpu/drm/msm/msm_drv.c3
-rw-r--r--drivers/gpu/drm/msm/msm_kms.h1
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index b04a64664673..65428cf233ce 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -196,7 +196,7 @@ void __exit msm_hdmi_phy_driver_unregister(void);
196int msm_hdmi_pll_8960_init(struct platform_device *pdev); 196int msm_hdmi_pll_8960_init(struct platform_device *pdev);
197int msm_hdmi_pll_8996_init(struct platform_device *pdev); 197int msm_hdmi_pll_8996_init(struct platform_device *pdev);
198#else 198#else
199static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev); 199static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev)
200{ 200{
201 return -ENODEV; 201 return -ENODEV;
202} 202}
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index d52910e2c26c..c03b96709179 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -467,9 +467,6 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
467 struct msm_file_private *ctx = file->driver_priv; 467 struct msm_file_private *ctx = file->driver_priv;
468 struct msm_kms *kms = priv->kms; 468 struct msm_kms *kms = priv->kms;
469 469
470 if (kms)
471 kms->funcs->preclose(kms, file);
472
473 mutex_lock(&dev->struct_mutex); 470 mutex_lock(&dev->struct_mutex);
474 if (ctx == priv->lastctx) 471 if (ctx == priv->lastctx)
475 priv->lastctx = NULL; 472 priv->lastctx = NULL;
diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h
index 9bcabaada179..e32222c3d44f 100644
--- a/drivers/gpu/drm/msm/msm_kms.h
+++ b/drivers/gpu/drm/msm/msm_kms.h
@@ -55,7 +55,6 @@ struct msm_kms_funcs {
55 struct drm_encoder *slave_encoder, 55 struct drm_encoder *slave_encoder,
56 bool is_cmd_mode); 56 bool is_cmd_mode);
57 /* cleanup: */ 57 /* cleanup: */
58 void (*preclose)(struct msm_kms *kms, struct drm_file *file);
59 void (*destroy)(struct msm_kms *kms); 58 void (*destroy)(struct msm_kms *kms);
60}; 59};
61 60