diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 08:44:41 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 08:44:41 -0400 |
| commit | 7b16fd13ac23d0b82908216a3388714ee133d586 (patch) | |
| tree | 71d2105671e52cc7034fc4665a6ceee4b5eb6137 | |
| parent | 3e87ea6dd13128d6ac00c574525d16a402345174 (diff) | |
| download | longterm-queue-4.12-7b16fd13ac23d0b82908216a3388714ee133d586.tar.gz | |
drm: drop vc4 patch n/a for 4.12.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-vc4-Avoid-using-vrefresh-0-mode-in-DSI-htotal-ma.patch | 40 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/queue/drm-vc4-Avoid-using-vrefresh-0-mode-in-DSI-htotal-ma.patch b/queue/drm-vc4-Avoid-using-vrefresh-0-mode-in-DSI-htotal-ma.patch deleted file mode 100644 index da7a3d0..0000000 --- a/queue/drm-vc4-Avoid-using-vrefresh-0-mode-in-DSI-htotal-ma.patch +++ /dev/null @@ -1,40 +0,0 @@ -From af2eca53206c59ce9308a4f5f46c4a104a179b6b Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Tue, 15 Aug 2017 16:47:19 -0700 -Subject: [PATCH] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math. - -commit af2eca53206c59ce9308a4f5f46c4a104a179b6b upstream. - -The incoming mode might have a missing vrefresh field if it came from -drmModeSetCrtc(), which the kernel is supposed to calculate using -drm_mode_vrefresh(). We could either use that or the adjusted_mode's -original vrefresh value. - -However, we can maintain a more exact vrefresh value (not just the -integer approximation), by scaling by the ratio of our clocks. - -v2: Use math suggested by Andrzej Hajda instead. -v3: Simplify math now that adjusted_mode->clock isn't padded. -v4: Drop some parens. - -Signed-off-by: Eric Anholt <eric@anholt.net> -Link: https://patchwork.freedesktop.org/patch/msgid/20170815234722.20700-2-eric@anholt.net -Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> - -diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c -index d1e0dc908048..04796d7d0fdb 100644 ---- a/drivers/gpu/drm/vc4/vc4_dsi.c -+++ b/drivers/gpu/drm/vc4/vc4_dsi.c -@@ -866,7 +866,8 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, - adjusted_mode->clock = pixel_clock_hz / 1000 + 1; - - /* Given the new pixel clock, adjust HFP to keep vrefresh the same. */ -- adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal); -+ adjusted_mode->htotal = adjusted_mode->clock * mode->htotal / -+ mode->clock; - adjusted_mode->hsync_end += adjusted_mode->htotal - mode->htotal; - adjusted_mode->hsync_start += adjusted_mode->htotal - mode->htotal; - --- -2.15.0 - diff --git a/queue/series b/queue/series index 3c8a610..a14d5b1 100644 --- a/queue/series +++ b/queue/series @@ -39,7 +39,6 @@ clk-sunxi-ng-sun6i-Rename-HDMI-DDC-clock-to-avoid-na.patch tcp-fix-under-evaluated-ssthresh-in-TCP-Vegas.patch rtc-set-the-alarm-to-the-next-expiring-timer.patch cpuidle-fix-broadcast-control-when-broadcast-can-not.patch -drm-vc4-Avoid-using-vrefresh-0-mode-in-DSI-htotal-ma.patch IB-opa_vnic-Properly-clear-Mac-Table-Digest.patch IB-opa_vnic-Properly-return-the-total-MACs-in-UC-MAC.patch thermal-drivers-hisi-Fix-missing-interrupt-enablemen.patch |