tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/nvd0/disp: rename sync channel to flip channel
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+9
-9
+9
-9
drivers/gpu/drm/nouveau/nvd0_display.c
+9
-9
drivers/gpu/drm/nouveau/nvd0_display.c
···
38
38
#define EVO_DMA_NR 9
39
39
40
40
#define EVO_MASTER (0x00)
41
-
#define EVO_SYNC(c) (0x01 + (c))
41
+
#define EVO_FLIP(c) (0x01 + (c))
42
42
#define EVO_OVLY(c) (0x05 + (c))
43
43
#define EVO_OIMM(c) (0x09 + (c))
44
44
#define EVO_CURS(c) (0x0d + (c))
···
240
240
}
241
241
242
242
/******************************************************************************
243
-
* Sync channel (aka. page flipping)
243
+
* Page flipping channel
244
244
*****************************************************************************/
245
245
struct nouveau_bo *
246
246
nvd0_display_crtc_sema(struct drm_device *dev, int crtc)
247
247
{
248
248
struct nvd0_display *disp = nvd0_display(dev);
249
-
struct evo *evo = &disp->evo[EVO_SYNC(crtc)];
249
+
struct evo *evo = &disp->evo[EVO_FLIP(crtc)];
250
250
return evo->sem.bo;
251
251
}
252
252
···
255
255
{
256
256
struct nvd0_display *disp = nvd0_display(crtc->dev);
257
257
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
258
-
struct evo *evo = &disp->evo[EVO_SYNC(nv_crtc->index)];
258
+
struct evo *evo = &disp->evo[EVO_FLIP(nv_crtc->index)];
259
259
u32 *push;
260
260
261
261
push = evo_wait(crtc->dev, evo->idx, 8);
···
279
279
struct nouveau_framebuffer *nv_fb = nouveau_framebuffer(fb);
280
280
struct nvd0_display *disp = nvd0_display(crtc->dev);
281
281
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
282
-
struct evo *evo = &disp->evo[EVO_SYNC(nv_crtc->index)];
282
+
struct evo *evo = &disp->evo[EVO_FLIP(nv_crtc->index)];
283
283
u64 offset;
284
284
u32 *push;
285
285
int ret;
···
1652
1652
{
1653
1653
int i;
1654
1654
1655
-
/* fini cursors + overlays + syncs */
1655
+
/* fini cursors + overlays + flips */
1656
1656
for (i = 1; i >= 0; i--) {
1657
1657
evo_fini_pio(dev, EVO_CURS(i));
1658
1658
evo_fini_pio(dev, EVO_OIMM(i));
1659
1659
evo_fini_dma(dev, EVO_OVLY(i));
1660
-
evo_fini_dma(dev, EVO_SYNC(i));
1660
+
evo_fini_dma(dev, EVO_FLIP(i));
1661
1661
}
1662
1662
1663
1663
/* fini master */
···
1712
1712
if (ret)
1713
1713
goto error;
1714
1714
1715
-
/* init syncs + overlays + cursors */
1715
+
/* init flips + overlays + cursors */
1716
1716
for (i = 0; i < dev->mode_config.num_crtc; i++) {
1717
-
if ((ret = evo_init_dma(dev, EVO_SYNC(i))) ||
1717
+
if ((ret = evo_init_dma(dev, EVO_FLIP(i))) ||
1718
1718
(ret = evo_init_dma(dev, EVO_OVLY(i))) ||
1719
1719
(ret = evo_init_pio(dev, EVO_OIMM(i))) ||
1720
1720
(ret = evo_init_pio(dev, EVO_CURS(i))))