Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
nouveau
/
dispnv04
/
tvnv17.h
diff --git
a/kernel/drivers/gpu/drm/nouveau/dispnv04/tvnv17.h
b/kernel/drivers/gpu/drm/nouveau/dispnv04/tvnv17.h
index
225894c
..
1b07521
100644
(file)
--- a/
kernel/drivers/gpu/drm/nouveau/dispnv04/tvnv17.h
+++ b/
kernel/drivers/gpu/drm/nouveau/dispnv04/tvnv17.h
@@
-85,7
+85,7
@@
struct nv17_tv_encoder {
#define to_tv_enc(x) container_of(nouveau_encoder(x), \
struct nv17_tv_encoder, base)
#define to_tv_enc(x) container_of(nouveau_encoder(x), \
struct nv17_tv_encoder, base)
-extern c
har *
nv17_tv_norm_names[NUM_TV_NORMS];
+extern c
onst char * const
nv17_tv_norm_names[NUM_TV_NORMS];
extern struct nv17_tv_norm_params {
enum {
extern struct nv17_tv_norm_params {
enum {
@@
-131,13
+131,13
@@
static inline void nv_write_ptv(struct drm_device *dev, uint32_t reg,
uint32_t val)
{
struct nvif_device *device = &nouveau_drm(dev)->device;
uint32_t val)
{
struct nvif_device *device = &nouveau_drm(dev)->device;
- nvif_wr32(
device
, reg, val);
+ nvif_wr32(
&device->object
, reg, val);
}
static inline uint32_t nv_read_ptv(struct drm_device *dev, uint32_t reg)
{
struct nvif_device *device = &nouveau_drm(dev)->device;
}
static inline uint32_t nv_read_ptv(struct drm_device *dev, uint32_t reg)
{
struct nvif_device *device = &nouveau_drm(dev)->device;
- return nvif_rd32(
device
, reg);
+ return nvif_rd32(
&device->object
, reg);
}
static inline void nv_write_tv_enc(struct drm_device *dev, uint8_t reg,
}
static inline void nv_write_tv_enc(struct drm_device *dev, uint8_t reg,