ANDROID: GKI: fix up CRC issue with struct drm_atomic_state
In commit93f581d763("drm/gem: Test for imported GEM buffers with helper"), a new .h file is included in the drm include files, which messes with the definition of struct drm_atomic_state by moving some fields from "unknown" to "known". Fix this up by adding ANDROID_KABI_DECLONLY directives for every type affected in every affected source file. Fixes:93f581d763("drm/gem: Test for imported GEM buffers with helper") Change-Id: Ia1ecbc152650747bc321156d6920e42121eb34ee Signed-off-by: Giuliano Procida <gprocida@google.com>
This commit is contained in:
@@ -46,6 +46,11 @@
|
|||||||
#include "drm_crtc_internal.h"
|
#include "drm_crtc_internal.h"
|
||||||
#include "drm_internal.h"
|
#include "drm_internal.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(iosys_map);
|
||||||
|
|
||||||
void __drm_crtc_commit_free(struct kref *kref)
|
void __drm_crtc_commit_free(struct kref *kref)
|
||||||
{
|
{
|
||||||
struct drm_crtc_commit *commit =
|
struct drm_crtc_commit *commit =
|
||||||
|
|||||||
@@ -23,6 +23,10 @@
|
|||||||
#include "drm_crtc_internal.h"
|
#include "drm_crtc_internal.h"
|
||||||
#include "drm_internal.h"
|
#include "drm_internal.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DOC: overview
|
* DOC: overview
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -45,6 +45,10 @@
|
|||||||
#include "drm_crtc_internal.h"
|
#include "drm_crtc_internal.h"
|
||||||
#include "drm_internal.h"
|
#include "drm_internal.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
|
||||||
/***************************************************
|
/***************************************************
|
||||||
* Initialization, etc.
|
* Initialization, etc.
|
||||||
**************************************************/
|
**************************************************/
|
||||||
|
|||||||
@@ -49,6 +49,10 @@
|
|||||||
#include "drm_crtc_internal.h"
|
#include "drm_crtc_internal.h"
|
||||||
#include "drm_internal.h"
|
#include "drm_internal.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
|
||||||
/* from BKL pushdown */
|
/* from BKL pushdown */
|
||||||
DEFINE_MUTEX(drm_global_mutex);
|
DEFINE_MUTEX(drm_global_mutex);
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,11 @@
|
|||||||
#include "drm_crtc_internal.h"
|
#include "drm_crtc_internal.h"
|
||||||
#include "drm_internal.h"
|
#include "drm_internal.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(iosys_map);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DOC: overview
|
* DOC: overview
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -211,6 +211,11 @@
|
|||||||
|
|
||||||
#include "drm_internal.h"
|
#include "drm_internal.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(iosys_map);
|
||||||
|
|
||||||
struct syncobj_wait_entry {
|
struct syncobj_wait_entry {
|
||||||
struct list_head node;
|
struct list_head node;
|
||||||
struct task_struct *task;
|
struct task_struct *task;
|
||||||
|
|||||||
@@ -46,6 +46,11 @@
|
|||||||
|
|
||||||
#include "ttm_module.h"
|
#include "ttm_module.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(sg_table);
|
||||||
|
|
||||||
static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
|
static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
|
||||||
struct ttm_placement *placement)
|
struct ttm_placement *placement)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -37,6 +37,10 @@
|
|||||||
|
|
||||||
#include <drm/drm_cache.h>
|
#include <drm/drm_cache.h>
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
|
||||||
struct ttm_transfer_obj {
|
struct ttm_transfer_obj {
|
||||||
struct ttm_buffer_object base;
|
struct ttm_buffer_object base;
|
||||||
struct ttm_buffer_object *bo;
|
struct ttm_buffer_object *bo;
|
||||||
|
|||||||
@@ -38,6 +38,11 @@
|
|||||||
#include <drm/drm_drv.h>
|
#include <drm/drm_drv.h>
|
||||||
#include <drm/drm_managed.h>
|
#include <drm/drm_managed.h>
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(sg_table);
|
||||||
|
|
||||||
static vm_fault_t ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
|
static vm_fault_t ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
|
||||||
struct vm_fault *vmf)
|
struct vm_fault *vmf)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -37,6 +37,11 @@
|
|||||||
|
|
||||||
#include "ttm_module.h"
|
#include "ttm_module.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(sg_table);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ttm_global_mutex - protecting the global state
|
* ttm_global_mutex - protecting the global state
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -37,6 +37,11 @@
|
|||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
ANDROID_KABI_DECLONLY(sg_table);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Currently we use a spinlock for the lock, but a mutex *may* be
|
* Currently we use a spinlock for the lock, but a mutex *may* be
|
||||||
* more appropriate to reduce scheduling latency if the range manager
|
* more appropriate to reduce scheduling latency if the range manager
|
||||||
|
|||||||
@@ -33,6 +33,10 @@
|
|||||||
|
|
||||||
#include <drm/drm_util.h>
|
#include <drm/drm_util.h>
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
|
||||||
/* Detach the cursor from the bulk move list*/
|
/* Detach the cursor from the bulk move list*/
|
||||||
static void
|
static void
|
||||||
ttm_resource_cursor_clear_bulk(struct ttm_resource_cursor *cursor)
|
ttm_resource_cursor_clear_bulk(struct ttm_resource_cursor *cursor)
|
||||||
|
|||||||
@@ -45,6 +45,10 @@
|
|||||||
|
|
||||||
#include "ttm_module.h"
|
#include "ttm_module.h"
|
||||||
|
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf);
|
||||||
|
ANDROID_KABI_DECLONLY(dma_buf_attachment);
|
||||||
|
|
||||||
static unsigned long ttm_pages_limit;
|
static unsigned long ttm_pages_limit;
|
||||||
|
|
||||||
MODULE_PARM_DESC(pages_limit, "Limit for the allocated pages");
|
MODULE_PARM_DESC(pages_limit, "Limit for the allocated pages");
|
||||||
|
|||||||
Reference in New Issue
Block a user