Attachment 142396 Details for Bug 108577 – series/52117 patches as migrated to Linux 4.19.1

[patch] series/52117 patches as migrated to Linux 4.19.1

SWCL.patch (text/plain), 4.21 KB, created by Duncan Roe on 2018-11-07 08:21:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Duncan Roe

Created: 2018-11-07 08:21:41 UTC

Size: 4.21 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
>index 4789270c29d9..9724a17e352b 100644
>--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
>+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
>@@ -1759,7 +1759,12 @@ static void set_static_screen_control(struct pipe_ctx **pipe_ctx,
> 	if (events->force_trigger)
> 		value |= 0x1;
> 
>-	value |= 0x84;
>+	if (num_pipes) {
>+		struct dc *dc = pipe_ctx[0]->stream->ctx->dc;
>+
>+		if (dc->fbc_compressor)
>+			value |= 0x84;
>+	}
> 
> 	for (i = 0; i < num_pipes; i++)
> 		pipe_ctx[i]->stream_res.tg->funcs->
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>index 9dbdda66c318..42f882c633ee 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>@@ -129,6 +129,7 @@ extern int amdgpu_compute_multipipe;
> extern int amdgpu_gpu_recovery;
> extern int amdgpu_emu_mode;
> extern uint amdgpu_smu_memory_pool_size;
>+extern uint amdgpu_dc_feature_mask;
> 
> #ifdef CONFIG_DRM_AMDGPU_SI
> extern int amdgpu_si_support;
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>index 943dbf3c5da1..8de55f7f1a3a 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>@@ -126,6 +126,9 @@ int amdgpu_compute_multipipe = -1;
> int amdgpu_gpu_recovery = -1; /* auto */
> int amdgpu_emu_mode = 0;
> uint amdgpu_smu_memory_pool_size = 0;
>+/* FBC (bit 0) disabled by default*/
>+uint amdgpu_dc_feature_mask = 0;
>+
> 
> /**
>  * DOC: vramlimit (int)
>@@ -531,6 +534,14 @@ module_param(halt_if_hws_hang, int, 0644);
> 		"0x1 = 256Mbyte, 0x2 = 512Mbyte, 0x4 = 1 Gbyte, 0x8 = 2GByte");
> module_param_named(smu_memory_pool_size, amdgpu_smu_memory_pool_size, uint, 0444);
> 
>+/**
>+ * DOC: dcfeaturemask (uint)
>+ * Override display features enabled. See enum DC_FEATURE_MASK in drivers/gpu/drm/amd/include/amd_shared.h.
>+ * The default is the current set of stable display features.
>+ */
>+MODULE_PARM_DESC(dcfeaturemask, "all stable DC features enabled (default))");
>+module_param_named(dcfeaturemask, amdgpu_dc_feature_mask, uint, 0444);
>+
> static const struct pci_device_id pciidlist[] = {
> #ifdef  CONFIG_DRM_AMDGPU_SI
> 	{0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
>diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
>index 2083c308007c..470d7b89071a 100644
>--- a/drivers/gpu/drm/amd/include/amd_shared.h
>+++ b/drivers/gpu/drm/amd/include/amd_shared.h
>@@ -131,6 +131,10 @@ enum PP_FEATURE_MASK {
> 	PP_STUTTER_MODE = 0x20000,
> };
> 
>+enum DC_FEATURE_MASK {
>+	DC_FBC_MASK = 0x1,
>+};
>+
> /**
>  * struct amd_ip_funcs - general hooks for managing amdgpu IP Blocks
>  */
>diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
>index 02db008fb78f..d16a20c84792 100644
>--- a/drivers/gpu/drm/amd/display/dc/dc.h
>+++ b/drivers/gpu/drm/amd/display/dc/dc.h
>@@ -170,6 +170,7 @@ struct link_training_settings;
> struct dc_config {
> 	bool gpu_vm_support;
> 	bool disable_disp_pll_sharing;
>+	bool fbc_support;
> };
> 
> enum visual_confirm {
>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>index 8c647ec1572f..b16de3754ab9 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -441,6 +441,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
> 	    adev->asic_type < CHIP_RAVEN)
> 		init_data.flags.gpu_vm_support = true;
> 
>+	if (amdgpu_dc_feature_mask & DC_FBC_MASK)
>+		init_data.flags.fbc_support = true;
>+
> 	/* Display Core create. */
> 	adev->dm.dc = dc_create(&init_data);
> 
>diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
>index 1a90e1a38055..e33d11785b1f 100644
>--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
>+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
>@@ -1305,7 +1305,8 @@ static bool construct(
> 		}
> 	}
> 
>-	dc->fbc_compressor = dce110_compressor_create(ctx);
>+	if (dc->config.fbc_support)
>+		dc->fbc_compressor = dce110_compressor_create(ctx);
> 
> 	if (!underlay_create(ctx, &pool->base))
> 		goto res_create_fail;

Actions: View | Splinter Review

Attachments on bug 108577: 142239 | 142250 | 142286 | 142292 | 142293 | 142334 | 142347 | 142348 | 142350 | 142351 | 142374 | 142382 | 142384 | 142396 | 143006

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.