summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@gmx.com>2018-02-03 13:11:44 -0800
committerKevin Brace <kevinbrace@gmx.com>2018-02-03 13:11:44 -0800
commit9a9978c22bd9676a634f7ca26d64d15fb0b438a3 (patch)
tree6807c99d855a4e537218d153a95387318bb30b20 /drivers/gpu/drm
parent29ce88cb58c8017c5afda844fb914d9ae1672eb6 (diff)
drm/openchrome: Reorganize VX800 IGA1 and IGA2 display FIFO parameters
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/openchrome/via_crtc.c32
1 files changed, 22 insertions, 10 deletions
diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c
index 3e9d444acb4a..d3ca7e41e143 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -775,12 +775,19 @@ static void via_iga1_display_fifo_regs(struct drm_device *dev,
/* SR22[4:0] */
iga->display_queue_expire_num = P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
-
/* VX800 */
case PCI_DEVICE_ID_VIA_VT1122:
- iga->fifo_high_threshold = iga->fifo_threshold = 152;
- iga->display_queue_expire_num = 64;
- iga->fifo_max_depth = 192;
+ /* SR17[7:0] */
+ iga->fifo_max_depth = VX800_IGA1_FIFO_MAX_DEPTH;
+
+ /* SR16[7], SR16[5:0] */
+ iga->fifo_threshold = VX800_IGA1_FIFO_THRESHOLD;
+
+ /* SR18[7], SR18[5:0] */
+ iga->fifo_high_threshold = VX800_IGA1_FIFO_HIGH_THRESHOLD;
+
+ /* SR22[4:0] */
+ iga->display_queue_expire_num = VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX855 */
@@ -1064,14 +1071,19 @@ static void via_iga2_display_fifo_regs(struct drm_device *dev,
/* CR94[6:0] */
iga->display_queue_expire_num = P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
-
/* VX800 */
case PCI_DEVICE_ID_VIA_VT1122:
- iga->display_queue_expire_num = 128;
- iga->fifo_high_threshold = 32;
- iga->fifo_threshold = 64;
- iga->fifo_max_depth = 96;
- iga->offset.count++;
+ /* CR95[7], CR94[7], CR68[7:4] */
+ iga->fifo_max_depth = VX800_IGA2_FIFO_MAX_DEPTH;
+
+ /* CR95[6:4], CR68[3:0] */
+ iga->fifo_threshold = VX800_IGA2_FIFO_THRESHOLD;
+
+ /* CR95[2:0], CR92[3:0] */
+ iga->fifo_high_threshold = VX800_IGA2_FIFO_HIGH_THRESHOLD;
+
+ /* CR94[6:0] */
+ iga->display_queue_expire_num = VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX855 */