mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie:
"This is a combo of -next and some -fixes that came in in the
intervening time.
Highlights:
New drivers:
ARM Armada driver for Marvell Armada 510 SOCs
Intel:
Broadwell initial support under a default off switch,
Stereo/3D HDMI mode support
Valleyview improvements
Displayport improvements
Haswell fixes
initial mipi dsi panel support
CRC support for debugging
build with CONFIG_FB=n
Radeon:
enable DPM on a number of GPUs by default
secondary GPU powerdown support
enable HDMI audio by default
Hawaii support
Nouveau:
dynamic pm code infrastructure reworked, does nothing major yet
GK208 modesetting support
MSI fixes, on by default again
PMPEG improvements
pageflipping fixes
GMA500:
minnowboard SDVO support
VMware:
misc fixes
MSM:
prime, plane and rendernodes support
Tegra:
rearchitected to put the drm driver into the drm subsystem.
HDMI and gr2d support for tegra 114 SoC
QXL:
oops fix, and multi-head fixes
DRM core:
sysfs lifetime fixes
client capability ioctl
further cleanups to device midlayer
more vblank timestamp fixes"
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (789 commits)
drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
drm/nouveau/pwr: fix missing mutex unlock in a failure path
drm/nv40/therm: fix slowing down fan when pstate undefined
drm/nv11-: synchronise flips to vblank, unless async flip requested
drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
drm/nv10-: we no longer need to create nvsw object on user channels
drm/nouveau: always queue flips relative to kernel channel activity
drm/nouveau: there is no need to reserve/fence the new fb when flipping
drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
drm/nouveau: allow nouveau_fence_ref() to be a noop
drm/nvc8/mc: msi rearm is via the nvc0 method
drm/ttm: Fix vma page_prot bit manipulation
drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
drm/vmwgfx: Resource evict fixes
drm/edid: compare actual vrefresh for all modes for quirks
drm: shmob_drm: Convert to clk_prepare/unprepare
drm/nouveau: fix 32-bit build
drm/i915/opregion: fix build error on CONFIG_ACPI=n
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
...
This commit is contained in:
Linus Torvalds
commit
049ffa8ab3
557 changed files with 44648 additions and 14957 deletions
|
|
@ -107,8 +107,16 @@ struct cpufreq_policy {
|
|||
#define CPUFREQ_SHARED_TYPE_ALL (2) /* All dependent CPUs should set freq */
|
||||
#define CPUFREQ_SHARED_TYPE_ANY (3) /* Freq can be set from any dependent CPU*/
|
||||
|
||||
#ifdef CONFIG_CPU_FREQ
|
||||
struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu);
|
||||
void cpufreq_cpu_put(struct cpufreq_policy *policy);
|
||||
#else
|
||||
static inline struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
static inline void cpufreq_cpu_put(struct cpufreq_policy *policy) { }
|
||||
#endif
|
||||
|
||||
static inline bool policy_is_shared(struct cpufreq_policy *policy)
|
||||
{
|
||||
|
|
|
|||
284
include/linux/host1x.h
Normal file
284
include/linux/host1x.h
Normal file
|
|
@ -0,0 +1,284 @@
|
|||
/*
|
||||
* Copyright (c) 2009-2013, NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_HOST1X_H
|
||||
#define __LINUX_HOST1X_H
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
enum host1x_class {
|
||||
HOST1X_CLASS_HOST1X = 0x1,
|
||||
HOST1X_CLASS_GR2D = 0x51,
|
||||
HOST1X_CLASS_GR2D_SB = 0x52,
|
||||
HOST1X_CLASS_GR3D = 0x60,
|
||||
};
|
||||
|
||||
struct host1x_client;
|
||||
|
||||
struct host1x_client_ops {
|
||||
int (*init)(struct host1x_client *client);
|
||||
int (*exit)(struct host1x_client *client);
|
||||
};
|
||||
|
||||
struct host1x_client {
|
||||
struct list_head list;
|
||||
struct device *parent;
|
||||
struct device *dev;
|
||||
|
||||
const struct host1x_client_ops *ops;
|
||||
|
||||
enum host1x_class class;
|
||||
struct host1x_channel *channel;
|
||||
|
||||
struct host1x_syncpt **syncpts;
|
||||
unsigned int num_syncpts;
|
||||
};
|
||||
|
||||
/*
|
||||
* host1x buffer objects
|
||||
*/
|
||||
|
||||
struct host1x_bo;
|
||||
struct sg_table;
|
||||
|
||||
struct host1x_bo_ops {
|
||||
struct host1x_bo *(*get)(struct host1x_bo *bo);
|
||||
void (*put)(struct host1x_bo *bo);
|
||||
dma_addr_t (*pin)(struct host1x_bo *bo, struct sg_table **sgt);
|
||||
void (*unpin)(struct host1x_bo *bo, struct sg_table *sgt);
|
||||
void *(*mmap)(struct host1x_bo *bo);
|
||||
void (*munmap)(struct host1x_bo *bo, void *addr);
|
||||
void *(*kmap)(struct host1x_bo *bo, unsigned int pagenum);
|
||||
void (*kunmap)(struct host1x_bo *bo, unsigned int pagenum, void *addr);
|
||||
};
|
||||
|
||||
struct host1x_bo {
|
||||
const struct host1x_bo_ops *ops;
|
||||
};
|
||||
|
||||
static inline void host1x_bo_init(struct host1x_bo *bo,
|
||||
const struct host1x_bo_ops *ops)
|
||||
{
|
||||
bo->ops = ops;
|
||||
}
|
||||
|
||||
static inline struct host1x_bo *host1x_bo_get(struct host1x_bo *bo)
|
||||
{
|
||||
return bo->ops->get(bo);
|
||||
}
|
||||
|
||||
static inline void host1x_bo_put(struct host1x_bo *bo)
|
||||
{
|
||||
bo->ops->put(bo);
|
||||
}
|
||||
|
||||
static inline dma_addr_t host1x_bo_pin(struct host1x_bo *bo,
|
||||
struct sg_table **sgt)
|
||||
{
|
||||
return bo->ops->pin(bo, sgt);
|
||||
}
|
||||
|
||||
static inline void host1x_bo_unpin(struct host1x_bo *bo, struct sg_table *sgt)
|
||||
{
|
||||
bo->ops->unpin(bo, sgt);
|
||||
}
|
||||
|
||||
static inline void *host1x_bo_mmap(struct host1x_bo *bo)
|
||||
{
|
||||
return bo->ops->mmap(bo);
|
||||
}
|
||||
|
||||
static inline void host1x_bo_munmap(struct host1x_bo *bo, void *addr)
|
||||
{
|
||||
bo->ops->munmap(bo, addr);
|
||||
}
|
||||
|
||||
static inline void *host1x_bo_kmap(struct host1x_bo *bo, unsigned int pagenum)
|
||||
{
|
||||
return bo->ops->kmap(bo, pagenum);
|
||||
}
|
||||
|
||||
static inline void host1x_bo_kunmap(struct host1x_bo *bo,
|
||||
unsigned int pagenum, void *addr)
|
||||
{
|
||||
bo->ops->kunmap(bo, pagenum, addr);
|
||||
}
|
||||
|
||||
/*
|
||||
* host1x syncpoints
|
||||
*/
|
||||
|
||||
#define HOST1X_SYNCPT_CLIENT_MANAGED (1 << 0)
|
||||
#define HOST1X_SYNCPT_HAS_BASE (1 << 1)
|
||||
|
||||
struct host1x_syncpt_base;
|
||||
struct host1x_syncpt;
|
||||
struct host1x;
|
||||
|
||||
struct host1x_syncpt *host1x_syncpt_get(struct host1x *host, u32 id);
|
||||
u32 host1x_syncpt_id(struct host1x_syncpt *sp);
|
||||
u32 host1x_syncpt_read_min(struct host1x_syncpt *sp);
|
||||
u32 host1x_syncpt_read_max(struct host1x_syncpt *sp);
|
||||
int host1x_syncpt_incr(struct host1x_syncpt *sp);
|
||||
int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
|
||||
u32 *value);
|
||||
struct host1x_syncpt *host1x_syncpt_request(struct device *dev,
|
||||
unsigned long flags);
|
||||
void host1x_syncpt_free(struct host1x_syncpt *sp);
|
||||
|
||||
struct host1x_syncpt_base *host1x_syncpt_get_base(struct host1x_syncpt *sp);
|
||||
u32 host1x_syncpt_base_id(struct host1x_syncpt_base *base);
|
||||
|
||||
/*
|
||||
* host1x channel
|
||||
*/
|
||||
|
||||
struct host1x_channel;
|
||||
struct host1x_job;
|
||||
|
||||
struct host1x_channel *host1x_channel_request(struct device *dev);
|
||||
void host1x_channel_free(struct host1x_channel *channel);
|
||||
struct host1x_channel *host1x_channel_get(struct host1x_channel *channel);
|
||||
void host1x_channel_put(struct host1x_channel *channel);
|
||||
int host1x_job_submit(struct host1x_job *job);
|
||||
|
||||
/*
|
||||
* host1x job
|
||||
*/
|
||||
|
||||
struct host1x_reloc {
|
||||
struct host1x_bo *cmdbuf;
|
||||
u32 cmdbuf_offset;
|
||||
struct host1x_bo *target;
|
||||
u32 target_offset;
|
||||
u32 shift;
|
||||
u32 pad;
|
||||
};
|
||||
|
||||
struct host1x_job {
|
||||
/* When refcount goes to zero, job can be freed */
|
||||
struct kref ref;
|
||||
|
||||
/* List entry */
|
||||
struct list_head list;
|
||||
|
||||
/* Channel where job is submitted to */
|
||||
struct host1x_channel *channel;
|
||||
|
||||
u32 client;
|
||||
|
||||
/* Gathers and their memory */
|
||||
struct host1x_job_gather *gathers;
|
||||
unsigned int num_gathers;
|
||||
|
||||
/* Wait checks to be processed at submit time */
|
||||
struct host1x_waitchk *waitchk;
|
||||
unsigned int num_waitchk;
|
||||
u32 waitchk_mask;
|
||||
|
||||
/* Array of handles to be pinned & unpinned */
|
||||
struct host1x_reloc *relocarray;
|
||||
unsigned int num_relocs;
|
||||
struct host1x_job_unpin_data *unpins;
|
||||
unsigned int num_unpins;
|
||||
|
||||
dma_addr_t *addr_phys;
|
||||
dma_addr_t *gather_addr_phys;
|
||||
dma_addr_t *reloc_addr_phys;
|
||||
|
||||
/* Sync point id, number of increments and end related to the submit */
|
||||
u32 syncpt_id;
|
||||
u32 syncpt_incrs;
|
||||
u32 syncpt_end;
|
||||
|
||||
/* Maximum time to wait for this job */
|
||||
unsigned int timeout;
|
||||
|
||||
/* Index and number of slots used in the push buffer */
|
||||
unsigned int first_get;
|
||||
unsigned int num_slots;
|
||||
|
||||
/* Copy of gathers */
|
||||
size_t gather_copy_size;
|
||||
dma_addr_t gather_copy;
|
||||
u8 *gather_copy_mapped;
|
||||
|
||||
/* Check if register is marked as an address reg */
|
||||
int (*is_addr_reg)(struct device *dev, u32 reg, u32 class);
|
||||
|
||||
/* Request a SETCLASS to this class */
|
||||
u32 class;
|
||||
|
||||
/* Add a channel wait for previous ops to complete */
|
||||
bool serialize;
|
||||
};
|
||||
|
||||
struct host1x_job *host1x_job_alloc(struct host1x_channel *ch,
|
||||
u32 num_cmdbufs, u32 num_relocs,
|
||||
u32 num_waitchks);
|
||||
void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *mem_id,
|
||||
u32 words, u32 offset);
|
||||
struct host1x_job *host1x_job_get(struct host1x_job *job);
|
||||
void host1x_job_put(struct host1x_job *job);
|
||||
int host1x_job_pin(struct host1x_job *job, struct device *dev);
|
||||
void host1x_job_unpin(struct host1x_job *job);
|
||||
|
||||
/*
|
||||
* subdevice probe infrastructure
|
||||
*/
|
||||
|
||||
struct host1x_device;
|
||||
|
||||
struct host1x_driver {
|
||||
const struct of_device_id *subdevs;
|
||||
struct list_head list;
|
||||
const char *name;
|
||||
|
||||
int (*probe)(struct host1x_device *device);
|
||||
int (*remove)(struct host1x_device *device);
|
||||
};
|
||||
|
||||
int host1x_driver_register(struct host1x_driver *driver);
|
||||
void host1x_driver_unregister(struct host1x_driver *driver);
|
||||
|
||||
struct host1x_device {
|
||||
struct host1x_driver *driver;
|
||||
struct list_head list;
|
||||
struct device dev;
|
||||
|
||||
struct mutex subdevs_lock;
|
||||
struct list_head subdevs;
|
||||
struct list_head active;
|
||||
|
||||
struct mutex clients_lock;
|
||||
struct list_head clients;
|
||||
};
|
||||
|
||||
static inline struct host1x_device *to_host1x_device(struct device *dev)
|
||||
{
|
||||
return container_of(dev, struct host1x_device, dev);
|
||||
}
|
||||
|
||||
int host1x_device_init(struct host1x_device *device);
|
||||
int host1x_device_exit(struct host1x_device *device);
|
||||
|
||||
int host1x_client_register(struct host1x_client *client);
|
||||
int host1x_client_unregister(struct host1x_client *client);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in a new issue