summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-06 23:08:40 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-06 23:08:40 -0500
commit689daf4e5b2e46f8fc246e552b1400ad7656fb77 (patch)
treeb96226f79c47f06c4f8d0e1910aa6aee509707c1
parent297f47e23a407d7d93a43edc0061a0a5c90bb547 (diff)
downloadlongterm-queue-4.8-689daf4e5b2e46f8fc246e552b1400ad7656fb77.tar.gz
drm: patch context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/drm-sti-fix-GDP-size-to-support-up-to-UHD-resolution.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/drm-sti-fix-GDP-size-to-support-up-to-UHD-resolution.patch b/queue/drm-sti-fix-GDP-size-to-support-up-to-UHD-resolution.patch
index 4edd42c..a55b409 100644
--- a/queue/drm-sti-fix-GDP-size-to-support-up-to-UHD-resolution.patch
+++ b/queue/drm-sti-fix-GDP-size-to-support-up-to-UHD-resolution.patch
@@ -1,4 +1,4 @@
-From 2f410f88c0a1c7e19762918d2614f506a7b63a82 Mon Sep 17 00:00:00 2001
+From 9e58b89635f7123e2031bb41c0f464715c918597 Mon Sep 17 00:00:00 2001
From: Vincent Abriou <vincent.abriou@st.com>
Date: Thu, 23 Mar 2017 15:44:52 +0100
Subject: [PATCH] drm/sti: fix GDP size to support up to UHD resolution
@@ -14,7 +14,7 @@ Tested-by: Lee Jones <lee.jones@linaro.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1490280292-30466-1-git-send-email-vincent.abriou@st.com
diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
-index 86279f5022c2..88f16cdf6a4b 100644
+index b8d942ca45e8..2138f984bdba 100644
--- a/drivers/gpu/drm/sti/sti_gdp.c
+++ b/drivers/gpu/drm/sti/sti_gdp.c
@@ -66,7 +66,9 @@ static struct gdp_format_to_str {
@@ -28,7 +28,7 @@ index 86279f5022c2..88f16cdf6a4b 100644
#define GDP_NODE_NB_BANK 2
#define GDP_NODE_PER_FIELD 2
-@@ -632,8 +634,8 @@ static int sti_gdp_atomic_check(struct drm_plane *drm_plane,
+@@ -633,8 +635,8 @@ static int sti_gdp_atomic_check(struct drm_plane *drm_plane,
/* src_x are in 16.16 format */
src_x = state->src_x >> 16;
src_y = state->src_y >> 16;
@@ -37,9 +37,9 @@ index 86279f5022c2..88f16cdf6a4b 100644
+ src_w = clamp_val(state->src_w >> 16, 0, GAM_GDP_SIZE_MAX_WIDTH);
+ src_h = clamp_val(state->src_h >> 16, 0, GAM_GDP_SIZE_MAX_HEIGHT);
- format = sti_gdp_fourcc2format(fb->format->format);
+ format = sti_gdp_fourcc2format(fb->pixel_format);
if (format == -1) {
-@@ -741,8 +743,8 @@ static void sti_gdp_atomic_update(struct drm_plane *drm_plane,
+@@ -733,8 +735,8 @@ static void sti_gdp_atomic_update(struct drm_plane *drm_plane,
/* src_x are in 16.16 format */
src_x = state->src_x >> 16;
src_y = state->src_y >> 16;