diff options
| author | Dave Airlie | 2018-05-18 06:08:53 +0200 |
|---|---|---|
| committer | Dave Airlie | 2018-05-18 06:08:53 +0200 |
| commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
| tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /drivers/gpu/drm/vc4/vc4_plane.c | |
| parent | drm: rcar-du: Fix build failure (diff) | |
| parent | drm: set FMODE_UNSIGNED_OFFSET for drm files (diff) | |
| download | kernel-qcow2-linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.gz kernel-qcow2-linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.xz kernel-qcow2-linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.zip | |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_plane.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_plane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 3483c05cc3d6..71d44c357d35 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -505,7 +505,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, * the scl fields here. */ if (num_planes == 1) { - scl0 = vc4_get_scl_field(state, 1); + scl0 = vc4_get_scl_field(state, 0); scl1 = scl0; } else { scl0 = vc4_get_scl_field(state, 1); |