summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/adreno/adreno_gpu.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/adreno_gpu.h')
-rw-r--r--drivers/gpu/drm/msm/adreno/adreno_gpu.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 17c5628..335c6a5 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -19,9 +19,11 @@
#define __ADRENO_GPU_H__
#include <linux/firmware.h>
+#include <linux/regulator/consumer.h>
+#include <linux/clk.h>
#include <drm/drm_adreno.h>
+#include <drm/msm_drm.h>
-#include "msm_gpu.h"
#include "adreno_ringbuffer.h"
#include "adreno_common.xml.h"
@@ -48,14 +50,13 @@ struct adreno_rbmemptrs {
};
struct adreno_gpu {
- struct msm_gpu base;
struct platform_device *pdev;
struct drm_device *drm;
struct adreno_rev rev;
const struct adreno_info *info;
uint32_t revn; /* numeric revision name */
const struct adreno_gpu_funcs *funcs;
- struct adreno_gem *gem;
+ const struct adreno_gem *gem;
struct workqueue_struct *shared_wq;
/* firmware: */
@@ -130,7 +131,7 @@ void adreno_wait_ring(struct adreno_gpu *gpu, uint32_t ndwords);
int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
struct adreno_gpu *gpu, const struct adreno_gpu_funcs *funcs,
- struct adreno_gem *gem, struct workqueue_struct *wq,
+ const struct adreno_gem *gem, struct workqueue_struct *wq,
struct adreno_rev rev);
void adreno_gpu_cleanup(struct adreno_gpu *gpu);
@@ -181,5 +182,11 @@ OUT_PKT3(struct adreno_ringbuffer *ring, uint8_t opcode, uint16_t cnt)
OUT_RING(ring, CP_TYPE3_PKT | ((cnt-1) << 16) | ((opcode & 0xFF) << 8));
}
+/* for the generated headers: */
+#define INVALID_IDX(idx) ({BUG(); 0;})
+#define fui(x) ({BUG(); 0;})
+#define util_float_to_half(x) ({BUG(); 0;})
+
+#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
#endif /* __ADRENO_GPU_H__ */