From e21e6e947b334cd16cc92c41953bf3c0153b1508 Mon Sep 17 00:00:00 2001 From: skadamati Date: Tue, 23 May 2017 15:55:29 +0530 Subject: gpu: nvgpu: Fix build failure by missing headers Move the platform_gk20a.h include out of the ifdef CONFIG_DEBUG_FS in the CDE code since dev_from_gk20a() is used regardless of whether debugfs is enabled. Also modify some of the CE ops to take a struct gk20a instead of a struct device. This avoids any requirement for including linux/device.h or platform_gk20a.h. Bug 200310575 Change-Id: Ifef963cd0f66d05094a698200386cc6140920eac Signed-off-by: skadamati Reviewed-on: http://git-master/r/1487830 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 25d6462d..1ed90b14 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c @@ -424,7 +424,7 @@ void gk20a_ce_suspend(struct gk20a *g) } /* CE app utility functions */ -u32 gk20a_ce_create_context_with_cb(struct device *dev, +u32 gk20a_ce_create_context_with_cb(struct gk20a *g, int runlist_id, int priority, int timeslice, @@ -432,7 +432,6 @@ u32 gk20a_ce_create_context_with_cb(struct device *dev, ce_event_callback user_event_callback) { struct gk20a_gpu_ctx *ce_ctx; - struct gk20a *g = gk20a_from_dev(dev); struct gk20a_ce_app *ce_app = &g->ce_app; u32 ctx_id = ~0; int err = 0; @@ -548,7 +547,7 @@ end: } EXPORT_SYMBOL(gk20a_ce_create_context_with_cb); -int gk20a_ce_execute_ops(struct device *dev, +int gk20a_ce_execute_ops(struct gk20a *g, u32 ce_ctx_id, u64 src_buf, u64 dst_buf, @@ -561,7 +560,6 @@ int gk20a_ce_execute_ops(struct device *dev, struct gk20a_fence **gk20a_fence_out) { int ret = -EPERM; - struct gk20a *g = gk20a_from_dev(dev); struct gk20a_ce_app *ce_app = &g->ce_app; struct gk20a_gpu_ctx *ce_ctx, *ce_ctx_save; bool found = false; @@ -700,10 +698,9 @@ end: } EXPORT_SYMBOL(gk20a_ce_execute_ops); -void gk20a_ce_delete_context(struct device *dev, +void gk20a_ce_delete_context(struct gk20a *g, u32 ce_ctx_id) { - struct gk20a *g = gk20a_from_dev(dev); gk20a_ce_delete_context_priv(g, ce_ctx_id); } -- cgit v1.2.2