diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2013-09-13 14:05:50 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2013-09-17 08:45:15 +0200 |
| commit | 7ca6b7bbe918faae24aadee202112e910a8b7353 (patch) | |
| tree | d513e0fb1f6d5ef96c0c216d1bfc996adb226f68 /drivers/gpu/drm/msm/adreno | |
| parent | 2d6a4abe9d5542ee8aa4d7f65186b66d8890e0b0 (diff) | |
| download | linux-7ca6b7bbe918faae24aadee202112e910a8b7353.tar.gz linux-7ca6b7bbe918faae24aadee202112e910a8b7353.tar.xz | |
WIP: move out adreno_gpu_funcs into global header
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 26 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 |
3 files changed, 14 insertions, 19 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c index dc30cbed0e01..0761794bdc81 100644 --- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c @@ -367,22 +367,20 @@ static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m) #endif static const struct adreno_gpu_funcs funcs = { - .base = { - .get_param = adreno_get_param, - .hw_init = a3xx_hw_init, - .pm_suspend = msm_gpu_pm_suspend, - .pm_resume = msm_gpu_pm_resume, - .recover = adreno_recover, - .last_fence = adreno_last_fence, - .submit = adreno_submit, - .flush = adreno_flush, - .idle = a3xx_idle, - .irq = a3xx_irq, - .destroy = a3xx_destroy, + .get_param = adreno_get_param, + .hw_init = a3xx_hw_init, + .pm_suspend = msm_gpu_pm_suspend, + .pm_resume = msm_gpu_pm_resume, + .recover = adreno_recover, + .last_fence = adreno_last_fence, + .submit = adreno_submit, + .flush = adreno_flush, + .idle = a3xx_idle, + .irq = a3xx_irq, + .destroy = a3xx_destroy, #ifdef CONFIG_DEBUG_FS - .show = a3xx_show, + .show = a3xx_show, #endif - }, }; struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 91416963d120..1f7c71816d87 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -319,7 +319,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, return ret; } - ret = msm_gpu_init(drm, pdev, &gpu->base, &funcs->base, + ret = msm_gpu_init(drm, pdev, &gpu->base, funcs, gpu->info->name, "kgsl_3d0_reg_memory", "kgsl_3d0_irq", RB_SIZE); if (ret) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index eba015a36631..d7fff0a0ee17 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -19,6 +19,7 @@ #define __ADRENO_GPU_H__ #include <linux/firmware.h> +#include <drm/drm_adreno.h> #include "msm_gpu.h" #include "adreno_ringbuffer.h" @@ -36,10 +37,6 @@ struct adreno_rev { #define ADRENO_REV(core, major, minor, patchid) \ ((struct adreno_rev){ core, major, minor, patchid }) -struct adreno_gpu_funcs { - struct msm_gpu_funcs base; -}; - struct adreno_info; struct adreno_rbmemptrs { |