diff mbox

[5/8] drm/sti: use different notifier_block for each pipe

Message ID 1473946905-4374-6-git-send-email-fabien.dessenne@st.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fabien DESSENNE Sept. 15, 2016, 1:41 p.m. UTC 
Each pipe shall have its own notifier block to manage the vblank event.
This fixes issues where a client registered on given pipe is later
abusively notified of events on the other pipe.

Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
---
 drivers/gpu/drm/sti/sti_compositor.c | 4 +++-
 drivers/gpu/drm/sti/sti_compositor.h | 4 ++--
 drivers/gpu/drm/sti/sti_crtc.c       | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

Comments

Vincent Abriou Sept. 15, 2016, 3:28 p.m. UTC | #1 
Acked-by: Vincent Abriou <vincent.abriou@st.com>


On 09/15/2016 03:41 PM, Fabien Dessenne wrote:
> Each pipe shall have its own notifier block to manage the vblank event.
> This fixes issues where a client registered on given pipe is later
> abusively notified of events on the other pipe.
>
> Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
> ---
>  drivers/gpu/drm/sti/sti_compositor.c | 4 +++-
>  drivers/gpu/drm/sti/sti_compositor.h | 4 ++--
>  drivers/gpu/drm/sti/sti_crtc.c       | 8 ++++----
>  3 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
> index 134201e..f61c16d 100644
> --- a/drivers/gpu/drm/sti/sti_compositor.c
> +++ b/drivers/gpu/drm/sti/sti_compositor.c
> @@ -201,6 +201,7 @@ static int sti_compositor_probe(struct platform_device *pdev)
>  	struct device_node *vtg_np;
>  	struct sti_compositor *compo;
>  	struct resource *res;
> +	unsigned int i;
>
>  	compo = devm_kzalloc(dev, sizeof(*compo), GFP_KERNEL);
>  	if (!compo) {
> @@ -208,7 +209,8 @@ static int sti_compositor_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  	}
>  	compo->dev = dev;
> -	compo->vtg_vblank_nb.notifier_call = sti_crtc_vblank_cb;
> +	for (i = 0; i < STI_MAX_MIXER; i++)
> +		compo->vtg_vblank_nb[i].notifier_call = sti_crtc_vblank_cb;
>
>  	/* populate data structure depending on compatibility */
>  	BUG_ON(!of_match_node(compositor_of_match, np)->data);
> diff --git a/drivers/gpu/drm/sti/sti_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h
> index 24444ef..177c57b 100644
> --- a/drivers/gpu/drm/sti/sti_compositor.h
> +++ b/drivers/gpu/drm/sti/sti_compositor.h
> @@ -62,7 +62,7 @@ struct sti_compositor_data {
>   * @vid: array of vids
>   * @vtg_main: vtg for main data path
>   * @vtg_aux: vtg for auxillary data path
> - * @vtg_vblank_nb: callback for VTG VSYNC notification
> + * @vtg_vblank_nb: array of callbacks for VTG VSYNC notification
>   */
>  struct sti_compositor {
>  	struct device *dev;
> @@ -78,7 +78,7 @@ struct sti_compositor {
>  	struct sti_vid *vid[STI_MAX_VID];
>  	struct sti_vtg *vtg_main;
>  	struct sti_vtg *vtg_aux;
> -	struct notifier_block vtg_vblank_nb;
> +	struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];
>  };
>
>  int sti_compositor_debufs_init(struct sti_compositor *compo,
> diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
> index c7d734d..2f41cbe 100644
> --- a/drivers/gpu/drm/sti/sti_crtc.c
> +++ b/drivers/gpu/drm/sti/sti_crtc.c
> @@ -244,8 +244,7 @@ static int sti_crtc_set_property(struct drm_crtc *crtc,
>  int sti_crtc_vblank_cb(struct notifier_block *nb,
>  		       unsigned long event, void *data)
>  {
> -	struct sti_compositor *compo =
> -		container_of(nb, struct sti_compositor, vtg_vblank_nb);
> +	struct sti_compositor *compo;
>  	struct drm_crtc *crtc = data;
>  	struct sti_mixer *mixer;
>  	unsigned long flags;
> @@ -254,6 +253,7 @@ int sti_crtc_vblank_cb(struct notifier_block *nb,
>
>  	priv = crtc->dev->dev_private;
>  	pipe = drm_crtc_index(crtc);
> +	compo = container_of(nb, struct sti_compositor, vtg_vblank_nb[pipe]);
>  	mixer = compo->mixer[pipe];
>
>  	if ((event != VTG_TOP_FIELD_EVENT) &&
> @@ -295,7 +295,7 @@ int sti_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe)
>  {
>  	struct sti_private *dev_priv = dev->dev_private;
>  	struct sti_compositor *compo = dev_priv->compo;
> -	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb;
> +	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];
>  	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;
>
>  	DRM_DEBUG_DRIVER("\n");
> @@ -314,7 +314,7 @@ void sti_crtc_disable_vblank(struct drm_device *drm_dev, unsigned int pipe)
>  {
>  	struct sti_private *priv = drm_dev->dev_private;
>  	struct sti_compositor *compo = priv->compo;
> -	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb;
> +	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];
>  	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;
>
>  	DRM_DEBUG_DRIVER("\n");
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index 134201e..f61c16d 100644
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -201,6 +201,7 @@  static int sti_compositor_probe(struct platform_device *pdev)
 	struct device_node *vtg_np;
 	struct sti_compositor *compo;
 	struct resource *res;
+	unsigned int i;
 
 	compo = devm_kzalloc(dev, sizeof(*compo), GFP_KERNEL);
 	if (!compo) {
@@ -208,7 +209,8 @@  static int sti_compositor_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 	compo->dev = dev;
-	compo->vtg_vblank_nb.notifier_call = sti_crtc_vblank_cb;
+	for (i = 0; i < STI_MAX_MIXER; i++)
+		compo->vtg_vblank_nb[i].notifier_call = sti_crtc_vblank_cb;
 
 	/* populate data structure depending on compatibility */
 	BUG_ON(!of_match_node(compositor_of_match, np)->data);
diff --git a/drivers/gpu/drm/sti/sti_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h
index 24444ef..177c57b 100644
--- a/drivers/gpu/drm/sti/sti_compositor.h
+++ b/drivers/gpu/drm/sti/sti_compositor.h
@@ -62,7 +62,7 @@  struct sti_compositor_data {
  * @vid: array of vids
  * @vtg_main: vtg for main data path
  * @vtg_aux: vtg for auxillary data path
- * @vtg_vblank_nb: callback for VTG VSYNC notification
+ * @vtg_vblank_nb: array of callbacks for VTG VSYNC notification
  */
 struct sti_compositor {
 	struct device *dev;
@@ -78,7 +78,7 @@  struct sti_compositor {
 	struct sti_vid *vid[STI_MAX_VID];
 	struct sti_vtg *vtg_main;
 	struct sti_vtg *vtg_aux;
-	struct notifier_block vtg_vblank_nb;
+	struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];
 };
 
 int sti_compositor_debufs_init(struct sti_compositor *compo,
diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index c7d734d..2f41cbe 100644
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -244,8 +244,7 @@  static int sti_crtc_set_property(struct drm_crtc *crtc,
 int sti_crtc_vblank_cb(struct notifier_block *nb,
 		       unsigned long event, void *data)
 {
-	struct sti_compositor *compo =
-		container_of(nb, struct sti_compositor, vtg_vblank_nb);
+	struct sti_compositor *compo;
 	struct drm_crtc *crtc = data;
 	struct sti_mixer *mixer;
 	unsigned long flags;
@@ -254,6 +253,7 @@  int sti_crtc_vblank_cb(struct notifier_block *nb,
 
 	priv = crtc->dev->dev_private;
 	pipe = drm_crtc_index(crtc);
+	compo = container_of(nb, struct sti_compositor, vtg_vblank_nb[pipe]);
 	mixer = compo->mixer[pipe];
 
 	if ((event != VTG_TOP_FIELD_EVENT) &&
@@ -295,7 +295,7 @@  int sti_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe)
 {
 	struct sti_private *dev_priv = dev->dev_private;
 	struct sti_compositor *compo = dev_priv->compo;
-	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb;
+	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];
 	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;
 
 	DRM_DEBUG_DRIVER("\n");
@@ -314,7 +314,7 @@  void sti_crtc_disable_vblank(struct drm_device *drm_dev, unsigned int pipe)
 {
 	struct sti_private *priv = drm_dev->dev_private;
 	struct sti_compositor *compo = priv->compo;
-	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb;
+	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];
 	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;
 
 	DRM_DEBUG_DRIVER("\n");