History

drm/nouveau/kms/nv50: fix atomic regression on original G80

Ben Skeggs committed 9 years ago

Commit 19d53d01 parent b53ac1e1 file · +5 −0Browse files

Unified · Split

drivers/gpu/drm/nouveau/nv50_display.c+5−0
@@ -1726,6 +1726,11 @@ nv50_head_core_set(struct nv50_head *head, struct nv50_head_atom *asyh) · 1725 unmodified lines
17261726 evo_data(push, asyh->core.handle);
17271727 evo_mthd(push, 0x08c0 + head->base.index * 0x400, 1);
17281728 evo_data(push, (asyh->core.y << 16) | asyh->core.x);
1729+ /* EVO will complain with INVALID_STATE if we have an
1730+ * active cursor and (re)specify HeadSetContextDmaIso
1731+ * without also updating HeadSetOffsetCursor.
1732+ */
1733+ asyh->set.curs = asyh->curs.visible;
17291734 } else
17301735 if (core->base.user.oclass < GF110_DISP_CORE_CHANNEL_DMA) {
17311736 evo_mthd(push, 0x0860 + head->base.index * 0x400, 1);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t