Commit 71e72740 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2020-01-14' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



Final drm/i915 features for v5.6:
- DP MST fixes (José)
- Fix intel_bw_state memory leak (Pankaj Bharadiya)
- Switch context id allocation to xarray (Tvrtko)
- ICL/EHL/TGL workarounds (Matt Roper, Tvrtko)
- Debugfs for LMEM details (Lukasz Fiedorowicz)
- Prefer platform acronyms over codenames in symbols (Lucas)
- Tiled and port sync mode fixes for fbdev and DP (Manasi)
- DSI panel and backlight enable GPIO fixes (Hans de Goede)
- Relax audio min CDCLK requirements on non-GLK (Kai Vehmanen)
- Plane alignment and dimension check fixes (Imre)
- Fix state checks for PSR (José)
- Remove ICL+ clock gating programming (José)
- Static checker fixes around bool usage (Ma Feng)
- Bring back tests for self-contained headers in i915 (Masahiro Yamada)
- Fix DP MST disable sequence (Ville)
- Start converting i915 to the new drm device based logging macros (Wambui Karuga)
- Add DSI VBT I2C sequence execution (Vivek Kasireddy)
- Start using function pointers and ops structs in uc code (Michal)
- Fix PMU names to not use colons or dashes (Tvrtko)
- TGL media decompression support (DK, Imre)
- Split i915_gem_gtt.[ch] to more manageable chunks (Matthew Auld)
- Create dumb buffers in LMEM where available (Ram)
- Extend mmap support for LMEM (Abdiel)
- Selftest updates (Chris)
- Hack bump up CDCLK on TGL to avoid underruns (Stan)
- Use intel_encoder and intel_connector more instead of drm counterparts (Ville)
- Build error fixes (Zhang Xiaoxu)
- Fixes related to GPU and engine initialization/resume (Chris)
- Support for prefaulting discontiguous objects (Abdiel)
- Support discontiguous LMEM object maps (Chris)
- Various GEM and GT improvements and fixes (Chris)
- Merge pinctrl dependencies branch for the DSI GPIO updates (Jani)
- Backmerge drm-next for new logging macros (Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87sgkil0v9.fsf@intel.com
parents dd22dfa6 f2221a50

arch/arm/mach-u300/core.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static unsigned long pin_highz_conf[] = { 
};



/* Pin control settings */

static struct pinctrl_map __initdata u300_pinmux_map[] = {

static const struct pinctrl_map u300_pinmux_map[] = {

	/* anonymous maps for chip power and EMIFs */

	PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-u300", NULL, "power"),

	PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-u300", NULL, "emif0"),

drivers/gpu/drm/drm_client_modeset.c

+72 −0
Original line number Diff line number Diff line
@@ -114,6 +114,33 @@ drm_client_find_modeset(struct drm_client_dev *client, struct drm_crtc *crtc) 
	return NULL;

}



static struct drm_display_mode *

drm_connector_get_tiled_mode(struct drm_connector *connector)

{

	struct drm_display_mode *mode;



	list_for_each_entry(mode, &connector->modes, head) {

		if (mode->hdisplay == connector->tile_h_size &&

		    mode->vdisplay == connector->tile_v_size)

			return mode;

	}

	return NULL;

}



static struct drm_display_mode *

drm_connector_fallback_non_tiled_mode(struct drm_connector *connector)

{

	struct drm_display_mode *mode;



	list_for_each_entry(mode, &connector->modes, head) {

		if (mode->hdisplay == connector->tile_h_size &&

		    mode->vdisplay == connector->tile_v_size)

			continue;

		return mode;

	}

	return NULL;

}



static struct drm_display_mode *

drm_connector_has_preferred_mode(struct drm_connector *connector, int width, int height)

{
@@ -348,8 +375,15 @@ static bool drm_client_target_preferred(struct drm_connector **connectors, 
	struct drm_connector *connector;

	u64 conn_configured = 0;

	int tile_pass = 0;

	int num_tiled_conns = 0;

	int i;



	for (i = 0; i < connector_count; i++) {

		if (connectors[i]->has_tile &&

		    connectors[i]->status == connector_status_connected)

			num_tiled_conns++;

	}



retry:

	for (i = 0; i < connector_count; i++) {

		connector = connectors[i];
@@ -399,6 +433,28 @@ retry: 
			list_for_each_entry(modes[i], &connector->modes, head)

				break;

		}

		/*

		 * In case of tiled mode if all tiles not present fallback to

		 * first available non tiled mode.

		 * After all tiles are present, try to find the tiled mode

		 * for all and if tiled mode not present due to fbcon size

		 * limitations, use first non tiled mode only for

		 * tile 0,0 and set to no mode for all other tiles.

		 */

		if (connector->has_tile) {

			if (num_tiled_conns <

			    connector->num_h_tile * connector->num_v_tile ||

			    (connector->tile_h_loc == 0 &&

			     connector->tile_v_loc == 0 &&

			     !drm_connector_get_tiled_mode(connector))) {

				DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n",

					      connector->base.id);

				modes[i] = drm_connector_fallback_non_tiled_mode(connector);

			} else {

				modes[i] = drm_connector_get_tiled_mode(connector);

			}

		}



		DRM_DEBUG_KMS("found mode %s\n", modes[i] ? modes[i]->name :

			  "none");

		conn_configured |= BIT_ULL(i);
@@ -515,6 +571,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, 
	bool fallback = true, ret = true;

	int num_connectors_enabled = 0;

	int num_connectors_detected = 0;

	int num_tiled_conns = 0;

	struct drm_modeset_acquire_ctx ctx;



	if (!drm_drv_uses_atomic_modeset(dev))
@@ -532,6 +589,11 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, 
	memcpy(save_enabled, enabled, count);

	mask = GENMASK(count - 1, 0);

	conn_configured = 0;

	for (i = 0; i < count; i++) {

		if (connectors[i]->has_tile &&

		    connectors[i]->status == connector_status_connected)

			num_tiled_conns++;

	}

retry:

	conn_seq = conn_configured;

	for (i = 0; i < count; i++) {
@@ -631,6 +693,16 @@ retry: 
				      connector->name);

			modes[i] = &connector->state->crtc->mode;

		}

		/*

		 * In case of tiled modes, if all tiles are not present

		 * then fallback to a non tiled mode.

		 */

		if (connector->has_tile &&

		    num_tiled_conns < connector->num_h_tile * connector->num_v_tile) {

			DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n",

				      connector->base.id);

			modes[i] = drm_connector_fallback_non_tiled_mode(connector);

		}

		crtcs[i] = new_crtc;



		DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",

drivers/gpu/drm/drm_fb_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -1561,7 +1561,9 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
		for (j = 0; j < mode_set->num_connectors; j++) {

			struct drm_connector *connector = mode_set->connectors[j];



			if (connector->has_tile) {

			if (connector->has_tile &&

			    desired_mode->hdisplay == connector->tile_h_size &&

			    desired_mode->vdisplay == connector->tile_v_size) {

				lasth = (connector->tile_h_loc == (connector->num_h_tile - 1));

				lastv = (connector->tile_v_loc == (connector->num_v_tile - 1));

				/* cloning to multiple tiles is just crazy-talk, so: */

drivers/gpu/drm/i915/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*.hdrtest

drivers/gpu/drm/i915/Makefile

+30 −8
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) 
subdir-ccflags-y += \

	$(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)



# Extra header tests

header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h



subdir-ccflags-y += -I$(srctree)/$(src)



# Please keep these build lists sorted!
@@ -73,11 +70,12 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o display/intel_pipe_crc.o 
i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o



# "Graphics Technology" (aka we talk to the gpu)

obj-y += gt/

gt-y += \

	gt/debugfs_engines.o \

	gt/debugfs_gt.o \

	gt/debugfs_gt_pm.o \

	gt/gen6_ppgtt.o \

	gt/gen8_ppgtt.o \

	gt/intel_breadcrumbs.o \

	gt/intel_context.o \

	gt/intel_engine_cs.o \
@@ -85,14 +83,17 @@ gt-y += \ 
	gt/intel_engine_pm.o \

	gt/intel_engine_pool.o \

	gt/intel_engine_user.o \

	gt/intel_ggtt.o \

	gt/intel_gt.o \

	gt/intel_gt_irq.o \

	gt/intel_gt_pm.o \

	gt/intel_gt_pm_irq.o \

	gt/intel_gt_requests.o \

	gt/intel_gtt.o \

	gt/intel_llc.o \

	gt/intel_lrc.o \

	gt/intel_mocs.o \

	gt/intel_ppgtt.o \

	gt/intel_rc6.o \

	gt/intel_renderstate.o \

	gt/intel_reset.o \
@@ -111,7 +112,6 @@ gt-y += \ 
i915-y += $(gt-y)



# GEM (Graphics Execution Management) code

obj-y += gem/

gem-y += \

	gem/i915_gem_busy.o \

	gem/i915_gem_clflush.o \
@@ -157,7 +157,6 @@ i915-y += \ 
	  intel_wopcm.o



# general-purpose microcontroller (GuC) support

obj-y += gt/uc/

i915-y += gt/uc/intel_uc.o \

	  gt/uc/intel_uc_fw.o \

	  gt/uc/intel_guc.o \
@@ -170,7 +169,6 @@ i915-y += gt/uc/intel_uc.o \ 
	  gt/uc/intel_huc_fw.o



# modesetting core code

obj-y += display/

i915-y += \

	display/intel_atomic.o \

	display/intel_atomic_plane.o \
@@ -235,7 +233,6 @@ i915-y += \ 
	display/vlv_dsi_pll.o



# perf code

obj-y += oa/

i915-y += \

	oa/i915_oa_hsw.o \

	oa/i915_oa_bdw.o \
@@ -260,6 +257,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ 
	gem/selftests/igt_gem_utils.o \

	selftests/i915_random.o \

	selftests/i915_selftest.o \

	selftests/igt_atomic.o \

	selftests/igt_flush_test.o \

	selftests/igt_live_test.o \

	selftests/igt_mmap.o \
@@ -276,3 +274,27 @@ endif 


obj-$(CONFIG_DRM_I915) += i915.o

obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o



# header test



# exclude some broken headers from the test coverage

no-header-test := \

	display/intel_vbt_defs.h \

	gvt/execlist.h \

	gvt/fb_decoder.h \

	gvt/gtt.h \

	gvt/gvt.h \

	gvt/interrupt.h \

	gvt/mmio_context.h \

	gvt/mpt.h \

	gvt/scheduler.h



extra-$(CONFIG_DRM_I915_WERROR) += \

	$(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \

		$(shell cd $(srctree)/$(src) && find * -name '*.h')))



quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@)

      cmd_hdrtest = $(CC) $(c_flags) -S -o /dev/null -x c /dev/null -include $<; touch $@



$(obj)/%.hdrtest: $(src)/%.h FORCE

	$(call if_changed_dep,hdrtest)

CRA Git | Maintained and supported by SUSTech CRA and CCSE