Commit 40b99050 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-intel-next-fixes-2020-10-15' of...

Merge tag 'drm-intel-next-fixes-2020-10-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

- Set all unused color plane offsets to ~0xfff again (Ville)
- Fix TGL DKL PHY DP vswing handling (Ville)
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201015181453.GA2905280@intel.com
parents c46a40ff 214bba50
...@@ -2742,7 +2742,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock, ...@@ -2742,7 +2742,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
u32 n_entries, val, ln, dpcnt_mask, dpcnt_val; u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;
int rate = 0; int rate = 0;
if (type == INTEL_OUTPUT_HDMI) { if (type != INTEL_OUTPUT_HDMI) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
rate = intel_dp->link_rate; rate = intel_dp->link_rate;
......
...@@ -4093,8 +4093,7 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state) ...@@ -4093,8 +4093,7 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)
int skl_check_plane_surface(struct intel_plane_state *plane_state) int skl_check_plane_surface(struct intel_plane_state *plane_state)
{ {
const struct drm_framebuffer *fb = plane_state->hw.fb; const struct drm_framebuffer *fb = plane_state->hw.fb;
int ret; int ret, i;
bool needs_aux = false;
ret = intel_plane_compute_gtt(plane_state); ret = intel_plane_compute_gtt(plane_state);
if (ret) if (ret)
...@@ -4108,7 +4107,6 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state) ...@@ -4108,7 +4107,6 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)
* it. * it.
*/ */
if (is_ccs_modifier(fb->modifier)) { if (is_ccs_modifier(fb->modifier)) {
needs_aux = true;
ret = skl_check_ccs_aux_surface(plane_state); ret = skl_check_ccs_aux_surface(plane_state);
if (ret) if (ret)
return ret; return ret;
...@@ -4116,21 +4114,16 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state) ...@@ -4116,21 +4114,16 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)
if (intel_format_info_is_yuv_semiplanar(fb->format, if (intel_format_info_is_yuv_semiplanar(fb->format,
fb->modifier)) { fb->modifier)) {
needs_aux = true;
ret = skl_check_nv12_aux_surface(plane_state); ret = skl_check_nv12_aux_surface(plane_state);
if (ret) if (ret)
return ret; return ret;
} }
if (!needs_aux) { for (i = fb->format->num_planes; i < ARRAY_SIZE(plane_state->color_plane); i++) {
int i;
for (i = 1; i < fb->format->num_planes; i++) {
plane_state->color_plane[i].offset = ~0xfff; plane_state->color_plane[i].offset = ~0xfff;
plane_state->color_plane[i].x = 0; plane_state->color_plane[i].x = 0;
plane_state->color_plane[i].y = 0; plane_state->color_plane[i].y = 0;
} }
}
ret = skl_check_main_surface(plane_state); ret = skl_check_main_surface(plane_state);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment