mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-01 14:52:32 +00:00
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
This commit is contained in:
commit
90516d89cd
@ -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_8960_init(struct platform_device *pdev);
|
||||||
int msm_hdmi_pll_8996_init(struct platform_device *pdev);
|
int msm_hdmi_pll_8996_init(struct platform_device *pdev);
|
||||||
#else
|
#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;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
@ -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_file_private *ctx = file->driver_priv;
|
||||||
struct msm_kms *kms = priv->kms;
|
struct msm_kms *kms = priv->kms;
|
||||||
|
|
||||||
if (kms)
|
|
||||||
kms->funcs->preclose(kms, file);
|
|
||||||
|
|
||||||
mutex_lock(&dev->struct_mutex);
|
mutex_lock(&dev->struct_mutex);
|
||||||
if (ctx == priv->lastctx)
|
if (ctx == priv->lastctx)
|
||||||
priv->lastctx = NULL;
|
priv->lastctx = NULL;
|
||||||
|
@ -55,7 +55,6 @@ struct msm_kms_funcs {
|
|||||||
struct drm_encoder *slave_encoder,
|
struct drm_encoder *slave_encoder,
|
||||||
bool is_cmd_mode);
|
bool is_cmd_mode);
|
||||||
/* cleanup: */
|
/* cleanup: */
|
||||||
void (*preclose)(struct msm_kms *kms, struct drm_file *file);
|
|
||||||
void (*destroy)(struct msm_kms *kms);
|
void (*destroy)(struct msm_kms *kms);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user