Skip to contentSkip to conversation

drm/exynos: fix double call of drm_prime_(init/destroy)_file_private

PATCH In review Mandeep Singh Baines 4 participants 7 messages Sep 5, 2012 – Sep 7, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/exynos: fix double call of drm_prime_(init/destroy)_file_private

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0
CC Stéphane Marchesin <[email protected]>
CC Pawel Osciak <[email protected]>
CC Inki Dae <[email protected]>
CC Joonyoung Shim <[email protected]>
CC Seung-Woo Kim <[email protected]>
CC Kyungmin Park <[email protected]>
CC David Airlie <[email protected]>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -2
index ebacec6..a27b8ff 100644
@@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
 	if (!file_priv)
 		return -ENOMEM;
 
-	drm_prime_init_file_private(&file->prime);
 	file->driver_priv = file_priv;
 
 	return exynos_drm_subdrv_open(dev, file);
@@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev,
 			e->base.destroy(&e->base);
 		}
 	}
-	drm_prime_destroy_file_private(&file->prime);
 	spin_unlock_irqrestore(&dev->event_lock, flags);
 
 	exynos_drm_subdrv_close(dev, file);
Signature · 1 line
1.7.7.3
maintainer Acked-by on v1 1/1
#1 lore raw

Hi Mandeep,

Quoted 14 lines · Mandeep Singh Baines

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390
Quoted 7 lines

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0

You are right. prime file_priv is handled by drm_fops.c, so it can be removed from exynos drm.

Thanks for your patch.

Quoted 9 lines
CC Stéphane Marchesin <[email protected]>
CC Pawel Osciak <[email protected]>
CC Inki Dae <[email protected]>
CC Joonyoung Shim <[email protected]>
CC Seung-Woo Kim <[email protected]>
CC Kyungmin Park <[email protected]>
CC David Airlie <[email protected]>
Quoted 25 lines
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -2
index ebacec6..a27b8ff 100644
@@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
 	if (!file_priv)
 		return -ENOMEM;
 
-	drm_prime_init_file_private(&file->prime);
 	file->driver_priv = file_priv;
 
 	return exynos_drm_subdrv_open(dev, file);
@@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev,
 			e->base.destroy(&e->base);
 		}
 	}
-	drm_prime_destroy_file_private(&file->prime);
 	spin_unlock_irqrestore(&dev->event_lock, flags);
 
 	exynos_drm_subdrv_close(dev, file);
Signature · 3 lines
Seung-Woo Kim
Samsung Software R&D Center
--
maintainer
#2 lore raw
In reply to Mandeep Singh Baines

Hi,

2012/9/6 Mandeep Singh Baines <[email protected]>:

Quoted 21 lines

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0
Quoted 9 lines
CC Stéphane Marchesin <[email protected]>
CC Pawel Osciak <[email protected]>
CC Inki Dae <[email protected]>
CC Joonyoung Shim <[email protected]>
CC Seung-Woo Kim <[email protected]>
CC Kyungmin Park <[email protected]>
CC David Airlie <[email protected]>

remove all CCs and can you send it again using text mode? your patch is messed up when I try to get patch file.

Thanks.
Inki Dae

Quoted 31 lines
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -3
index ebacec6..a27b8ff 100644
@@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
        if (!file_priv)
                return -ENOMEM;
 
-       drm_prime_init_file_private(&file->prime);
        file->driver_priv = file_priv;
 
        return exynos_drm_subdrv_open(dev, file);
@@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev,
                        e->base.destroy(&e->base);
                }
        }
-       drm_prime_destroy_file_private(&file->prime);
        spin_unlock_irqrestore(&dev->event_lock, flags);
 
        exynos_drm_subdrv_close(dev, file);
--

1.7.7.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

Dear Inki Dae,

Am Donnerstag, den 06.09.2012, 11:35 +0900 schrieb InKi Dae:

Quoted 32 lines

2012/9/6 Mandeep Singh Baines <[email protected]>:

Quoted 21 lines

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0
Quoted 9 lines
CC Stéphane Marchesin <[email protected]>
CC Pawel Osciak <[email protected]>
CC Inki Dae <[email protected]>
CC Joonyoung Shim <[email protected]>
CC Seung-Woo Kim <[email protected]>
CC Kyungmin Park <[email protected]>
CC David Airlie <[email protected]>
Quoted 1 line

remove all CCs

I guess they were generated by some script. So they should be fine, no?

