git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv50_cursor.c
diff --git
a/drivers/gpu/drm/nouveau/nv50_cursor.c
b/drivers/gpu/drm/nouveau/nv50_cursor.c
index
e2e79a8
..
753e723
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_cursor.c
+++ b/
drivers/gpu/drm/nouveau/nv50_cursor.c
@@
-41,7
+41,7
@@
nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
struct drm_device *dev = nv_crtc->base.dev;
int ret;
struct drm_device *dev = nv_crtc->base.dev;
int ret;
- NV_DEBUG(dev, "\n");
+ NV_DEBUG
_KMS
(dev, "\n");
if (update && nv_crtc->cursor.visible)
return;
if (update && nv_crtc->cursor.visible)
return;
@@
-76,7
+76,7
@@
nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
struct drm_device *dev = nv_crtc->base.dev;
int ret;
struct drm_device *dev = nv_crtc->base.dev;
int ret;
- NV_DEBUG(dev, "\n");
+ NV_DEBUG
_KMS
(dev, "\n");
if (update && !nv_crtc->cursor.visible)
return;
if (update && !nv_crtc->cursor.visible)
return;
@@
-116,7
+116,7
@@
nv50_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y)
static void
nv50_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset)
{
static void
nv50_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset)
{
- NV_DEBUG(nv_crtc->base.dev, "\n");
+ NV_DEBUG
_KMS
(nv_crtc->base.dev, "\n");
if (offset == nv_crtc->cursor.offset)
return;
if (offset == nv_crtc->cursor.offset)
return;
@@
-143,7
+143,7
@@
nv50_cursor_fini(struct nouveau_crtc *nv_crtc)
struct drm_device *dev = nv_crtc->base.dev;
int idx = nv_crtc->index;
struct drm_device *dev = nv_crtc->base.dev;
int idx = nv_crtc->index;
- NV_DEBUG(dev, "\n");
+ NV_DEBUG
_KMS
(dev, "\n");
nv_wr32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx), 0);
if (!nv_wait(NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx),
nv_wr32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx), 0);
if (!nv_wait(NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx),