diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 00:47:54 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 00:47:54 -0400 |
| commit | 6e5813e7ba51b41d483730fead002c94b77a4b8d (patch) | |
| tree | a947eaa00630b033c00d5ba51adb129f5476165b | |
| parent | ce01eb1b779228433bf1aefcc8554aad8f14e174 (diff) | |
| download | longterm-queue-4.8-6e5813e7ba51b41d483730fead002c94b77a4b8d.tar.gz | |
drm: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch b/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch index ce8422a..b9ef754 100644 --- a/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch +++ b/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch @@ -1,4 +1,4 @@ -From ab8df60e3a3b68420d0d4477c5f07c00fbfb078b Mon Sep 17 00:00:00 2001 +From 852c6985a3e504444dd6be7ef03306ef55ca0ef9 Mon Sep 17 00:00:00 2001 From: Boris Brezillon <boris.brezillon@free-electrons.com> Date: Fri, 2 Dec 2016 14:48:07 +0100 Subject: [PATCH] drm/vc4: Fix ->clock_select setting for the VEC encoder @@ -11,9 +11,10 @@ PV_CONTROL_CLK_SELECT field. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Eric Anholt <eric@anholt.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 82f914af4156..a0fd3e66bc4b 100644 +index 7c4873c1dabc..343b67a9d762 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -83,8 +83,7 @@ struct vc4_crtc_data { @@ -26,7 +27,7 @@ index 82f914af4156..a0fd3e66bc4b 100644 }; #define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset)) -@@ -867,20 +866,26 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { +@@ -833,20 +832,26 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { static const struct vc4_crtc_data pv0_data = { .hvs_channel = 0, @@ -59,7 +60,7 @@ index 82f914af4156..a0fd3e66bc4b 100644 }; static const struct of_device_id vc4_crtc_dt_match[] = { -@@ -894,17 +899,20 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm, +@@ -860,17 +865,20 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm, struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); @@ -88,7 +89,7 @@ index 82f914af4156..a0fd3e66bc4b 100644 } } diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index b3064e2e79c1..875a70fd5172 100644 +index e1afc0204991..80773f970927 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -194,6 +194,7 @@ to_vc4_plane(struct drm_plane *plane) @@ -100,13 +101,13 @@ index b3064e2e79c1..875a70fd5172 100644 VC4_ENCODER_TYPE_VEC, VC4_ENCODER_TYPE_DSI0, diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index 1aa44c2db556..39f6886b2410 100644 +index 160942a9180e..eade8d04de8d 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h -@@ -177,8 +177,9 @@ +@@ -175,8 +175,9 @@ + # define PV_CONTROL_CLR_AT_START BIT(14) + # define PV_CONTROL_TRIGGER_UNDERFLOW BIT(13) # define PV_CONTROL_WAIT_HSTART BIT(12) - # define PV_CONTROL_PIXEL_REP_MASK VC4_MASK(5, 4) - # define PV_CONTROL_PIXEL_REP_SHIFT 4 -# define PV_CONTROL_CLK_SELECT_DSI_VEC 0 +# define PV_CONTROL_CLK_SELECT_DSI 0 # define PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI 1 |