Mandeep, if you put CC in here those people should be CCed in real. git send-email should take care of that but I do not see everyone in the CC field. Or does git send-email use blind carbon copy (BCC) field?

Quoted 1 line

and can you send it again using text mode?

At least to the list it was send in plain text mode.

Quoted 1 line

your patch is messed up when I try to get patch file.

Everything is fine on my side. Especially since Mandeep used git send-email which should do everything correctly.

Quoted 2 lines

Thanks.
Inki Dae

In your From address your name is written InKi with capital K. Which one is correct?

Thanks,

Paul

maintainer
#4 lore raw

Hi,

2012/9/6 Paul Menzel <[email protected]>:

Quoted 45 lines

Dear Inki Dae,

Am Donnerstag, den 06.09.2012, 11:35 +0900 schrieb InKi Dae:

Quoted 32 lines

2012/9/6 Mandeep Singh Baines <[email protected]>:

Quoted 21 lines

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0
Quoted 9 lines
CC Stéphane Marchesin <[email protected]>
CC Pawel Osciak <[email protected]>
CC Inki Dae <[email protected]>
CC Joonyoung Shim <[email protected]>
CC Seung-Woo Kim <[email protected]>
CC Kyungmin Park <[email protected]>
CC David Airlie <[email protected]>
Quoted 1 line

remove all CCs

I guess they were generated by some script. So they should be fine, no?

Mandeep, if you put CC in here those people should be CCed in real. git send-email should take care of that but I do not see everyone in the CC field. Or does git send-email use blind carbon copy (BCC) field?

Quoted 9 lines
Quoted 1 line

and can you send it again using text mode?

At least to the list it was send in plain text mode.

Quoted 1 line

your patch is messed up when I try to get patch file.

Everything is fine on my side. Especially since Mandeep used git send-email which should do everything correctly.

your patch was encoded with 'Content-Transfer-Encoding: base64' so please use 7bit ascii like 'Content-Transfer-Encoding: 7bit'

Quoted 6 lines
Quoted 2 lines

Thanks.
Inki Dae

In your From address your name is written InKi with capital K. Which one is correct?

Inki is correct :)

Thanks.
Inki Dae

Quoted 10 lines

Thanks,

Paul

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw

PATCH 1/1 drm/exynos: fix double call of drm_prime_(init/destroy)_file_private

In reply to InKi Dae

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -2
index ebacec6..a27b8ff 100644
@@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
 	if (!file_priv)
 		return -ENOMEM;
 
-	drm_prime_init_file_private(&file->prime);
 	file->driver_priv = file_priv;
 
 	return exynos_drm_subdrv_open(dev, file);
@@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev,
 			e->base.destroy(&e->base);
 		}
 	}
-	drm_prime_destroy_file_private(&file->prime);
 	spin_unlock_irqrestore(&dev->event_lock, flags);
 
 	exynos_drm_subdrv_close(dev, file);
Signature · 1 line
1.7.7.3
maintainer Applied
#6 lore raw

Applied.

Thanks,
Inki Dae

2012/9/7 Mandeep Singh Baines <[email protected]>:

Quoted 54 lines

The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs.

Before:

[    7.639366] drm_prime_init_file ee3675d0
[    7.639377] drm_prime_init_file ee3675d0
[    7.639507] drm_prime_destroy_file ee3675d0
[    7.639518] drm_prime_destroy_file ee3675d0
[    7.639802] drm_prime_init_file ee372390
[    7.639810] drm_prime_init_file ee372390
[    8.473316] drm_prime_init_file ee356390
[    8.473331] drm_prime_init_file ee356390

After:

[    6.363842] drm_prime_init_file edc2e5d0
[    6.363994] drm_prime_destroy_file edc2e5d0
[    6.364260] drm_prime_init_file edc2e750
[    8.004837] drm_prime_init_file ee36ded0
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -3
index ebacec6..a27b8ff 100644
@@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
        if (!file_priv)
                return -ENOMEM;
 
-       drm_prime_init_file_private(&file->prime);
        file->driver_priv = file_priv;
 
        return exynos_drm_subdrv_open(dev, file);
@@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev,
                        e->base.destroy(&e->base);
                }
        }
-       drm_prime_destroy_file_private(&file->prime);
        spin_unlock_irqrestore(&dev->event_lock, flags);
 
        exynos_drm_subdrv_close(dev, file);
--

1.7.7.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel