Commit b05d8738 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: separate blocklinear vs linear pitch 



Will be required to support Volta.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 119608a7

drivers/gpu/drm/nouveau/dispnv50/atom.h

+4 −2
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ struct nv50_head_atom { 
		u8  format;

		u8  kind:7;

		u8  layout:1;

		u8  block:4;

		u8  blockh:4;

		u16 blocks:12;

		u32 pitch:20;

		u16 x;

		u16 y;
@@ -175,7 +176,8 @@ struct nv50_wndw_atom { 
		u8  format;

		u8  kind:7;

		u8  layout:1;

		u8  block:4;

		u8  blockh:4;

		u16 blocks[3];

		u32 pitch[3];

		u16 w;

		u16 h;

drivers/gpu/drm/nouveau/dispnv50/base507c.c

+3 −2
Original line number Diff line number Diff line
@@ -67,8 +67,9 @@ base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
		evo_data(push, 0x00000000);

		evo_data(push, asyw->image.h << 16 | asyw->image.w);

		evo_data(push, asyw->image.layout << 20 |

			       asyw->image.pitch[0] |

			       asyw->image.block);

			       (asyw->image.pitch[0] >> 8) << 8 |

			       asyw->image.blocks[0] << 8 |

			       asyw->image.blockh);

		evo_data(push, asyw->image.kind << 16 |

			       asyw->image.format << 8);

		evo_kick(push, &wndw->wndw);

drivers/gpu/drm/nouveau/dispnv50/base827c.c

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
		evo_data(push, 0x00000000);

		evo_data(push, asyw->image.h << 16 | asyw->image.w);

		evo_data(push, asyw->image.layout << 20 |

			       asyw->image.pitch[0] |

			       asyw->image.block);

			       (asyw->image.pitch[0] >> 8) << 8 |

			       asyw->image.blocks[0] << 8 |

			       asyw->image.blockh);

		evo_data(push, asyw->image.format << 8);

		evo_kick(push, &wndw->wndw);

	}

drivers/gpu/drm/nouveau/dispnv50/base907c.c

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
		evo_data(push, 0x00000000);

		evo_data(push, asyw->image.h << 16 | asyw->image.w);

		evo_data(push, asyw->image.layout << 24 |

			       asyw->image.pitch[0] |

			       asyw->image.block);

			       (asyw->image.pitch[0] >> 8) << 8 |

			       asyw->image.blocks[0] << 8 |

			       asyw->image.blockh);

		evo_data(push, asyw->image.format << 8);

		evo_kick(push, &wndw->wndw);

	}

drivers/gpu/drm/nouveau/dispnv50/head507d.c

+5 −3
Original line number Diff line number Diff line
@@ -151,8 +151,9 @@ head507d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh) 
		evo_mthd(push, 0x0868 + head->base.index * 0x400, 4);

		evo_data(push, asyh->core.h << 16 | asyh->core.w);

		evo_data(push, asyh->core.layout << 20 |

			       asyh->core.pitch >> 8 << 8 |

			       asyh->core.block);

			       (asyh->core.pitch >> 8) << 8 |

			       asyh->core.blocks << 8 |

			       asyh->core.blockh);

		evo_data(push, asyh->core.kind << 16 |

			       asyh->core.format << 8);

		evo_data(push, asyh->core.handle);
@@ -196,7 +197,8 @@ head507d_core_calc(struct nv50_head *head, struct nv50_head_atom *asyh) 
	asyh->core.format = 0xcf;

	asyh->core.kind = 0;

	asyh->core.layout = 1;

	asyh->core.block = 0;

	asyh->core.blockh = 0;

	asyh->core.blocks = 0;

	asyh->core.pitch = ALIGN(asyh->core.w, 64) * 4;

}