diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2018-02-03 13:13:05 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2018-02-03 13:13:05 -0800 |
| commit | 415ad8e3e50d76a4be6ab5b710d058b5afcaef8d (patch) | |
| tree | c26a8875436daf63bb1380fa899f836617e2e9a2 /drivers | |
| parent | 9a9978c22bd9676a634f7ca26d64d15fb0b438a3 (diff) | |
drm/openchrome: Reorganize VX855 IGA1 and IGA2 display FIFO parameters
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/openchrome/via_crtc.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c index d3ca7e41e143..9df78e12162d 100644 --- a/drivers/gpu/drm/openchrome/via_crtc.c +++ b/drivers/gpu/drm/openchrome/via_crtc.c @@ -789,9 +789,20 @@ static void via_iga1_display_fifo_regs(struct drm_device *dev, /* SR22[4:0] */ iga->display_queue_expire_num = VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM; break; - /* VX855 */ case PCI_DEVICE_ID_VIA_VX875: + /* SR17[7:0] */ + iga->fifo_max_depth = VX855_IGA1_FIFO_MAX_DEPTH; + + /* SR16[7], SR16[5:0] */ + iga->fifo_threshold = VX855_IGA1_FIFO_THRESHOLD; + + /* SR18[7], SR18[5:0] */ + iga->fifo_high_threshold = VX855_IGA1_FIFO_HIGH_THRESHOLD; + + /* SR22[4:0] */ + iga->display_queue_expire_num = VX855_IGA1_DISPLAY_QUEUE_EXPIRE_NUM; + break; /* VX900 */ case PCI_DEVICE_ID_VIA_VX900_VGA: iga->fifo_high_threshold = iga->fifo_threshold = 320; @@ -1085,15 +1096,20 @@ static void via_iga2_display_fifo_regs(struct drm_device *dev, /* CR94[6:0] */ iga->display_queue_expire_num = VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM; break; - /* VX855 */ case PCI_DEVICE_ID_VIA_VX875: - iga->fifo_high_threshold = iga->fifo_threshold = 160; - iga->display_queue_expire_num = 320; - iga->fifo_max_depth = 200; - iga->offset.count++; - break; + /* CR95[7], CR94[7], CR68[7:4] */ + iga->fifo_max_depth = VX855_IGA2_FIFO_MAX_DEPTH; + + /* CR95[6:4], CR68[3:0] */ + iga->fifo_threshold = VX855_IGA2_FIFO_THRESHOLD; + + /* CR95[2:0], CR92[3:0] */ + iga->fifo_high_threshold = VX855_IGA2_FIFO_HIGH_THRESHOLD; + /* CR94[6:0] */ + iga->display_queue_expire_num = VX855_IGA2_DISPLAY_QUEUE_EXPIRE_NUM; + break; /* VX900 */ case PCI_DEVICE_ID_VIA_VX900_VGA: iga->fifo_high_threshold = iga->fifo_threshold = 160; |