Commit 7ed34927 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-intel-next-2023-03-23' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



Core Changes:
- drm: Add SDP Error Detection Configuration Register (Arun)

Driver Changes:
- Meteor Lake enabling and fixes (RK, Jose, Madhumitha)
- Lock the fbdev obj before vma pin (Tejas)
- DSC fixes (Stanislav)
- Fixes and clean-up on opregion code (Imre)
- More wm/vblank stuff (Ville)
- More general display code organization (Jani)
- DP Fixes (Stanislav, Ville)
- Introduce flags to ignore long HPD and link training issues \
  for handling spurious issues on CI (Vinod)
- Plane cleanups and extra registers (Ville)
- Update audio keepalive clock values (Clint)
- Rename find_section to bdb_find_section (Maarten)
- DP SDP CRC16 for 128b132b link layer (Arun)
- Fix various issues with noarm register writes (Ville)
- Fix a few TypeC / MST issues (Imre)
- Create GSC submission targeting HDCP and PXP usages on MTL+ (Suraj)
- Enable HDCP2.x via GSC CS (Suraj)

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZBy56qc9C00tCLOY@intel.com
parents 9578a10d 88363177

drivers/gpu/drm/i915/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ i915-y += \ 
i915-y += \

	  gt/uc/intel_gsc_fw.o \

	  gt/uc/intel_gsc_uc.o \

	  gt/uc/intel_gsc_uc_heci_cmd_submit.o\

	  gt/uc/intel_guc.o \

	  gt/uc/intel_guc_ads.o \

	  gt/uc/intel_guc_capture.o \
@@ -255,6 +256,7 @@ i915-y += \ 
	display/intel_frontbuffer.o \

	display/intel_global_state.o \

	display/intel_hdcp.o \

	display/intel_hdcp_gsc.o \

	display/intel_hotplug.o \

	display/intel_hti.o \

	display/intel_lpe_audio.o \
@@ -267,6 +269,7 @@ i915-y += \ 
	display/intel_psr.o \

	display/intel_quirks.o \

	display/intel_sprite.o \

	display/intel_sprite_uapi.o \

	display/intel_tc.o \

	display/intel_vblank.o \

	display/intel_vga.o \

drivers/gpu/drm/i915/display/hsw_ips.c

+37 −0
Original line number Diff line number Diff line
@@ -267,3 +267,40 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state) 
		crtc_state->ips_enabled = true;

	}

}



static int hsw_ips_debugfs_status_show(struct seq_file *m, void *unused)

{

	struct drm_i915_private *i915 = m->private;

	intel_wakeref_t wakeref;



	if (!HAS_IPS(i915))

		return -ENODEV;



	wakeref = intel_runtime_pm_get(&i915->runtime_pm);



	seq_printf(m, "Enabled by kernel parameter: %s\n",

		   str_yes_no(i915->params.enable_ips));



	if (DISPLAY_VER(i915) >= 8) {

		seq_puts(m, "Currently: unknown\n");

	} else {

		if (intel_de_read(i915, IPS_CTL) & IPS_ENABLE)

			seq_puts(m, "Currently: enabled\n");

		else

			seq_puts(m, "Currently: disabled\n");

	}



	intel_runtime_pm_put(&i915->runtime_pm, wakeref);



	return 0;

}



DEFINE_SHOW_ATTRIBUTE(hsw_ips_debugfs_status);



void hsw_ips_debugfs_register(struct drm_i915_private *i915)

{

	struct drm_minor *minor = i915->drm.primary;



	debugfs_create_file("i915_ips_status", 0444, minor->debugfs_root,

			    i915, &hsw_ips_debugfs_status_fops);

}

drivers/gpu/drm/i915/display/hsw_ips.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/types.h>



struct drm_i915_private;

struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;
@@ -22,5 +23,6 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state); 
int hsw_ips_compute_config(struct intel_atomic_state *state,

			   struct intel_crtc *crtc);

void hsw_ips_get_config(struct intel_crtc_state *crtc_state);

void hsw_ips_debugfs_register(struct drm_i915_private *i915);



#endif /* __HSW_IPS_H__ */

drivers/gpu/drm/i915/display/icl_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, 


	gen11_dsi_get_timings(encoder, pipe_config);

	pipe_config->output_types |= BIT(INTEL_OUTPUT_DSI);

	pipe_config->pipe_bpp = bdw_get_pipemisc_bpp(crtc);

	pipe_config->pipe_bpp = bdw_get_pipe_misc_bpp(crtc);



	/* Get the details on which TE should be enabled */

	if (is_cmd_mode(intel_dsi))

drivers/gpu/drm/i915/display/intel_atomic_plane.c

+59 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */



#include <drm/drm_atomic_helper.h>

#include <drm/drm_blend.h>

#include <drm/drm_fourcc.h>



#include "i915_config.h"
@@ -42,7 +43,6 @@ 
#include "intel_display_types.h"

#include "intel_fb.h"

#include "intel_fb_pin.h"

#include "intel_sprite.h"

#include "skl_scaler.h"

#include "skl_watermark.h"
@@ -940,6 +940,64 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state, 
	return 0;

}



int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)

{

	struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	struct drm_rect *src = &plane_state->uapi.src;

	u32 src_x, src_y, src_w, src_h, hsub, vsub;

	bool rotated = drm_rotation_90_or_270(plane_state->hw.rotation);



	/*

	 * FIXME hsub/vsub vs. block size is a mess. Pre-tgl CCS

	 * abuses hsub/vsub so we can't use them here. But as they

	 * are limited to 32bpp RGB formats we don't actually need

	 * to check anything.

	 */

	if (fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||

	    fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS)

		return 0;



	/*

	 * Hardware doesn't handle subpixel coordinates.

	 * Adjust to (macro)pixel boundary, but be careful not to

	 * increase the source viewport size, because that could

	 * push the downscaling factor out of bounds.

	 */

	src_x = src->x1 >> 16;

	src_w = drm_rect_width(src) >> 16;

	src_y = src->y1 >> 16;

	src_h = drm_rect_height(src) >> 16;



	drm_rect_init(src, src_x << 16, src_y << 16,

		      src_w << 16, src_h << 16);



	if (fb->format->format == DRM_FORMAT_RGB565 && rotated) {

		hsub = 2;

		vsub = 2;

	} else {

		hsub = fb->format->hsub;

		vsub = fb->format->vsub;

	}



	if (rotated)

		hsub = vsub = max(hsub, vsub);



	if (src_x % hsub || src_w % hsub) {

		drm_dbg_kms(&i915->drm, "src x/w (%u, %u) must be a multiple of %u (rotated: %s)\n",

			    src_x, src_w, hsub, str_yes_no(rotated));

		return -EINVAL;

	}



	if (src_y % vsub || src_h % vsub) {

		drm_dbg_kms(&i915->drm, "src y/h (%u, %u) must be a multiple of %u (rotated: %s)\n",

			    src_y, src_h, vsub, str_yes_no(rotated));

		return -EINVAL;

	}



	return 0;

}



/**

 * intel_prepare_plane_fb - Prepare fb for usage on plane

 * @_plane: drm plane to prepare for