drm: sti: remove sti_gem_prime_export hack

Submitted by Benjamin Gaignard on Feb. 26, 2016, 8:50 a.m.

Details

Message ID 1456476615-22160-1-git-send-email-benjamin.gaignard@linaro.org
State New
Headers show
Series "drm: sti: remove sti_gem_prime_export hack" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Benjamin Gaignard Feb. 26, 2016, 8:50 a.m.
Thanks to "drm: prime: Honour O_RDWR during prime-handle-to-fd"
commit we don't need to hack flags anymore.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
 drivers/gpu/drm/sti/sti_drv.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index 506b562..32a3eec 100644
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -181,15 +181,6 @@  static const struct file_operations sti_driver_fops = {
 	.release = drm_release,
 };
 
-static struct dma_buf *sti_gem_prime_export(struct drm_device *dev,
-					    struct drm_gem_object *obj,
-					    int flags)
-{
-	/* we want to be able to write in mmapped buffer */
-	flags |= O_RDWR;
-	return drm_gem_prime_export(dev, obj, flags);
-}
-
 static struct drm_driver sti_driver = {
 	.driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET |
 	    DRIVER_GEM | DRIVER_PRIME,
@@ -207,7 +198,7 @@  static struct drm_driver sti_driver = {
 
 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-	.gem_prime_export = sti_gem_prime_export,
+	.gem_prime_export = drm_gem_prime_export,
 	.gem_prime_import = drm_gem_prime_import,
 	.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
 	.gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,

Comments

On Fri, Feb 26, 2016 at 09:50:15AM +0100, Benjamin Gaignard wrote:
> Thanks to "drm: prime: Honour O_RDWR during prime-handle-to-fd"
> commit we don't need to hack flags anymore.
> 
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/sti/sti_drv.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> index 506b562..32a3eec 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -181,15 +181,6 @@ static const struct file_operations sti_driver_fops = {
>  	.release = drm_release,
>  };
>  
> -static struct dma_buf *sti_gem_prime_export(struct drm_device *dev,
> -					    struct drm_gem_object *obj,
> -					    int flags)
> -{
> -	/* we want to be able to write in mmapped buffer */
> -	flags |= O_RDWR;
> -	return drm_gem_prime_export(dev, obj, flags);
> -}
> -
>  static struct drm_driver sti_driver = {
>  	.driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET |
>  	    DRIVER_GEM | DRIVER_PRIME,
> @@ -207,7 +198,7 @@ static struct drm_driver sti_driver = {
>  
>  	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
>  	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> -	.gem_prime_export = sti_gem_prime_export,
> +	.gem_prime_export = drm_gem_prime_export,
>  	.gem_prime_import = drm_gem_prime_import,
>  	.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
>  	.gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
> -- 
> 1.9.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel