Skip to contentSkip to conversation

dal patches for nov 23, 2016

PATCH New Harry Wentland 1 participant 40 messages Nov 24, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover dal patches for nov 23, 2016

* couple of warning cleanups
* some memory leak issues
* transform cleanup
* some minor fixes

Alex Deucher (11):
drm/amd/dal: remove unused function
drm/amd/dal: fix warnings in dce_stream_encoder.c drm/amd/dal: fix warning in dce_link_encoder.c drm/amd/dal: fix bug in dal_display_clock_get_min_clocks_state drm/amd/dal: fix warning in dal_display_clock_dce112_construct drm/amd/dal: fix warning in dce110_hw_sequencer.c drm/amd/dal: fix warning in dce110_resource.c drm/amd/dal: fix include order in dce80_resource.c drm/amd/dal: handle NULL mem_input in dc_init_dchub drm/amd/dal: fix warning in dc_link_dp_set_test_pattern drm/amd/dal: fix warning in calculate_bandwidth

Dmytro Laktyushkin (14):
drm/amd/dal: fix v_update locking
drm/amd/dal: fix flip optimization
drm/amd/dal: transform cleanup
drm/amd/dal: separate out scaler filters drm/amd/dal: transform cleanup powerup drm/amd/dal: transform cleanup file structure drm/amd/dal: dce110 scaler to new style drm/amd/dal: drop dce80 transform code drm/amd/dal: Use macro to define transform reg sh and mask drm/amd/dal: drop scaler bypass function drm/amd/dal: clean transform.h
drm/amd/dal: remove scaler filter calculator from dc drm/amd/dal: move out transform code to dce_transform drm/amd/dal: remove adapter service interface/types

Jordan Lazare (1):
drm/amd/dal: Add missing return to bios helper

Leon Elazar (1):
drm/amd/dal: Memory leak fixes

Logatharshan Thothiralingam (1):
drm/amd/dal: Use Polaris headers for i2c engine

Reza Amini (2):
drm/amd/dal: correcting the wait for DP_MSE_RATE_UPDATE_PENDING reset drm/amd/dal: Configure audio before audio enable (Jack presence Hot
Plug)

Tony Cheng (8):
drm/amd/dal: Freesync to track only streams drm/amd/dal: fix misc0 bug lead to DP not lighting up drm/amd/dal: improve compiler catching bug in REG_SET drm/amd/dal: visual confirm change blank color to none-black drm/amd/dal: fix memory leak pointed out by Juha Leppänen
<[email protected]>
drm/amd/dal: fix infinite loop
drm/amd/dal: consolidate mem_input
drm/amd/dal: fix wrong pll selection for hdmi

Yongqiang Sun (1):
drm/amd/dal: Only set backlight level for eDP panel.

 .../gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c    |   39 +-
 drivers/gpu/drm/amd/dal/dc/basics/conversion.h     |    2 +
 drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c      |    7 -
 .../gpu/drm/amd/dal/dc/bios/command_table_helper.c |    1 -
 .../dc/bios/dce110/command_table_helper_dce110.c   |    1 -
 .../dc/bios/dce112/command_table_helper_dce112.c   |    1 -
 .../dal/dc/bios/dce80/command_table_helper_dce80.c |    1 -
 drivers/gpu/drm/amd/dal/dc/calcs/Makefile          |    2 +-
 drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c |    2 -
 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.c   | 2012 --------------------
 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.h   |   75 -
 drivers/gpu/drm/amd/dal/dc/core/dc.c               |   56 +-
 drivers/gpu/drm/amd/dal/dc/core/dc_hw_sequencer.c  |   14 +-
 drivers/gpu/drm/amd/dal/dc/core/dc_link.c          |    3 +-
 drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c      |    1 -
 drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c       |    3 +-
 drivers/gpu/drm/amd/dal/dc/core/dc_resource.c      |   15 +-
 drivers/gpu/drm/amd/dal/dc/dc_helper.c             |   16 +-
 drivers/gpu/drm/amd/dal/dc/dc_hw_types.h           |    2 +
 drivers/gpu/drm/amd/dal/dc/dce/Makefile            |    2 +-
 drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.c         |   10 +-
 drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c  |    2 -
 drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.c     |  191 ++
 drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.h     |   91 +-
 drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c   |  501 +++++
 .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c    |   16 +-
 drivers/gpu/drm/amd/dal/dc/dce/dce_transform.c     | 1004 ++++++++++
 drivers/gpu/drm/amd/dal/dc/dce/dce_transform.h     |  311 +++
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |  105 +-
 drivers/gpu/drm/amd/dal/dc/dce110/Makefile         |   10 +-
 .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c    |   76 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c   |  205 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c    |   90 +-
 .../amd/dal/dc/dce110/dce110_timing_generator.c    |    1 -
 .../amd/dal/dc/dce110/dce110_timing_generator_v.c  |    1 -
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   |  127 --
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   |   96 -
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.c |  903 ---------
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.h |   40 -
 .../drm/amd/dal/dc/dce110/dce110_transform_gamut.c |  269 ---
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   |  765 --------
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c |  418 ++--
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h |   13 +-
 .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c  |    1 -
 .../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c   |  384 +---
 .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c    |   96 +-
 drivers/gpu/drm/amd/dal/dc/dce80/Makefile          |    5 +-
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c |  126 +-
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |  121 +-
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c |  117 --
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h |   85 -
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.c   |  742 --------
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.h   |   39 -
 .../drm/amd/dal/dc/dce80/dce80_transform_gamut.c   |  269 ---
 .../gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c |  714 -------
 drivers/gpu/drm/amd/dal/dc/dm_services.h           |   11 +-
 .../amd/dal/dc/gpu/dce110/display_clock_dce110.c   |    1 -
 .../amd/dal/dc/gpu/dce112/display_clock_dce112.c   |    2 -
 .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c |    1 -
 drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c     |    2 +-
 .../dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c    |   10 +-
 drivers/gpu/drm/amd/dal/dc/inc/core_types.h        |    4 -
 drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h      |    1 +
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h      |  177 +-
 drivers/gpu/drm/amd/dal/dc/inc/hw_sequencer.h      |    3 +-
 drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h        |    2 +-
 drivers/gpu/drm/amd/dal/dc/inc/resource.h          |    7 +-
 .../amd/dal/include/adapter_service_interface.h    |  320 ----
 .../drm/amd/dal/include/adapter_service_types.h    |   62 -
 .../gpu/drm/amd/dal/include/bios_parser_types.h    |   12 +-
 .../drm/amd/dal/include/display_clock_interface.h  |    1 -
 .../drm/amd/dal/include/irq_service_interface.h    |    2 -
 drivers/gpu/drm/amd/dal/include/scaler_types.h     |   61 -
 .../gpu/drm/amd/dal/modules/freesync/freesync.c    |  201 +-
 drivers/gpu/drm/amd/dal/modules/inc/mod_freesync.h |   55 +-
 75 files changed, 2744 insertions(+), 8390 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.h
 create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c
 create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_transform.c
 create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_transform.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_gamut.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_gamut.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c
 delete mode 100644 drivers/gpu/drm/amd/dal/include/adapter_service_interface.h
 delete mode 100644 drivers/gpu/drm/amd/dal/include/adapter_service_types.h
 delete mode 100644 drivers/gpu/drm/amd/dal/include/scaler_types.h
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20161124020308.28124-1-harry.wentland-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 1/39 drm/amd/dal: Use Polaris headers for i2c engine

From: Logatharshan Thothiralingam <[email protected]>

CZ headers limited the size of the i2c message which lead to problem with large i2c msgs on Polaris.

NOTE: this is temporary, this needs to be reworked.

Change-Id I0a904c76d2a670b3d92a09b824b1b03a7e3916ce
---
 .../gpu/drm/amd/dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c +8 -2
index 2b606a542cb8..cfcd5db825f6 100644
@@ -43,8 +43,14 @@
 /*
  * Post-requisites: headers required by this unit
  */
-#include "dce/dce_11_0_d.h"
-#include "dce/dce_11_0_sh_mask.h"
+
+/*
+ * Temporarily adding ellesmere specific headers
+ * to get the right defined values
+ */
+#include "dce/dce_11_2_d.h"
+#include "dce/dce_11_2_sh_mask.h"
+
 #include "reg_helper.h"
 
 /*
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw

PATCH 2/39 drm/amd/dal: Add missing return to bios helper

In reply to a message not in the archive

From: Jordan Lazare <[email protected]>

Change-Id Icf15a6bd98c2afd4121670e3c2bb08559cf0348a
---
 drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +1 -1
index 7fdce9b62f1d..67ecbca99c79 100644
@@ -3665,7 +3665,7 @@ static void bios_parser_post_init(struct dc_bios *dcb)
 static bool bios_parser_is_accelerated_mode(
 	struct dc_bios *dcb)
 {
-	bios_is_accelerated_mode(dcb);
+	return bios_is_accelerated_mode(dcb);
 }
 
 /**
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#4 lore raw

PATCH 3/39 drm/amd/dal: correcting the wait for DP_MSE_RATE_UPDATE_PENDING reset

In reply to a message not in the archive

From: Reza Amini <[email protected]>

Change-Id Ib90fffe34383065de7c2c74d05c3eb7c451c43e2
---
 drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c +1 -1
index 93ce4967e56b..177393df22ec 100644
@@ -456,7 +456,7 @@ static void dce110_stream_encoder_set_mst_bandwidth(
 	/* i.e. DP_MSE_RATE_UPDATE_PENDING field (read only) */
 	/* is reset to 0 (not pending) */
 	REG_WAIT(DP_MSE_RATE_UPDATE, DP_MSE_RATE_UPDATE_PENDING,
-			1,
+			0,
 			10, DP_MST_UPDATE_MAX_RETRY);
 }
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#5 lore raw

PATCH 4/39 drm/amd/dal: Freesync to track only streams

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

Background information:
We can get into a situation where add_stream is called but the sink object no long exists. To fix this remove the requirement for a sink object, initialize the capabilities for the sink during add_stream and store this in mod_freesync.

Change-Id I1a9aa8ed5d2fe9100bba99acf104c56dc9a665fc
---
 .../gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c    |  39 ++--
 .../gpu/drm/amd/dal/modules/freesync/freesync.c    | 201 ++++++---------------
 drivers/gpu/drm/amd/dal/modules/inc/mod_freesync.h |  55 +++---
 3 files changed, 116 insertions(+), 179 deletions(-)
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c +28 -11
index f90ad9b13ed9..fba2bd74f669 100644
@@ -2574,6 +2574,7 @@ int amdgpu_dm_atomic_commit(
 			acrtc->enabled = true;
 			acrtc->hw_mode = crtc->state->mode;
 			crtc->hwmode = crtc->state->mode;
+
 			break;
 		}
 
@@ -2612,17 +2613,32 @@ int amdgpu_dm_atomic_commit(
 			++commit_targets_count;
 		}
 	}
+
 	/*
 	 * Add streams after required streams from new and replaced targets
 	 * are removed from freesync module
 	 */
 	if (adev->dm.freesync_module) {
 		for (i = 0; i < new_crtcs_count; i++) {
+			struct amdgpu_connector *aconnector = NULL;
 			new_target = new_crtcs[i]->target;
+			aconnector =
+				amdgpu_dm_find_first_crct_matching_connector(
+					state,
+					&new_crtcs[i]->base,
+					false);
+			if (!aconnector) {
+				DRM_INFO(
+						"Atomic commit: Failed to find connector for acrtc id:%d "
+						"skipping freesync init\n",
+						new_crtcs[i]->crtc_id);
+				continue;
+			}
+
 			for (j = 0; j < new_target->stream_count; j++)
 				mod_freesync_add_stream(
 						adev->dm.freesync_module,
-						new_target->streams[j]);
+						new_target->streams[j], &aconnector->caps);
 		}
 	}
 
@@ -2829,14 +2845,17 @@ void dm_restore_drm_connector_state(struct drm_device *dev, struct drm_connector
 		}
 
 		if (adev->dm.freesync_module) {
+
 			for (i = 0; i < current_target->stream_count; i++)
 				mod_freesync_remove_stream(
 						adev->dm.freesync_module,
 						current_target->streams[i]);
+
 			for (i = 0; i < new_target->stream_count; i++)
 				mod_freesync_add_stream(
 						adev->dm.freesync_module,
-						new_target->streams[i]);
+						new_target->streams[i],
+						&aconnector->caps);
 		}
 		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 			struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
@@ -3193,7 +3212,6 @@ void amdgpu_dm_add_sink_to_freesync_module(
 	struct detailed_timing *timing;
 	struct detailed_non_pixel *data;
 	struct detailed_data_monitor_range *range;
-	struct mod_freesync_caps caps = {0};
 	struct amdgpu_connector *amdgpu_connector =
 			to_amdgpu_connector(connector);
 
@@ -3245,18 +3263,17 @@ void amdgpu_dm_add_sink_to_freesync_module(
 				range->pixel_clock_mhz * 10;
 			break;
 		}
+
 		if (amdgpu_connector->max_vfreq -
 				amdgpu_connector->min_vfreq > 10) {
-			caps.supported = true;
-			caps.min_refresh_in_micro_hz =
+			amdgpu_connector->caps.supported = true;
+			amdgpu_connector->caps.min_refresh_in_micro_hz =
 					amdgpu_connector->min_vfreq * 1000000;
-			caps.max_refresh_in_micro_hz =
+			amdgpu_connector->caps.max_refresh_in_micro_hz =
 					amdgpu_connector->max_vfreq * 1000000;
-			val_capable = 1;
+				val_capable = 1;
 		}
 	}
-	mod_freesync_add_sink(adev->dm.freesync_module,
-			amdgpu_connector->dc_sink, &caps);
 	drm_object_property_set_value(&connector->base,
 				      adev->mode_info.freesync_capable_property,
 				      val_capable);
@@ -3282,8 +3299,8 @@ void amdgpu_dm_remove_sink_from_freesync_module(
 	amdgpu_connector->max_vfreq = 0;
 	amdgpu_connector->pixel_clock_mhz = 0;
 
-	mod_freesync_remove_sink(adev->dm.freesync_module,
-			amdgpu_connector->dc_sink);
+	memset(&amdgpu_connector->caps, 0, sizeof(amdgpu_connector->caps));
+
 	drm_object_property_set_value(&connector->base,
 				      adev->mode_info.freesync_capable_property,
 				      0);
drivers/gpu/drm/amd/dal/modules/freesync/freesync.c +54 -147

432 lines not on this page · raw message

drivers/gpu/drm/amd/dal/modules/inc/mod_freesync.h +34 -21

89 lines not on this page · raw message

Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#6 lore raw

PATCH 5/39 drm/amd/dal: fix v_update locking

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id Iddc3c58302918b01905ad58ae2183c51d230de78
---
 drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.c +5 -5
index 014043c13d7a..dd1cf5e6e949 100644
@@ -74,11 +74,11 @@ void dce_pipe_control_lock(struct dce_hwseq *hws,
 		update_lock_mode = lock_val;
 
 	REG_SET_5(BLND_V_UPDATE_LOCK[blnd_inst], val,
-			BLND_DCP_GRPH_V_UPDATE_LOCK, &dcp_grph,
-			BLND_SCL_V_UPDATE_LOCK, &scl,
-			BLND_DCP_GRPH_SURF_V_UPDATE_LOCK, &dcp_grph_surf,
-			BLND_BLND_V_UPDATE_LOCK, &blnd,
-			BLND_V_UPDATE_LOCK_MODE, &update_lock_mode);
+			BLND_DCP_GRPH_V_UPDATE_LOCK, dcp_grph,
+			BLND_SCL_V_UPDATE_LOCK, scl,
+			BLND_DCP_GRPH_SURF_V_UPDATE_LOCK, dcp_grph_surf,
+			BLND_BLND_V_UPDATE_LOCK, blnd,
+			BLND_V_UPDATE_LOCK_MODE, update_lock_mode);
 
 	if (hws->wa.blnd_crtc_trigger)
 		if (!lock && (control_mask & PIPE_LOCK_CONTROL_BLENDER)) {
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#7 lore raw

PATCH 6/39 drm/amd/dal: fix flip optimization

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I5e9db1a93d9330809bf2474ba4fc75026ecda545
---
 drivers/gpu/drm/amd/dal/dc/core/dc.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +16 -16
index 7636fc6d7052..6e32f1bd935c 100644
@@ -1324,12 +1324,10 @@ void dc_update_surfaces_for_target(struct dc *dc, struct dc_surface_update *upda
 	struct validate_context *context = core_dc->temp_flip_context;
 	int i, j;
 	bool is_new_pipe_surface[MAX_SURFACES];
+	const struct dc_surface *new_surfaces[MAX_SURFACES] = { 0 };
 
 	update_surface_trace(dc, updates, surface_count);
 
-	for (j = 0; j < MAX_SURFACES; j++)
-		is_new_pipe_surface[j] = true;
-
 	*context = *core_dc->current_context;
 
 	for (i = 0; i < context->res_ctx.pool->pipe_count; i++) {
@@ -1344,8 +1342,22 @@ void dc_update_surfaces_for_target(struct dc *dc, struct dc_surface_update *upda
 				&context->res_ctx.pipe_ctx[cur_pipe->bottom_pipe->pipe_idx];
 	}
 
+	for (j = 0; j < MAX_SURFACES; j++)
+		is_new_pipe_surface[j] = true;
+
+	for (i = 0 ; i < surface_count; i++) {
+		struct core_surface *surface = DC_SURFACE_TO_CORE(updates[i].surface);
+
+		new_surfaces[i] = updates[i].surface;
+		for (j = 0; j < context->res_ctx.pool->pipe_count; j++) {
+			struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
+
+			if (surface == pipe_ctx->surface)
+				is_new_pipe_surface[i] = false;
+		}
+	}
+
 	if (dc_target) {
-		const struct dc_surface *new_surfaces[MAX_SURFACES] = { 0 };
 		struct core_target *target = DC_TARGET_TO_CORE(dc_target);
 
 		if (core_dc->current_context->target_count == 0)
@@ -1358,18 +1370,6 @@ void dc_update_surfaces_for_target(struct dc *dc, struct dc_surface_update *upda
 		if (i == core_dc->current_context->target_count)
 			return;
 
-		for (i = 0 ; i < surface_count; i++) {
-			struct core_surface *surface = DC_SURFACE_TO_CORE(updates[i].surface);
-
-			new_surfaces[i] = updates[i].surface;
-			for (j = 0; j < context->res_ctx.pool->pipe_count; j++) {
-				struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
-
-				if (surface == pipe_ctx->surface)
-					is_new_pipe_surface[i] = false;
-			}
-		}
-
 		if (!resource_attach_surfaces_to_context(
 				new_surfaces, surface_count, dc_target, context)) {
 			BREAK_TO_DEBUGGER();
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#8 lore raw

PATCH 7/39 drm/amd/dal: fix misc0 bug lead to DP not lighting up

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

Change-Id I6522798fb1f3038157735b65179d7b1adfce49ae
---
 drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c +9 -6
index 177393df22ec..6e1bca2fb737 100644
@@ -225,10 +225,13 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
 {
 	uint32_t h_active_start;
 	uint32_t v_active_start;
-	uint32_t misc0;
+	uint32_t misc0 = 0;
 	uint32_t misc1;
 	uint32_t h_blank;
 	uint32_t h_back_porch;
+	uint8_t synchronous_clock = 0; /* asynchronous mode */
+	uint8_t colorimetry_bpc;
+
 	struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
 
 	/* set pixel encoding */
@@ -272,28 +275,28 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
 	case COLOR_DEPTH_666:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				0);
-		misc0 = 0;
+		colorimetry_bpc = 0;
 		break;
 	case COLOR_DEPTH_888:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_8BPC);
-		misc0 = 1;
+		colorimetry_bpc = 1;
 		break;
 	case COLOR_DEPTH_101010:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_10BPC);
 
-		misc0 = 2;
+		colorimetry_bpc = 2;
 		break;
 	case COLOR_DEPTH_121212:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_12BPC);
-		misc0 = 3;
+		colorimetry_bpc = 3;
 		break;
 	default:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_6BPC);
-		misc0 = 0;
+		colorimetry_bpc = 0;
 		break;
 	}
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#9 lore raw

PATCH 8/39 drm/amd/dal: improve compiler catching bug in REG_SET

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

- first field is explicitly passed instead of pass by VA_ARG to catch type mismatch
- fix REG_SET bug in dce_hwseq

Change-Id I0f0b316e1d1ea1c42c0d3ffbc406db1b5e6cd3c3
---
 drivers/gpu/drm/amd/dal/dc/dc_helper.c   | 10 +++++++---
 drivers/gpu/drm/amd/dal/dc/dm_services.h |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/dal/dc/dc_helper.c +7 -3
index b3f7d40673e8..96724ba17e4b 100644
@@ -8,13 +8,17 @@
 #include <stdarg.h>
 
 uint32_t generic_reg_update_ex(const struct dc_context *ctx,
-		uint32_t addr, uint32_t reg_val, int n, ...)
+		uint32_t addr, uint32_t reg_val, int n,
+		uint8_t shift1, uint32_t mask1, uint32_t field_value1,
+		...)
 {
 	uint32_t shift, mask, field_value;
-	int i = 0;
+	int i = 1;
 
 	va_list ap;
-	va_start(ap, n);
+	va_start(ap, field_value1);
+
+	reg_val = set_reg_field_value_ex(reg_val, field_value1, mask1, shift1);
 
 	while (i < n) {
 		shift = va_arg(ap, uint32_t);
drivers/gpu/drm/amd/dal/dc/dm_services.h +2 -1
index 6385ed48ad36..289264403983 100644
@@ -190,7 +190,8 @@ static inline uint32_t set_reg_field_value_ex(
 		reg_name ## __ ## reg_field ## __SHIFT)
 
 uint32_t generic_reg_update_ex(const struct dc_context *ctx,
-		uint32_t addr, uint32_t reg_val, int n, ...);
+		uint32_t addr, uint32_t reg_val, int n,
+		uint8_t shift1, uint32_t mask1, uint32_t field_value1, ...);
 
 #define FD(reg_field)	reg_field ## __SHIFT, \
 						reg_field ## _MASK
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#10 lore raw

PATCH 9/39 drm/amd/dal: visual confirm change blank color to none-black

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

- brown to help identify OTG is blanked.

Change-Id Ifaf1288956288d3dc08ace899cabed3fd69f93fd
---
 drivers/gpu/drm/amd/dal/dc/core/dc_hw_sequencer.c       | 14 +++++++++++---
 drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 11 +++++++----
 drivers/gpu/drm/amd/dal/dc/inc/hw_sequencer.h           |  3 ++-
 3 files changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_hw_sequencer.c +11 -3
index 6252e3f67813..d5cffa51ca96 100644
@@ -36,8 +36,7 @@ enum black_color_format {
 	BLACK_COLOR_FORMAT_YUV_TV,
 	BLACK_COLOR_FORMAT_YUV_CV,
 	BLACK_COLOR_FORMAT_YUV_SUPER_AA,
-
-	BLACK_COLOR_FORMAT_COUNT
+	BLACK_COLOR_FORMAT_DEBUG,
 };
 
 static const struct tg_color black_color_format[] = {
@@ -51,12 +50,21 @@ static const struct tg_color black_color_format[] = {
 	{0x1f4, 0x40, 0x1f4},
 	/* BlackColorFormat_YUV_SuperAA */
 	{0x1a2, 0x20, 0x1a2},
+	/* visual confirm debug */
+	{0xff, 0xff, 0},
 };
 
 void color_space_to_black_color(
-		enum dc_color_space colorspace,
+	const struct core_dc *dc,
+	enum dc_color_space colorspace,
 	struct tg_color *black_color)
 {
+	if (dc->public.debug.surface_visual_confirm) {
+		*black_color =
+			black_color_format[BLACK_COLOR_FORMAT_DEBUG];
+		return;
+	}
+
 	switch (colorspace) {
 	case COLOR_SPACE_YPBPR601:
 		*black_color = black_color_format[BLACK_COLOR_FORMAT_YUV_TV];
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +7 -4
index ef00588b8179..eb37e58c66c9 100644
@@ -553,8 +553,9 @@ static void program_scaler(const struct core_dc *dc,
 	if (dc->public.debug.surface_visual_confirm)
 		get_surface_visual_confirm_color(pipe_ctx, &color);
 	else
-		color_space_to_black_color(pipe_ctx->stream->public.output_color_space,
-									&color);
+		color_space_to_black_color(dc,
+				pipe_ctx->stream->public.output_color_space,
+				&color);
 
 	pipe_ctx->xfm->funcs->transform_set_pixel_storage_depth(
 		pipe_ctx->xfm,
@@ -583,7 +584,8 @@ static enum dc_status prog_pixclk_crtc_otg(
 	if (!pipe_ctx_old->stream) {
 
 		/* program blank color */
-		color_space_to_black_color(stream->public.output_color_space, &black_color);
+		color_space_to_black_color(dc,
+				stream->public.output_color_space, &black_color);
 		pipe_ctx->tg->funcs->set_blank_color(
 				pipe_ctx->tg,
 				&black_color);
@@ -1712,7 +1714,8 @@ static void dce110_power_on_pipe_if_needed(
 				context->target_count);
 
 		/* TODO unhardcode*/
-		color_space_to_black_color(COLOR_SPACE_YCBCR601, &black_color);
+		color_space_to_black_color(dc,
+				COLOR_SPACE_YCBCR601, &black_color);
 		pipe_ctx->tg->funcs->set_blank_color(
 				pipe_ctx->tg,
 				&black_color);
drivers/gpu/drm/amd/dal/dc/inc/hw_sequencer.h +2 -1
index d16e70103300..35a556dd9054 100644
@@ -149,7 +149,8 @@ struct hw_sequencer_funcs {
 };
 
 void color_space_to_black_color(
-		enum dc_color_space colorspace,
+	const struct core_dc *dc,
+	enum dc_color_space colorspace,
 	struct tg_color *black_color);
 
 #endif /* __DC_HW_SEQUENCER_H__ */
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#11 lore raw

PATCH 10/39 drm/amd/dal: transform cleanup

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I6231292e0295c1be32fa9dca74895d02426a3a67
---
 drivers/gpu/drm/amd/dal/dc/core/dc_resource.c      |   4 +-
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |  13 ---
 .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c    |  13 +--
 .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c    |  17 ----
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   |   7 --
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   |  12 +--
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.c | 101 ---------------------
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   |  72 ++++++++++-----
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c |  24 +----
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h |   4 -
 .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c    |  13 ---
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |   4 +-
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c |   6 --
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h |  10 +-
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.c   |  38 --------
 .../gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c |  43 ++++-----
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h      |  35 +++----
 17 files changed, 86 insertions(+), 330 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +2 -2
index 25b03cba906e..920a4ba42a6a 100644
@@ -528,7 +528,7 @@ bool resource_build_scaling_params(
 	 * Setting line buffer pixel depth to 24bpp yields banding
 	 * on certain displays, such as the Sharp 4k
 	 */
-	pipe_ctx->scl_data.lb_bpp = LB_PIXEL_DEPTH_30BPP;
+	pipe_ctx->scl_data.lb_params.depth = LB_PIXEL_DEPTH_30BPP;
 
 	pipe_ctx->scl_data.h_active = timing->h_addressable;
 	pipe_ctx->scl_data.v_active = timing->v_addressable;
@@ -539,7 +539,7 @@ bool resource_build_scaling_params(
 
 	if (!res) {
 		/* Try 24 bpp linebuffer */
-		pipe_ctx->scl_data.lb_bpp = LB_PIXEL_DEPTH_24BPP;
+		pipe_ctx->scl_data.lb_params.depth = LB_PIXEL_DEPTH_24BPP;
 
 		res = pipe_ctx->xfm->funcs->transform_get_optimal_number_of_taps(
 			pipe_ctx->xfm, &pipe_ctx->scl_data, &surface->scaling_quality);
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +0 -13
index c94695e603bd..4c19d2f3849d 100644
@@ -716,9 +716,6 @@ static void destruct(struct dce110_resource_pool *pool)
 	if (pool->base.display_clock != NULL)
 		dal_display_clock_destroy(&pool->base.display_clock);
 
-	if (pool->base.scaler_filter != NULL)
-		dal_scaler_filter_destroy(&pool->base.scaler_filter);
-
 	if (pool->base.irqs != NULL)
 		dal_irq_service_destroy(&pool->base.irqs);
 }
@@ -1000,16 +997,9 @@ static bool construct(
 	*************************************************/
 	pool->base.underlay_pipe_index = -1;
 	pool->base.pipe_count = res_cap.num_timing_generator;
-	pool->base.scaler_filter = dal_scaler_filter_create(ctx);
 	dc->public.caps.max_downscale_ratio = 200;
 	dc->public.caps.i2c_speed_in_khz = 40;
 
-	if (pool->base.scaler_filter == NULL) {
-		BREAK_TO_DEBUGGER();
-		dm_error("DC: failed to create filter!\n");
-		goto res_create_fail;
-	}
-
 	for (i = 0; i < pool->base.pipe_count; i++) {
 		pool->base.timing_generators[i] =
 			dce100_timing_generator_create(
@@ -1048,9 +1038,6 @@ static bool construct(
 				"DC: failed to create transform!\n");
 			goto res_create_fail;
 		}
-		pool->base.transforms[i]->funcs->transform_set_scaler_filter(
-				pool->base.transforms[i],
-				pool->base.scaler_filter);
 
 		pool->base.opps[i] = dce100_opp_create(ctx, i, &dce100_opp_reg_offsets[i]);
 		if (pool->base.opps[i] == NULL) {
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +5 -8
index eb37e58c66c9..c6c2d01a2e5b 100644
@@ -559,7 +559,7 @@ static void program_scaler(const struct core_dc *dc,
 
 	pipe_ctx->xfm->funcs->transform_set_pixel_storage_depth(
 		pipe_ctx->xfm,
-		pipe_ctx->scl_data.lb_bpp,
+		pipe_ctx->scl_data.lb_params.depth,
 		&pipe_ctx->stream->bit_depth_params);
 
 	if (pipe_ctx->tg->funcs->set_overscan_blank_color)
@@ -687,6 +687,7 @@ static enum dc_status apply_single_controller_ctx_to_hw(
 				&stream->sink->link->public.cur_link_settings);
 	}
 
+	pipe_ctx->scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0;
 	/* program_scaler and allocate_mem_input are not new asic */
 	if (!pipe_ctx_old || memcmp(&pipe_ctx_old->scl_data,
 				&pipe_ctx->scl_data,
@@ -1382,7 +1383,7 @@ static void set_default_colors(struct pipe_ctx *pipe_ctx)
 		pipe_ctx->stream->public.timing.display_color_depth;
 
 	/* Lb color depth */
-	default_adjust.lb_color_depth = pipe_ctx->scl_data.lb_bpp;
+	default_adjust.lb_color_depth = pipe_ctx->scl_data.lb_params.depth;
 
 	pipe_ctx->opp->funcs->opp_set_csc_default(
 					pipe_ctx->opp, &default_adjust);
@@ -1472,13 +1473,11 @@ static void set_plane_config(
 
 	pipe_ctx->xfm->funcs->transform_set_gamut_remap(pipe_ctx->xfm, &adjust);
 
+	pipe_ctx->scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0;
 	program_scaler(dc, pipe_ctx);
 
 	program_blender(dc, pipe_ctx);
 
-	if (pipe_ctx->bottom_pipe)
-		pipe_ctx->xfm->funcs->transform_set_alpha(pipe_ctx->xfm, true);
-
 	mi->funcs->mem_input_program_surface_config(
 			mi,
 			surface->public.format,
@@ -1815,14 +1814,12 @@ static void dce110_program_front_end_for_pipe(
 
 	pipe_ctx->xfm->funcs->transform_set_gamut_remap(pipe_ctx->xfm, &adjust);
 
+	pipe_ctx->scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0;
 	if (old_pipe && memcmp(&old_pipe->scl_data,
 				&pipe_ctx->scl_data,
 				sizeof(struct scaler_data)) != 0)
 		program_scaler(dc, pipe_ctx);
 
-	if (pipe_ctx->bottom_pipe)
-		pipe_ctx->xfm->funcs->transform_set_alpha(pipe_ctx->xfm, true);
-
 	mi->funcs->mem_input_program_surface_config(
 			mi,
 			surface->public.format,
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +0 -17
index f9cebc9680a6..961aa3f26999 100644
@@ -687,9 +687,6 @@ static void destruct(struct dce110_resource_pool *pool)
 		dal_display_clock_destroy(&pool->base.display_clock);
 	}
 
-	if (pool->base.scaler_filter != NULL) {
-		dal_scaler_filter_destroy(&pool->base.scaler_filter);
-	}
 	if (pool->base.irqs != NULL) {
 		dal_irq_service_destroy(&pool->base.irqs);
 	}
@@ -1110,10 +1107,6 @@ static void underlay_create(struct dc_context *ctx, struct resource_pool *pool)
 	pool->timing_generators[pool->pipe_count] = &dce110_tgv->base;
 	pool->mis[pool->pipe_count] = &dce110_miv->base;
 	pool->transforms[pool->pipe_count] = &dce110_xfmv->base;
-
-	pool->transforms[pool->pipe_count]->funcs->transform_set_scaler_filter(
-			pool->transforms[pool->pipe_count],
-			pool->scaler_filter);
 	pool->pipe_count++;
 
 	/* update the public caps to indicate an underlay is available */
@@ -1317,13 +1310,6 @@ static bool construct(
 			goto res_create_fail;
 	}
 
-	pool->base.scaler_filter = dal_scaler_filter_create(ctx);
-	if (pool->base.scaler_filter == NULL) {
-		BREAK_TO_DEBUGGER();
-		dm_error("DC: failed to create filter!\n");
-		goto res_create_fail;
-	}
-
 	for (i = 0; i < pool->base.pipe_count; i++) {
 		pool->base.timing_generators[i] = dce110_timing_generator_create(
 				ctx, i, &dce110_tg_offsets[i]);
@@ -1358,9 +1344,6 @@ static bool construct(
 				"DC: failed to create transform!\n");
 			goto res_create_fail;
 		}
-		pool->base.transforms[i]->funcs->transform_set_scaler_filter(
-				pool->base.transforms[i],
-				pool->base.scaler_filter);
 
 		pool->base.opps[i] = dce110_opp_create(ctx, i, &dce110_opp_reg_offsets[i]);
 		if (pool->base.opps[i] == NULL) {
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +0 -7
index a8973795eeeb..492856290470 100644
@@ -76,17 +76,10 @@ static const struct transform_funcs dce110_transform_funcs = {
 		dce110_transform_power_up,
 	.transform_set_scaler =
 		dce110_transform_set_scaler,
-	.transform_set_scaler_bypass =
-		dce110_transform_set_scaler_bypass,
-	.transform_set_scaler_filter =
-		dce110_transform_set_scaler_filter,
 	.transform_set_gamut_remap =
 		dce110_transform_set_gamut_remap,
 	.transform_set_pixel_storage_depth =
 		dce110_transform_set_pixel_storage_depth,
-	.transform_get_current_pixel_storage_depth =
-		dce110_transform_get_current_pixel_storage_depth,
-	.transform_set_alpha = dce110_transform_set_alpha,
 	.transform_get_optimal_number_of_taps =
 		dce110_transform_get_optimal_number_of_taps
 };
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +1 -11
index 6a2f2b0279e9..7f3e50bbb4f1 100644
@@ -59,14 +59,10 @@ bool dce110_transform_construct(struct dce110_transform *xfm110,
 bool dce110_transform_power_up(struct transform *xfm);
 
 /* SCALER RELATED */
-bool dce110_transform_set_scaler(
+void dce110_transform_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data);
 
-void dce110_transform_set_scaler_bypass(
-		struct transform *xfm,
-		const struct scaler_data *scl_data);
-
 void dce110_transform_set_scaler_filter(
 	struct transform *xfm,
 	struct scaler_filter *filter);
@@ -82,12 +78,6 @@ bool dce110_transform_set_pixel_storage_depth(
 	enum lb_pixel_depth depth,
 	const struct bit_depth_reduction_params *bit_depth_params);
 
-bool dce110_transform_get_current_pixel_storage_depth(
-	struct transform *xfm,
-	enum lb_pixel_depth *depth);
-
-void dce110_transform_set_alpha(struct transform *xfm, bool enable);
-
 bool dce110_transform_get_optimal_number_of_taps(
 	struct transform *xfm,
 	struct scaler_data *scl_data,
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c +0 -101

119 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +47 -25

102 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +1 -23
index b17929dc51ea..751f33f48422 100644
@@ -673,20 +673,6 @@ static void program_scl_ratios_inits(
 	dm_write_reg(ctx, addr, value);
 }
 
-static void dce110_transform_v_set_scalerv_bypass(
-		struct transform *xfm,
-		const struct scaler_data *scl_data)
-{
-	uint32_t addr = mmSCLV_MODE;
-	uint32_t value = dm_read_reg(xfm->ctx, addr);
-
-	set_reg_field_value(value, 0, SCLV_MODE, SCL_MODE);
-	set_reg_field_value(value, 0, SCLV_MODE, SCL_MODE_C);
-	set_reg_field_value(value, 0, SCLV_MODE, SCL_PSCL_EN);
-	set_reg_field_value(value, 0, SCLV_MODE, SCL_PSCL_EN_C);
-	dm_write_reg(xfm->ctx, addr, value);
-}
-
 static const uint16_t *get_filter_coeffs_64p(int taps, struct fixed31_32 ratio)
 {
 	if (taps == 4)
@@ -702,7 +688,7 @@ static const uint16_t *get_filter_coeffs_64p(int taps, struct fixed31_32 ratio)
 	}
 }
 
-static bool dce110_transform_v_set_scaler(
+static void dce110_transform_v_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data)
 {
@@ -786,8 +772,6 @@ static bool dce110_transform_v_set_scaler(
 	/* 8. Set bit to flip to new coefficient memory */
 	if (filter_updated)
 		set_coeff_update_complete(xfm110);
-
-	return true;
 }
 
 static bool dce110_transform_v_power_up_line_buffer(struct transform *xfm)
@@ -825,16 +809,10 @@ static const struct transform_funcs dce110_transform_v_funcs = {
 		dce110_transform_v_power_up_line_buffer,
 	.transform_set_scaler =
 		dce110_transform_v_set_scaler,
-	.transform_set_scaler_bypass =
-		dce110_transform_v_set_scalerv_bypass,
-	.transform_set_scaler_filter =
-		dce110_transform_set_scaler_filter,
 	.transform_set_gamut_remap =
 		dce110_transform_set_gamut_remap,
 	.transform_set_pixel_storage_depth =
 		dce110_transform_v_set_pixel_storage_depth,
-	.transform_get_current_pixel_storage_depth =
-		dce110_transform_v_get_current_pixel_storage_depth,
 	.transform_get_optimal_number_of_taps =
 			dce110_transform_get_optimal_number_of_taps
 };
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h +0 -4
index 2d803087cad9..57fcb28ba986 100644
@@ -34,10 +34,6 @@ bool dce110_transform_v_construct(
 	struct dce110_transform *xfm110,
 	struct dc_context *ctx);
 
-bool dce110_transform_v_get_current_pixel_storage_depth(
-	struct transform *xfm,
-	enum lb_pixel_depth *depth);
-
 bool dce110_transform_v_set_pixel_storage_depth(
 	struct transform *xfm,
 	enum lb_pixel_depth depth,
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +0 -13
index e0b3266fdef0..054f918185fc 100644
@@ -749,9 +749,6 @@ static void destruct(struct dce110_resource_pool *pool)
 		dal_display_clock_destroy(&pool->base.display_clock);
 	}
 
-	if (pool->base.scaler_filter != NULL) {
-		dal_scaler_filter_destroy(&pool->base.scaler_filter);
-	}
 	if (pool->base.irqs != NULL) {
 		dal_irq_service_destroy(&pool->base.irqs);
 	}
@@ -1342,13 +1339,6 @@ static bool construct(
 			goto res_create_fail;
 	}
 
-	pool->base.scaler_filter = dal_scaler_filter_create(ctx);
-	if (pool->base.scaler_filter == NULL) {
-		BREAK_TO_DEBUGGER();
-		dm_error("DC: failed to create filter!\n");
-		goto res_create_fail;
-	}
-
 	for (i = 0; i < pool->base.pipe_count; i++) {
 		pool->base.timing_generators[i] =
 				dce112_timing_generator_create(
@@ -1393,9 +1383,6 @@ static bool construct(
 				"DC: failed to create transform!\n");
 			goto res_create_fail;
 		}
-		pool->base.transforms[i]->funcs->transform_set_scaler_filter(
-				pool->base.transforms[i],
-				pool->base.scaler_filter);
 
 		pool->base.opps[i] = dce112_opp_create(
 			ctx,
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +1 -3
index 3de40302eb89..dbdce062e4e9 100644
@@ -1035,9 +1035,7 @@ static bool construct(
 			dm_error("DC: failed to create transform!\n");
 			goto res_create_fail;
 		}
-		pool->base.transforms[i]->funcs->transform_set_scaler_filter(
-				pool->base.transforms[i],
-				pool->base.scaler_filter);
+		pool->base.transforms[i]->filter = pool->base.scaler_filter;
 
 		pool->base.opps[i] = dce80_opp_create(ctx, i);
 		if (pool->base.opps[i] == NULL) {
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c +0 -6
index 48cbcbb28c77..e99950f40439 100644
@@ -66,16 +66,10 @@ static const struct transform_funcs dce80_transform_funcs = {
 		dce80_transform_power_up,
 	.transform_set_scaler =
 		dce80_transform_set_scaler,
-	.transform_set_scaler_bypass =
-		dce80_transform_set_scaler_bypass,
-	.transform_set_scaler_filter =
-		dce80_transform_set_scaler_filter,
 	.transform_set_gamut_remap =
 		dce80_transform_set_gamut_remap,
 	.transform_set_pixel_storage_depth =
 		dce80_transform_set_pixel_storage_depth,
-	.transform_get_current_pixel_storage_depth =
-		dce80_transform_get_current_pixel_storage_depth,
 	.transform_get_optimal_number_of_taps =
 		dce80_transform_get_optimal_number_of_taps
 };
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h +1 -9
index 3d14e04ceeb3..ce625ac417df 100644
@@ -55,14 +55,10 @@ bool dce80_transform_construct(struct dce80_transform *xfm80,
 bool dce80_transform_power_up(struct transform *xfm);
 
 /* SCALER RELATED */
-bool dce80_transform_set_scaler(
+void dce80_transform_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data);
 
-void dce80_transform_set_scaler_bypass(
-		struct transform *xfm,
-		const struct scaler_data *scl_data);
-
 void dce80_transform_set_scaler_filter(
 	struct transform *xfm,
 	struct scaler_filter *filter);
@@ -78,8 +74,4 @@ bool dce80_transform_set_pixel_storage_depth(
 	enum lb_pixel_depth depth,
 	const struct bit_depth_reduction_params *bit_depth_params);
 
-bool dce80_transform_get_current_pixel_storage_depth(
-	struct transform *xfm,
-	enum lb_pixel_depth *depth);
-
 #endif
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c +0 -38
index cd310a99144c..7d03684a4e7c 100644
@@ -563,44 +563,6 @@ bool dce80_transform_is_prefetch_enabled(
 	return false;
 }
 
-bool dce80_transform_get_current_pixel_storage_depth(
-	struct transform *xfm,
-	enum lb_pixel_depth *depth)
-{
-	struct dce80_transform *xfm80 = TO_DCE80_TRANSFORM(xfm);
-	uint32_t value = 0;
-
-	if (depth == NULL)
-		return false;
-
-	value = dm_read_reg(
-			xfm->ctx,
-			LB_REG(mmLB_DATA_FORMAT));
-
-	switch (get_reg_field_value(value, LB_DATA_FORMAT, PIXEL_DEPTH)) {
-	case 0:
-		*depth = LB_PIXEL_DEPTH_30BPP;
-		break;
-	case 1:
-		*depth = LB_PIXEL_DEPTH_24BPP;
-		break;
-	case 2:
-		*depth = LB_PIXEL_DEPTH_18BPP;
-		break;
-	case 3:
-		*depth = LB_PIXEL_DEPTH_36BPP;
-		break;
-	default:
-		dm_logger_write(xfm->ctx->logger, LOG_WARNING,
-			"%s: Invalid LB pixel depth",
-			__func__);
-		*depth = LB_PIXEL_DEPTH_30BPP;
-		break;
-	}
-	return true;
-
-}
-
 static void set_denormalization(
 	struct dce80_transform *xfm80,
 	enum dc_color_depth depth)
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c +17 -26

71 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +11 -24
index 31547406aa31..94f4ef76921c 100644
@@ -144,6 +144,14 @@ struct sharpness_adj {
 	uint32_t vert;
 };
 
+struct line_buffer_params {
+	bool alpha_en;
+	bool pixel_expan_mode;
+	bool interleave_en;
+	uint32_t dynamic_pixel_depth;
+	enum lb_pixel_depth depth;
+};
+
 struct scaler_data {
 	uint32_t h_active;
 	uint32_t v_active;
@@ -153,15 +161,7 @@ struct scaler_data {
 	struct scaling_ratios ratios;
 	struct sharpness_adj sharpness;
 	enum pixel_format format;
-	enum lb_pixel_depth lb_bpp;
-};
-
-struct line_buffer_params {
-	bool alpha_en;
-	bool pixel_expan_mode;
-	bool interleave_en;
-	uint32_t dynamic_pixel_depth;
-	enum lb_pixel_depth depth;
+	struct line_buffer_params lb_params;
 };
 
 struct transform_funcs {
@@ -171,16 +171,9 @@ struct transform_funcs {
 	bool (*transform_power_up)(
 		struct transform *xfm);
 
-	bool (*transform_set_scaler)(
+	void (*transform_set_scaler)(
 		struct transform *xfm,
-		const struct scaler_data *data);
-
-	void (*transform_set_scaler_bypass)(
-		struct transform *xfm, const struct scaler_data *scl_data);
-
-	void (*transform_set_scaler_filter)(
-		struct transform *xfm,
-		struct scaler_filter *filter);
+		const struct scaler_data *scl_data);
 
 	void (*transform_set_gamut_remap)(
 		struct transform *xfm,
@@ -191,12 +184,6 @@ struct transform_funcs {
 		enum lb_pixel_depth depth,
 		const struct bit_depth_reduction_params *bit_depth_params);
 
-	bool (*transform_get_current_pixel_storage_depth)(
-		struct transform *xfm,
-		enum lb_pixel_depth *depth);
-
-	void (*transform_set_alpha)(struct transform *xfm, bool enable);
-
 	bool (*transform_get_optimal_number_of_taps)(
 		struct transform *xfm,
 		struct scaler_data *scl_data,
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#12 lore raw

PATCH 11/39 drm/amd/dal: separate out scaler filters

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I90cfaf3f1a503b955db1d7c22e0eb1b5d0141e3c
---
 drivers/gpu/drm/amd/dal/dc/dce/Makefile            |   2 +-
 drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c   | 345 +++++++++++++++++++++
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   | 131 --------
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 187 -----------
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h      |   6 +
 5 files changed, 352 insertions(+), 319 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c
drivers/gpu/drm/amd/dal/dc/dce/Makefile +1 -1
index be757b84790a..6feb1755a60f 100644
@@ -6,7 +6,7 @@
 #     offset/shift/mask stored in dce_hw struct
 
 DCE = dce_audio.o dce_stream_encoder.o dce_link_encoder.o dce_hwseq.o \
-dce_mem_input.o
+dce_mem_input.o dce_scl_filters.o
 
 AMD_DAL_DCE = $(addprefix $(AMDDALPATH)/dc/dce/,$(DCE))
 
drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c new file +345 -0

345 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +0 -131

143 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +0 -187

199 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +6 -0
index 94f4ef76921c..bf112892d35e 100644
@@ -196,4 +196,10 @@ bool transform_get_optimal_number_of_taps_helper(
 	uint32_t pixel_width,
 	const struct scaling_taps *in_taps);
 
+extern const uint16_t filter_2tap_16p[18];
+extern const uint16_t filter_2tap_64p[66];
+const uint16_t *get_filter_3tap_16p(struct fixed31_32 ratio);
+const uint16_t *get_filter_4tap_16p(struct fixed31_32 ratio);
+const uint16_t *get_filter_4tap_64p(struct fixed31_32 ratio);
+
 #endif
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#13 lore raw

PATCH 12/39 drm/amd/dal: transform cleanup powerup

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I7f41c0582f80f7f525076654a2003edb68b0929c
---
 .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c    |  1 -
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   |  7 ----
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   |  6 ----
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.c | 39 ----------------------
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.h |  4 ---
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   | 29 ++++++++++++++++
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 39 +++++++++++-----------
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c |  8 -----
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h |  2 --
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.c   | 26 ---------------
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.h   |  2 --
 .../gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c | 32 ++++++++++++++++++
 12 files changed, 80 insertions(+), 115 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +0 -1
index c6c2d01a2e5b..74e1a191cfbe 100644
@@ -1642,7 +1642,6 @@ static void init_hw(struct core_dc *dc)
 		dc->hwss.enable_display_power_gating(
 				dc, i, bp,
 				PIPE_GATING_CONTROL_DISABLE);
-		xfm->funcs->transform_power_up(xfm);
 		dc->hwss.enable_display_pipe_clock_gating(
 			dc->ctx,
 			true);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +0 -7
index 492856290470..ca599959c7e2 100644
@@ -72,8 +72,6 @@ static void dce110_transform_reset(struct transform *xfm)
 
 static const struct transform_funcs dce110_transform_funcs = {
 	.transform_reset = dce110_transform_reset,
-	.transform_power_up =
-		dce110_transform_power_up,
 	.transform_set_scaler =
 		dce110_transform_set_scaler,
 	.transform_set_gamut_remap =
@@ -113,8 +111,3 @@ bool dce110_transform_construct(
 
 	return true;
 }
-
-bool dce110_transform_power_up(struct transform *xfm)
-{
-	return dce110_transform_power_up_line_buffer(xfm);
-}
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +0 -6
index 7f3e50bbb4f1..afa33e4621b7 100644
@@ -56,17 +56,11 @@ bool dce110_transform_construct(struct dce110_transform *xfm110,
 	uint32_t inst,
 	const struct dce110_transform_reg_offsets *reg_offsets);
 
-bool dce110_transform_power_up(struct transform *xfm);
-
 /* SCALER RELATED */
 void dce110_transform_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data);
 
-void dce110_transform_set_scaler_filter(
-	struct transform *xfm,
-	struct scaler_filter *filter);
-
 /* GAMUT RELATED */
 void dce110_transform_set_gamut_remap(
 	struct transform *xfm,
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c +0 -39
index 966c90bab67c..84338166977f 100644
@@ -582,18 +582,6 @@ int32_t dce110_transform_get_max_num_of_supported_lines(
 	return (max_pixels_supports / pixel_width);
 }
 
-bool dce110_transform_is_prefetch_enabled(
-	struct dce110_transform *xfm110)
-{
-	uint32_t value = dm_read_reg(
-			xfm110->base.ctx, LB_REG(mmLB_DATA_FORMAT));
-
-	if (get_reg_field_value(value, LB_DATA_FORMAT, PREFETCH) == 1)
-		return true;
-
-	return false;
-}
-
 static void set_denormalization(
 	struct dce110_transform *xfm110,
 	enum dc_color_depth depth)
@@ -704,33 +692,6 @@ bool dce110_transform_set_pixel_storage_depth(
 	return ret;
 }
 
-/* LB_MEMORY_CONFIG
- *  00 - Use all three pieces of memory
- *  01 - Use only one piece of memory of total 720x144 bits
- *  10 - Use two pieces of memory of total 960x144 bits
- *  11 - reserved
- *
- * LB_MEMORY_SIZE
- *  Total entries of LB memory.
- *  This number should be larger than 960. The default value is 1712(0x6B0) */
-bool dce110_transform_power_up_line_buffer(struct transform *xfm)
-{
-	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
-	uint32_t value;
-
-	value = dm_read_reg(xfm110->base.ctx, LB_REG(mmLB_MEMORY_CTRL));
-
-	/*Use all three pieces of memory always*/
-	set_reg_field_value(value, 0, LB_MEMORY_CTRL, LB_MEMORY_CONFIG);
-	/*hard coded number DCE11 1712(0x6B0) Partitions: 720/960/1712*/
-	set_reg_field_value(value, xfm110->base.lb_memory_size, LB_MEMORY_CTRL,
-			LB_MEMORY_SIZE);
-
-	dm_write_reg(xfm110->base.ctx, LB_REG(mmLB_MEMORY_CTRL), value);
-
-	return true;
-}
-
 /* Underlay pipe functions*/
 bool dce110_transform_v_set_pixel_storage_depth(
 	struct transform *xfm,
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.h +0 -4
index a28efb049335..bb195fd43580 100644
@@ -27,14 +27,10 @@
 
 #include "dce110_transform.h"
 
-bool dce110_transform_power_up_line_buffer(struct transform *xfm);
-
 bool dce110_transform_get_max_num_of_supported_lines(
 	struct transform *xfm,
 	enum lb_pixel_depth depth,
 	uint32_t pixel_width);
 
-bool dce110_transform_is_prefetch_enabled(
-	struct dce110_transform *xfm110);
 
 #endif
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +29 -0
index 2663abdfb5d6..7dd173ccf4b9 100644
@@ -501,6 +501,33 @@ static void dce110_transform_set_alpha(struct transform *xfm, bool enable)
 	dm_write_reg(ctx, addr, value);
 }
 
+/* LB_MEMORY_CONFIG
+ *  00 - Use all three pieces of memory
+ *  01 - Use only one piece of memory of total 720x144 bits
+ *  10 - Use two pieces of memory of total 960x144 bits
+ *  11 - reserved
+ *
+ * LB_MEMORY_SIZE
+ *  Total entries of LB memory.
+ *  This number should be larger than 960. The default value is 1712(0x6B0) */
+static bool dce110_transform_power_up_line_buffer(struct transform *xfm)
+{
+	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
+	uint32_t value;
+
+	value = dm_read_reg(xfm110->base.ctx, LB_REG(mmLB_MEMORY_CTRL));
+
+	/*Use all three pieces of memory always*/
+	set_reg_field_value(value, 0, LB_MEMORY_CTRL, LB_MEMORY_CONFIG);
+	/*hard coded number DCE11 1712(0x6B0) Partitions: 720/960/1712*/
+	set_reg_field_value(value, xfm110->base.lb_memory_size, LB_MEMORY_CTRL,
+			LB_MEMORY_SIZE);
+
+	dm_write_reg(xfm110->base.ctx, LB_REG(mmLB_MEMORY_CTRL), value);
+
+	return true;
+}
+
 void dce110_transform_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data)
@@ -510,6 +537,8 @@ void dce110_transform_set_scaler(
 	bool filter_updated = false;
 	const uint16_t *coeffs_v, *coeffs_h;
 
+	dce110_transform_power_up_line_buffer(xfm);
+
 	disable_enhanced_sharpness(xfm110);
 
 	/* 1. Program overscan */
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +19 -20
index b1a8d456ca67..13b99026e662 100644
@@ -501,6 +501,24 @@ static const uint16_t *get_filter_coeffs_64p(int taps, struct fixed31_32 ratio)
 	}
 }
 
+static bool dce110_transform_v_power_up_line_buffer(struct transform *xfm)
+{
+	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
+	uint32_t value;
+
+	value = dm_read_reg(xfm110->base.ctx, mmLBV_MEMORY_CTRL);
+
+	/*Use all three pieces of memory always*/
+	set_reg_field_value(value, 0, LBV_MEMORY_CTRL, LB_MEMORY_CONFIG);
+	/*hard coded number DCE11 1712(0x6B0) Partitions: 720/960/1712*/
+	set_reg_field_value(value, xfm110->base.lb_memory_size, LBV_MEMORY_CTRL,
+			LB_MEMORY_SIZE);
+
+	dm_write_reg(xfm110->base.ctx, mmLBV_MEMORY_CTRL, value);
+
+	return true;
+}
+
 static void dce110_transform_v_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data)
@@ -512,6 +530,7 @@ static void dce110_transform_v_set_scaler(
 	struct rect luma_viewport = {0};
 	struct rect chroma_viewport = {0};
 
+	dce110_transform_v_power_up_line_buffer(xfm);
 	/* 1. Calculate viewport, viewport programming should happen after init
 	 * calculations as they may require an adjustment in the viewport.
 	 */
@@ -587,24 +606,6 @@ static void dce110_transform_v_set_scaler(
 		set_coeff_update_complete(xfm110);
 }
 
-static bool dce110_transform_v_power_up_line_buffer(struct transform *xfm)
-{
-	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
-	uint32_t value;
-
-	value = dm_read_reg(xfm110->base.ctx, mmLBV_MEMORY_CTRL);
-
-	/*Use all three pieces of memory always*/
-	set_reg_field_value(value, 0, LBV_MEMORY_CTRL, LB_MEMORY_CONFIG);
-	/*hard coded number DCE11 1712(0x6B0) Partitions: 720/960/1712*/
-	set_reg_field_value(value, xfm110->base.lb_memory_size, LBV_MEMORY_CTRL,
-			LB_MEMORY_SIZE);
-
-	dm_write_reg(xfm110->base.ctx, mmLBV_MEMORY_CTRL, value);
-
-	return true;
-}
-
 static void dce110_transform_v_reset(struct transform *xfm)
 {
 	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
@@ -618,8 +619,6 @@ static void dce110_transform_v_reset(struct transform *xfm)
 static const struct transform_funcs dce110_transform_v_funcs = {
 	.transform_reset =
 			dce110_transform_v_reset,
-	.transform_power_up =
-		dce110_transform_v_power_up_line_buffer,
 	.transform_set_scaler =
 		dce110_transform_v_set_scaler,
 	.transform_set_gamut_remap =
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c +0 -8
index e99950f40439..e2187608fd62 100644
@@ -62,8 +62,6 @@ static void dce80_transform_reset(struct transform *xfm)
 
 static const struct transform_funcs dce80_transform_funcs = {
 	.transform_reset = dce80_transform_reset,
-	.transform_power_up =
-		dce80_transform_power_up,
 	.transform_set_scaler =
 		dce80_transform_set_scaler,
 	.transform_set_gamut_remap =
@@ -103,9 +101,3 @@ bool dce80_transform_construct(
 
 	return true;
 }
-
-bool dce80_transform_power_up(struct transform *xfm)
-{
-	return dce80_transform_power_up_line_buffer(xfm);
-}
-
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h +0 -2
index ce625ac417df..a6217c189815 100644
@@ -52,8 +52,6 @@ bool dce80_transform_construct(struct dce80_transform *xfm80,
 	uint32_t inst,
 	const struct dce80_transform_reg_offsets *offsets);
 
-bool dce80_transform_power_up(struct transform *xfm);
-
 /* SCALER RELATED */
 void dce80_transform_set_scaler(
 	struct transform *xfm,
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c +0 -26
index 7d03684a4e7c..fbc4d53e027e 100644
@@ -675,30 +675,4 @@ bool dce80_transform_set_pixel_storage_depth(
 	return ret;
 }
 
-/* LB_MEMORY_CONFIG
- *  00 - Use all three pieces of memory
- *  01 - Use only one piece of memory of total 720x144 bits
- *  10 - Use two pieces of memory of total 960x144 bits
- *  11 - reserved
- *
- * LB_MEMORY_SIZE
- *  Total entries of LB memory.
- *  This number should be larger than 960. The default value is 1712(0x6B0) */
-bool dce80_transform_power_up_line_buffer(struct transform *xfm)
-{
-	struct dce80_transform *xfm80 = TO_DCE80_TRANSFORM(xfm);
-	uint32_t value;
-
-	value = dm_read_reg(xfm80->base.ctx, LB_REG(mmLB_MEMORY_CTRL));
-
-	/*Use all three pieces of memory always*/
-	set_reg_field_value(value, 0, LB_MEMORY_CTRL, LB_MEMORY_CONFIG);
-	/*hard coded number DCE8 1712(0x6B0) Partitions: 720/960/1712*/
-	set_reg_field_value(value, xfm80->base.lb_memory_size, LB_MEMORY_CTRL,
-			LB_MEMORY_SIZE);
-
-	dm_write_reg(xfm80->base.ctx, LB_REG(mmLB_MEMORY_CTRL), value);
-
-	return true;
-}
 
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.h +0 -2
index a8d9008a9f00..beecefba16a5 100644
@@ -27,8 +27,6 @@
 
 #include "dce80_transform.h"
 
-bool dce80_transform_power_up_line_buffer(struct transform *xfm);
-
 void dce80_transform_enable_alpha(
 	struct dce80_transform *xfm80,
 	bool enable);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c +32 -0
index 130af10e030d..caf4def8510f 100644
@@ -41,6 +41,9 @@
 #define DCFE_REG(reg)\
 	(reg + xfm80->offsets.crtc_offset)
 
+#define LB_REG(reg)\
+	(reg + xfm80->offsets.lb_offset)
+
 static void disable_enhanced_sharpness(struct dce80_transform *xfm80)
 {
 	uint32_t  value;
@@ -640,6 +643,33 @@ static void program_scl_ratios_inits(
 	dm_write_reg(xfm80->base.ctx, addr, value);
 }
 
+/* LB_MEMORY_CONFIG
+ *  00 - Use all three pieces of memory
+ *  01 - Use only one piece of memory of total 720x144 bits
+ *  10 - Use two pieces of memory of total 960x144 bits
+ *  11 - reserved
+ *
+ * LB_MEMORY_SIZE
+ *  Total entries of LB memory.
+ *  This number should be larger than 960. The default value is 1712(0x6B0) */
+static bool dce80_transform_power_up_line_buffer(struct transform *xfm)
+{
+	struct dce80_transform *xfm80 = TO_DCE80_TRANSFORM(xfm);
+	uint32_t value;
+
+	value = dm_read_reg(xfm80->base.ctx, LB_REG(mmLB_MEMORY_CTRL));
+
+	/*Use all three pieces of memory always*/
+	set_reg_field_value(value, 0, LB_MEMORY_CTRL, LB_MEMORY_CONFIG);
+	/*hard coded number DCE8 1712(0x6B0) Partitions: 720/960/1712*/
+	set_reg_field_value(value, xfm80->base.lb_memory_size, LB_MEMORY_CTRL,
+			LB_MEMORY_SIZE);
+
+	dm_write_reg(xfm80->base.ctx, LB_REG(mmLB_MEMORY_CTRL), value);
+
+	return true;
+}
+
 void dce80_transform_set_scaler(
 	struct transform *xfm,
 	const struct scaler_data *data)
@@ -648,6 +678,8 @@ void dce80_transform_set_scaler(
 	bool is_scaling_required;
 	struct dc_context *ctx = xfm->ctx;
 
+	dce80_transform_power_up_line_buffer(xfm);
+
 	{
 		uint32_t addr = SCL_REG(mmSCL_BYPASS_CONTROL);
 		uint32_t value = dm_read_reg(xfm->ctx, addr);
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#14 lore raw

PATCH 13/39 drm/amd/dal: transform cleanup file structure

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I977df2ada439706b9940b06043c677aae58558c5
---
 drivers/gpu/drm/amd/dal/dc/dce110/Makefile         |   9 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   | 953 ++++++++++++++++++++-
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   |  15 +-
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.c | 763 -----------------
 .../amd/dal/dc/dce110/dce110_transform_bit_depth.h |  36 -
 .../drm/amd/dal/dc/dce110/dce110_transform_gamut.c | 269 ------
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   |  82 --
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 221 ++++-
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h |   5 -
 9 files changed, 1171 insertions(+), 1182 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_gamut.c
drivers/gpu/drm/amd/dal/dc/dce110/Makefile +4 -5
index ed271240cbdf..83d83df4e07b 100644
@@ -3,12 +3,11 @@
 # It provides the control and status of HW CRTC block.
 
 DCE110 = dce110_ipp.o dce110_ipp_cursor.o \
-dce110_ipp_gamma.o dce110_opp.o \
-dce110_opp_formatter.o dce110_opp_regamma.o \
-dce110_timing_generator.o dce110_transform.o dce110_transform_v.o \
-dce110_transform_gamut.o dce110_transform_scl.o dce110_opp_csc.o\
+dce110_ipp_gamma.o dce110_opp.o dce110_opp_csc.o \
+dce110_timing_generator.o dce110_opp_formatter.o dce110_opp_regamma.o \
+dce110_transform.o dce110_transform_scl.o dce110_transform_v.o \
 dce110_compressor.o dce110_mem_input.o dce110_hw_sequencer.o \
-dce110_resource.o dce110_transform_bit_depth.o dce110_clock_source.o \
+dce110_resource.o dce110_clock_source.o \
 dce110_opp_regamma_v.o dce110_opp_csc_v.o dce110_timing_generator_v.o \
 dce110_mem_input_v.o dce110_opp_v.o
 
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +952 -1

962 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +4 -11
index afa33e4621b7..9fb1decd1e65 100644
@@ -56,22 +56,15 @@ bool dce110_transform_construct(struct dce110_transform *xfm110,
 	uint32_t inst,
 	const struct dce110_transform_reg_offsets *reg_offsets);
 
-/* SCALER RELATED */
-void dce110_transform_set_scaler(
-	struct transform *xfm,
-	const struct scaler_data *data);
-
-/* GAMUT RELATED */
-void dce110_transform_set_gamut_remap(
-	struct transform *xfm,
-	const struct xfm_grph_csc_adjustment *adjust);
-
-/* BIT DEPTH RELATED */
 bool dce110_transform_set_pixel_storage_depth(
 	struct transform *xfm,
 	enum lb_pixel_depth depth,
 	const struct bit_depth_reduction_params *bit_depth_params);
 
+void dce110_transform_set_scaler(
+	struct transform *xfm,
+	const struct scaler_data *data);
+
 bool dce110_transform_get_optimal_number_of_taps(
 	struct transform *xfm,
 	struct scaler_data *scl_data,
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c deleted +0 -763

763 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.h deleted +0 -36
deleted file mode 100644
index bb195fd43580..000000000000
@@ -1,36 +0,0 @@
-/* Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DC_TRANSFORM_BIT_DEPTH_DCE110_H__
-#define __DC_TRANSFORM_BIT_DEPTH_DCE110_H__
-
-#include "dce110_transform.h"
-
-bool dce110_transform_get_max_num_of_supported_lines(
-	struct transform *xfm,
-	enum lb_pixel_depth depth,
-	uint32_t pixel_width);
-
-
-#endif
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_gamut.c deleted +0 -269

269 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +0 -82

91 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +211 -10

245 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h +0 -5
index 57fcb28ba986..c71f19cf94cd 100644
@@ -34,9 +34,4 @@ bool dce110_transform_v_construct(
 	struct dce110_transform *xfm110,
 	struct dc_context *ctx);
 
-bool dce110_transform_v_set_pixel_storage_depth(
-	struct transform *xfm,
-	enum lb_pixel_depth depth,
-	const struct bit_depth_reduction_params *bit_depth_params);
-
 #endif
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#15 lore raw

PATCH 14/39 drm/amd/dal: dce110 scaler to new style

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id Ifabf0fe703a72b9e599ef1066027dbecaf5ae080
---
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |  67 ++-
 .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c    |  45 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   | 540 +++++----------------
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   | 296 ++++++++++-
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   | 442 +++--------------
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 267 +++-------
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h |   1 +
 .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c    |  68 +--
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h |   2 +-
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.c   |  31 +-
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h      |  98 ++--
 11 files changed, 681 insertions(+), 1176 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +27 -40
index 4c19d2f3849d..951d8fb31914 100644
@@ -179,41 +179,6 @@ static const struct dce110_clk_src_reg_offsets dce100_clk_src_reg_offsets[] = {
 	}
 };
 
-static const struct dce110_transform_reg_offsets dce100_xfm_offsets[] = {
-{
-	.scl_offset = (mmSCL0_SCL_CONTROL - mmSCL_CONTROL),
-	.dcfe_offset = (mmCRTC0_DCFE_MEM_PWR_CTRL - mmDCFE_MEM_PWR_CTRL),
-	.dcp_offset = (mmDCP0_GRPH_CONTROL - mmGRPH_CONTROL),
-	.lb_offset = (mmLB0_LB_DATA_FORMAT - mmLB_DATA_FORMAT),
-},
-{	.scl_offset = (mmSCL1_SCL_CONTROL - mmSCL_CONTROL),
-	.dcfe_offset = (mmCRTC1_DCFE_MEM_PWR_CTRL - mmDCFE_MEM_PWR_CTRL),
-	.dcp_offset = (mmDCP1_GRPH_CONTROL - mmGRPH_CONTROL),
-	.lb_offset = (mmLB1_LB_DATA_FORMAT - mmLB_DATA_FORMAT),
-},
-{	.scl_offset = (mmSCL2_SCL_CONTROL - mmSCL_CONTROL),
-	.dcfe_offset = (mmCRTC2_DCFE_MEM_PWR_CTRL - mmDCFE_MEM_PWR_CTRL),
-	.dcp_offset = (mmDCP2_GRPH_CONTROL - mmGRPH_CONTROL),
-	.lb_offset = (mmLB2_LB_DATA_FORMAT - mmLB_DATA_FORMAT),
-},
-{
-	.scl_offset = (mmSCL3_SCL_CONTROL - mmSCL_CONTROL),
-	.dcfe_offset = (mmCRTC3_DCFE_MEM_PWR_CTRL - mmDCFE_MEM_PWR_CTRL),
-	.dcp_offset = (mmDCP3_GRPH_CONTROL - mmGRPH_CONTROL),
-	.lb_offset = (mmLB3_LB_DATA_FORMAT - mmLB_DATA_FORMAT),
-},
-{	.scl_offset = (mmSCL4_SCL_CONTROL - mmSCL_CONTROL),
-	.dcfe_offset = (mmCRTC4_DCFE_MEM_PWR_CTRL - mmDCFE_MEM_PWR_CTRL),
-	.dcp_offset = (mmDCP4_GRPH_CONTROL - mmGRPH_CONTROL),
-	.lb_offset = (mmLB4_LB_DATA_FORMAT - mmLB_DATA_FORMAT),
-},
-{	.scl_offset = (mmSCL5_SCL_CONTROL - mmSCL_CONTROL),
-	.dcfe_offset = (mmCRTC5_DCFE_MEM_PWR_CTRL - mmDCFE_MEM_PWR_CTRL),
-	.dcp_offset = (mmDCP5_GRPH_CONTROL - mmGRPH_CONTROL),
-	.lb_offset = (mmLB5_LB_DATA_FORMAT - mmLB_DATA_FORMAT),
-}
-};
-
 static const struct dce110_ipp_reg_offsets dce100_ipp_reg_offsets[] = {
 {
 	.dcp_offset = (mmDCP0_CUR_CONTROL - mmCUR_CONTROL),
@@ -245,6 +210,29 @@ static const struct dce110_ipp_reg_offsets dce100_ipp_reg_offsets[] = {
 #define SRI(reg_name, block, id)\
 	.reg_name = mm ## block ## id ## _ ## reg_name
 
+
+#define transform_regs(id)\
+[id] = {\
+		XFM_COMMON_REG_LIST_DCE100(id)\
+}
+
+static const struct dce110_transform_registers xfm_regs[] = {
+		transform_regs(0),
+		transform_regs(1),
+		transform_regs(2),
+		transform_regs(3),
+		transform_regs(4),
+		transform_regs(5)
+};
+
+static const struct dce110_transform_shift xfm_shift = {
+		XFM_COMMON_MASK_SH_LIST_DCE110(__SHIFT)
+};
+
+static const struct dce110_transform_mask xfm_mask = {
+		XFM_COMMON_MASK_SH_LIST_DCE110(_MASK)
+};
+
 #define aux_regs(id)\
 [id] = {\
 	AUX_REG_LIST(id)\
@@ -534,8 +522,7 @@ static void dce100_transform_destroy(struct transform **xfm)
 
 static struct transform *dce100_transform_create(
 	struct dc_context *ctx,
-	uint32_t inst,
-	const struct dce110_transform_reg_offsets *offsets)
+	uint32_t inst)
 {
 	struct dce110_transform *transform =
 		dm_alloc(sizeof(struct dce110_transform));
@@ -543,7 +530,8 @@ static struct transform *dce100_transform_create(
 	if (!transform)
 		return NULL;
 
-	if (dce110_transform_construct(transform, ctx, inst, offsets)) {
+	if (dce110_transform_construct(transform, ctx, inst,
+			&xfm_regs[inst], &xfm_shift, &xfm_mask)) {
 		transform->base.lb_memory_size = 0x6B0; /*1712*/
 		return &transform->base;
 	}
@@ -1030,8 +1018,7 @@ static bool construct(
 			goto res_create_fail;
 		}
 
-		pool->base.transforms[i] = dce100_transform_create(
-					ctx, i, &dce100_xfm_offsets[i]);
+		pool->base.transforms[i] = dce100_transform_create(ctx, i);
 		if (pool->base.transforms[i] == NULL) {
 			BREAK_TO_DEBUGGER();
 			dm_error(
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +22 -23

75 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +116 -424

759 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +290 -6

314 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +79 -363

561 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +60 -207

328 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h +1 -0
index c71f19cf94cd..c5dd2b1e8e1d 100644
@@ -26,6 +26,7 @@
 #define __DAL_TRANSFORM_V_DCE110_H__
 
 #include "transform.h"
+#include "dce110_transform.h"
 
 #define LB_TOTAL_NUMBER_OF_ENTRIES 1712
 #define LB_BITS_PER_ENTRY 144
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +26 -42

98 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h +1 -1
index a6217c189815..92299e36e3dd 100644
@@ -67,7 +67,7 @@ void dce80_transform_set_gamut_remap(
 	const struct xfm_grph_csc_adjustment *adjust);
 
 /* BIT DEPTH RELATED */
-bool dce80_transform_set_pixel_storage_depth(
+void dce80_transform_set_pixel_storage_depth(
 	struct transform *xfm,
 	enum lb_pixel_depth depth,
 	const struct bit_depth_reduction_params *bit_depth_params);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c +12 -19
index fbc4d53e027e..e74f7cfb0fe9 100644
@@ -617,13 +617,12 @@ static void set_denormalization(
 
 }
 
-bool dce80_transform_set_pixel_storage_depth(
+void dce80_transform_set_pixel_storage_depth(
 	struct transform *xfm,
 	enum lb_pixel_depth depth,
 	const struct bit_depth_reduction_params *bit_depth_params)
 {
 	struct dce80_transform *xfm80 = TO_DCE80_TRANSFORM(xfm);
-	bool ret = true;
 	uint32_t value;
 	enum dc_color_depth color_depth;
 
@@ -652,27 +651,21 @@ bool dce80_transform_set_pixel_storage_depth(
 		set_reg_field_value(value, 0, LB_DATA_FORMAT, PIXEL_EXPAN_MODE);
 		break;
 	default:
-		ret = false;
 		break;
 	}
 
-	if (ret == true) {
-		set_denormalization(xfm80, color_depth);
-		ret = program_bit_depth_reduction(xfm80, color_depth);
-
-		set_reg_field_value(value, 0, LB_DATA_FORMAT, ALPHA_EN);
-		dm_write_reg(
-				xfm->ctx, LB_REG(mmLB_DATA_FORMAT), value);
-		if (!(xfm80->lb_pixel_depth_supported & depth)) {
-			/*we should use unsupported capabilities
-			 *  unless it is required by w/a*/
-			dm_logger_write(xfm->ctx->logger, LOG_WARNING,
-				"%s: Capability not supported",
-				__func__);
-		}
+	set_denormalization(xfm80, color_depth);
+	program_bit_depth_reduction(xfm80, color_depth);
+
+	set_reg_field_value(value, 0, LB_DATA_FORMAT, ALPHA_EN);
+	dm_write_reg(xfm->ctx, LB_REG(mmLB_DATA_FORMAT), value);
+	if (!(xfm80->lb_pixel_depth_supported & depth)) {
+		/*we should use unsupported capabilities
+		 *  unless it is required by w/a*/
+		dm_logger_write(xfm->ctx->logger, LOG_WARNING,
+			"%s: Capability not supported",
+			__func__);
 	}
-
-	return ret;
 }
 
 
drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +47 -51

152 lines not on this page · raw message

Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#16 lore raw

PATCH 15/39 drm/amd/dal: drop dce80 transform code

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I6165e22617332b9effc8d4aaf00685b3a417f7e0
---
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   |  10 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   |   5 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c |   1 +
 drivers/gpu/drm/amd/dal/dc/dce80/Makefile          |   5 +-
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |  85 +--
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c | 103 ---
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h |  75 ---
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.c   | 671 -------------------
 .../amd/dal/dc/dce80/dce80_transform_bit_depth.h   |  37 --
 .../drm/amd/dal/dc/dce80/dce80_transform_gamut.c   | 269 --------
 .../gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c | 737 ---------------------
 11 files changed, 44 insertions(+), 1954 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.h
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_gamut.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +5 -5
index 02a29f3cc5d5..4079a64d6958 100644
@@ -684,13 +684,12 @@ bool dce110_transform_get_optimal_number_of_taps(
 	struct scaler_data *scl_data,
 	const struct scaling_taps *in_taps)
 {
-	uint32_t pixel_width;
-
+	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
+	int pixel_width = scl_data->viewport.width;
 
-	if (scl_data->viewport.width > scl_data->recout.width)
+	if (xfm110->prescaler_on &&
+			(scl_data->viewport.width > scl_data->recout.width))
 		pixel_width = scl_data->recout.width;
-	else
-		pixel_width = scl_data->viewport.width;
 
 	return transform_get_optimal_number_of_taps_helper(
 			xfm,
@@ -742,6 +741,7 @@ bool dce110_transform_construct(
 	xfm110->xfm_shift = xfm_shift;
 	xfm110->xfm_mask = xfm_mask;
 
+	xfm110->prescaler_on = true;
 	xfm110->lb_pixel_depth_supported =
 			LB_PIXEL_DEPTH_18BPP |
 			LB_PIXEL_DEPTH_24BPP |
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +3 -2
index d1f53816b4c5..f8f320ff2ee5 100644
@@ -111,7 +111,6 @@
 	XFM_SF(GAMUT_REMAP_C33_C34, GAMUT_REMAP_C34, mask_sh), \
 	XFM_SF(GAMUT_REMAP_CONTROL, GRPH_GAMUT_REMAP_MODE, mask_sh), \
 	XFM_SF(SCL_MODE, SCL_MODE, mask_sh), \
-	XFM_SF(SCL_MODE, SCL_PSCL_EN, mask_sh), \
 	XFM_SF(SCL_TAP_CONTROL, SCL_H_NUM_OF_TAPS, mask_sh), \
 	XFM_SF(SCL_TAP_CONTROL, SCL_V_NUM_OF_TAPS, mask_sh), \
 	XFM_SF(SCL_CONTROL, SCL_BOUNDARY_MODE, mask_sh), \
@@ -146,7 +145,8 @@
 #define XFM_COMMON_MASK_SH_LIST_DCE110(mask_sh)\
 	XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh),\
 	XFM_SF(DCFE_MEM_PWR_CTRL, SCL_COEFF_MEM_PWR_DIS, mask_sh), \
-	XFM_SF(DCFE_MEM_PWR_STATUS, SCL_COEFF_MEM_PWR_STATE, mask_sh)
+	XFM_SF(DCFE_MEM_PWR_STATUS, SCL_COEFF_MEM_PWR_STATE, mask_sh), \
+	XFM_SF(SCL_MODE, SCL_PSCL_EN, mask_sh)
 
 
 struct dce110_transform_shift {
@@ -336,6 +336,7 @@ struct dce110_transform {
 	const uint16_t *filter_v_c;
 	const uint16_t *filter_h_c;
 	uint32_t lb_pixel_depth_supported;
+	bool prescaler_on;
 };
 
 bool dce110_transform_construct(struct dce110_transform *xfm110,
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +1 -0
index 845859d2f102..497694721023 100644
@@ -699,6 +699,7 @@ bool dce110_transform_v_construct(
 			LB_PIXEL_DEPTH_24BPP |
 			LB_PIXEL_DEPTH_30BPP;
 
+	xfm110->prescaler_on = true;
 	xfm110->base.lb_bits_per_entry = LB_BITS_PER_ENTRY;
 	xfm110->base.lb_total_entries_num = LB_TOTAL_NUMBER_OF_ENTRIES;
 
drivers/gpu/drm/amd/dal/dc/dce80/Makefile +2 -3
index 863641ca07a6..fdcac289feec 100644
@@ -4,10 +4,9 @@
 
 DCE80 = dce80_ipp.o dce80_ipp_gamma.o dce80_opp.o \
 	dce80_opp_formatter.o dce80_opp_regamma.o \
-	dce80_timing_generator.o dce80_transform.o dce80_transform_gamut.o \
-	dce80_transform_scl.o dce80_opp_csc.o\
+	dce80_timing_generator.o dce80_opp_csc.o\
 	dce80_compressor.o dce80_mem_input.o dce80_hw_sequencer.o \
-	dce80_transform_bit_depth.o dce80_resource.o
+	dce80_resource.o
 
 AMD_DAL_DCE80 = $(addprefix $(AMDDALPATH)/dc/dce80/,$(DCE80))
 
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +33 -52

126 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c deleted +0 -103

103 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.h deleted +0 -75

75 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c deleted +0 -671

671 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.h deleted +0 -37
deleted file mode 100644
index beecefba16a5..000000000000
@@ -1,37 +0,0 @@
-/* Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DC_TRANSFORM_BIT_DEPTH_DCE80_H__
-#define __DC_TRANSFORM_BIT_DEPTH_DCE80_H__
-
-#include "dce80_transform.h"
-
-void dce80_transform_enable_alpha(
-	struct dce80_transform *xfm80,
-	bool enable);
-
-bool dce80_transform_is_prefetch_enabled(
-	struct dce80_transform *xfm80);
-
-#endif
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_gamut.c deleted +0 -269

269 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c deleted +0 -737

737 lines not on this page · raw message

Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#17 lore raw

PATCH 16/39 drm/amd/dal: Use macro to define transform reg sh and mask

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id Iacc1e470565f85fee6e29e249d7b0beb8ff999b9
---
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.c   |  35 +---
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform.h   | 203 +++++++--------------
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   |   3 +-
 3 files changed, 80 insertions(+), 161 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +10 -25
index 4079a64d6958..676aaa14eae8 100644
@@ -621,14 +621,20 @@ static uint32_t decide_taps(struct fixed31_32 ratio, uint32_t in_taps, bool chro
 	return taps;
 }
 
-bool transform_get_optimal_number_of_taps_helper(
+
+bool dce110_transform_get_optimal_number_of_taps(
 	struct transform *xfm,
 	struct scaler_data *scl_data,
-	uint32_t pixel_width,
-	const struct scaling_taps *in_taps) {
-
+	const struct scaling_taps *in_taps)
+{
+	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
+	int pixel_width = scl_data->viewport.width;
 	int max_num_of_lines;
 
+	if (xfm110->prescaler_on &&
+			(scl_data->viewport.width > scl_data->recout.width))
+		pixel_width = scl_data->recout.width;
+
 	max_num_of_lines = dce110_transform_get_max_num_of_supported_lines(
 		xfm,
 		scl_data->lb_params.depth,
@@ -676,27 +682,6 @@ bool transform_get_optimal_number_of_taps_helper(
 
 	/* we've got valid taps */
 	return true;
-
-}
-
-bool dce110_transform_get_optimal_number_of_taps(
-	struct transform *xfm,
-	struct scaler_data *scl_data,
-	const struct scaling_taps *in_taps)
-{
-	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
-	int pixel_width = scl_data->viewport.width;
-
-	if (xfm110->prescaler_on &&
-			(scl_data->viewport.width > scl_data->recout.width))
-		pixel_width = scl_data->recout.width;
-
-	return transform_get_optimal_number_of_taps_helper(
-			xfm,
-			scl_data,
-			pixel_width,
-			in_taps);
-
 }
 
 static void dce110_transform_reset(struct transform *xfm)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +68 -135

227 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +2 -1
index 31972312f3eb..db2be4bc639c 100644
@@ -128,6 +128,7 @@ static void program_multi_taps_filter(
 		phase 0 is unique and phase N/2 is unique if N is even*/
 		for (pair = 0; pair < taps_pairs; pair++) {
 			uint16_t odd_coeff = 0;
+			uint16_t even_coeff = coeffs[array_idx];
 
 			REG_SET_3(SCL_COEF_RAM_SELECT, 0,
 					SCL_C_RAM_FILTER_TYPE, filter_type,
@@ -143,7 +144,7 @@ static void program_multi_taps_filter(
 
 			REG_SET_4(SCL_COEF_RAM_TAP_DATA, 0,
 					SCL_C_RAM_EVEN_TAP_COEF_EN, 1,
-					SCL_C_RAM_EVEN_TAP_COEF, coeffs[array_idx],
+					SCL_C_RAM_EVEN_TAP_COEF, even_coeff,
 					SCL_C_RAM_ODD_TAP_COEF_EN, 1,
 					SCL_C_RAM_ODD_TAP_COEF, odd_coeff);
 		}
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#18 lore raw

PATCH 17/39 drm/amd/dal: drop scaler bypass function

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I87543da0cde5fbaf6617f14ac95933cfe68379c2
---
 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c +2 -9
index db2be4bc639c..3a782e7a1b60 100644
@@ -39,14 +39,6 @@
 #define CTX \
 	xfm110->base.ctx
 
-static void dce110_transform_set_scaler_bypass(
-		struct transform *xfm,
-		const struct scaler_data *scl_data)
-{
-	struct dce110_transform *xfm110 = TO_DCE110_TRANSFORM(xfm);
-
-	REG_UPDATE_2(SCL_MODE, SCL_MODE, 0, SCL_PSCL_EN, 0);
-}
 
 static bool setup_scaling_configuration(
 	struct dce110_transform *xfm110,
@@ -55,7 +47,8 @@ static bool setup_scaling_configuration(
 	struct dc_context *ctx = xfm110->base.ctx;
 
 	if (data->taps.h_taps + data->taps.v_taps <= 2) {
-		dce110_transform_set_scaler_bypass(&xfm110->base, NULL);
+		/* Set bypass */
+		REG_UPDATE_2(SCL_MODE, SCL_MODE, 0, SCL_PSCL_EN, 0);
 		return false;
 	}
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#19 lore raw

PATCH 18/39 drm/amd/dal: clean transform.h

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id I39db89fb7cf9d1b890556bbf486b04aa17a18251
---
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +4 -20
index 82c788af90f2..4f5c1ff03050 100644
@@ -30,6 +30,8 @@
 #include "calcs/scaler_filter.h"
 #include "dc_hw_types.h"
 
+#define CSC_TEMPERATURE_MATRIX_SIZE 9
+
 struct bit_depth_reduction_params;
 
 struct transform {
@@ -51,15 +53,6 @@ enum lb_pixel_depth {
 	LB_PIXEL_DEPTH_36BPP = 8
 };
 
-enum raw_gamma_ramp_type {
-	GAMMA_RAMP_TYPE_UNINITIALIZED,
-	GAMMA_RAMP_TYPE_DEFAULT,
-	GAMMA_RAMP_TYPE_RGB256,
-	GAMMA_RAMP_TYPE_FIXED_POINT
-};
-
-#define NUM_OF_RAW_GAMMA_RAMP_RGB_256 256
-
 /* Colorimetry */
 enum colorimetry {
 	COLORIMETRY_NO_DATA = 0,
@@ -69,7 +62,8 @@ enum colorimetry {
 };
 
 enum active_format_info {
-	ACTIVE_FORMAT_NO_DATA = 0, ACTIVE_FORMAT_VALID = 1
+	ACTIVE_FORMAT_NO_DATA = 0,
+	ACTIVE_FORMAT_VALID = 1
 };
 
 /* Active format aspect ratio */
@@ -116,8 +110,6 @@ enum graphics_gamut_adjust_type {
 	GRAPHICS_GAMUT_ADJUST_TYPE_SW /* use adjustments */
 };
 
-#define CSC_TEMPERATURE_MATRIX_SIZE 9
-
 struct xfm_grph_csc_adjustment {
 	struct fixed31_32 temperature_matrix[CSC_TEMPERATURE_MATRIX_SIZE];
 	enum graphics_gamut_adjust_type gamut_adjust_type;
@@ -166,8 +158,6 @@ struct scaler_data {
 struct transform_funcs {
 	void (*transform_reset)(struct transform *xfm);
 
-	bool (*transform_power_up)(struct transform *xfm);
-
 	void (*transform_set_scaler)(struct transform *xfm,
 			const struct scaler_data *scl_data);
 
@@ -186,12 +176,6 @@ struct transform_funcs {
 			const struct scaling_taps *in_taps);
 };
 
-bool transform_get_optimal_number_of_taps_helper(
-		struct transform *xfm,
-		struct scaler_data *scl_data,
-		uint32_t pixel_width,
-		const struct scaling_taps *in_taps);
-
 extern const uint16_t filter_2tap_16p[18];
 extern const uint16_t filter_2tap_64p[66];
 const uint16_t *get_filter_3tap_16p(struct fixed31_32 ratio);
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#20 lore raw

PATCH 19/39 drm/amd/dal: remove scaler filter calculator from dc

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id Id6b4d69c436964b3a42646a8c08829cacb4189f7
---
 drivers/gpu/drm/amd/dal/dc/calcs/Makefile         |    2 +-
 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.c  | 2012 ---------------------
 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.h  |   75 -
 drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c  |  156 ++
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c |   11 -
 drivers/gpu/drm/amd/dal/dc/inc/core_types.h       |    2 -
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h     |    2 +-
 7 files changed, 158 insertions(+), 2102 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.c
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.h
drivers/gpu/drm/amd/dal/dc/calcs/Makefile +1 -1
index 9ac4ad1ba320..292d7a71ce52 100644
@@ -3,7 +3,7 @@
 # It calculates Bandwidth and Watermarks values for HW programming
 #
 
-BW_CALCS = bandwidth_calcs.o bw_fixed.o scaler_filter.o gamma_calcs.o
+BW_CALCS = bandwidth_calcs.o bw_fixed.o gamma_calcs.o
 
 AMD_DAL_BW_CALCS = $(addprefix $(AMDDALPATH)/dc/calcs/,$(BW_CALCS))
 
drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.c deleted +0 -2012

2,012 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/calcs/scaler_filter.h deleted +0 -75

75 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce/dce_scl_filters.c +156 -0

168 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +0 -11
index 48dd7c600619..735d4ad1c17d 100644
@@ -646,9 +646,6 @@ static void destruct(struct dce110_resource_pool *pool)
 		dal_display_clock_destroy(&pool->base.display_clock);
 	}
 
-	if (pool->base.scaler_filter != NULL) {
-		dal_scaler_filter_destroy(&pool->base.scaler_filter);
-	}
 	if (pool->base.irqs != NULL) {
 		dal_irq_service_destroy(&pool->base.irqs);
 	}
@@ -979,13 +976,6 @@ static bool construct(
 			goto res_create_fail;
 	}
 
-	pool->base.scaler_filter = dal_scaler_filter_create(ctx);
-	if (pool->base.scaler_filter == NULL) {
-		BREAK_TO_DEBUGGER();
-		dm_error("DC: failed to create filter!\n");
-		goto res_create_fail;
-	}
-
 	for (i = 0; i < pool->base.pipe_count; i++) {
 		pool->base.timing_generators[i] = dce80_timing_generator_create(
 				ctx, i, &dce80_tg_offsets[i]);
@@ -1016,7 +1006,6 @@ static bool construct(
 			dm_error("DC: failed to create transform!\n");
 			goto res_create_fail;
 		}
-		pool->base.transforms[i]->filter = pool->base.scaler_filter;
 
 		pool->base.opps[i] = dce80_opp_create(ctx, i);
 		if (pool->base.opps[i] == NULL) {
drivers/gpu/drm/amd/dal/dc/inc/core_types.h +0 -2
index 3fca7ec3cec8..e7f510b7d88f 100644
@@ -236,8 +236,6 @@ struct audio_support{
 };
 
 struct resource_pool {
-	struct scaler_filter * scaler_filter;
-
 	struct mem_input *mis[MAX_PIPES];
 	struct input_pixel_processor *ipps[MAX_PIPES];
 	struct transform *transforms[MAX_PIPES];
drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +1 -1
index 4f5c1ff03050..c1a90ffbe304 100644
@@ -27,7 +27,6 @@
 #define __DAL_TRANSFORM_H__
 
 #include "include/scaler_types.h"
-#include "calcs/scaler_filter.h"
 #include "dc_hw_types.h"
 
 #define CSC_TEMPERATURE_MATRIX_SIZE 9
@@ -179,6 +178,7 @@ struct transform_funcs {
 extern const uint16_t filter_2tap_16p[18];
 extern const uint16_t filter_2tap_64p[66];
 const uint16_t *get_filter_3tap_16p(struct fixed31_32 ratio);
+const uint16_t *get_filter_3tap_64p(struct fixed31_32 ratio);
 const uint16_t *get_filter_4tap_16p(struct fixed31_32 ratio);
 const uint16_t *get_filter_4tap_64p(struct fixed31_32 ratio);
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#21 lore raw

PATCH 20/39 drm/amd/dal: fix memory leak pointed out by Juha Leppänen <[email protected]>

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

Change-Id If6a337b16b78e1dd8a952d6c1064426961f6d5a7
---
 drivers/gpu/drm/amd/dal/dc/core/dc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -1
index 6e32f1bd935c..aaf61a1feb47 100644
@@ -449,7 +449,7 @@ static void destruct(struct core_dc *dc)
 	resource_validate_ctx_destruct(dc->current_context);
 
 	dm_free(dc->temp_flip_context);
-	dc->current_context = NULL;
+	dc->temp_flip_context = NULL;
 
 	destroy_links(dc);
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#22 lore raw

PATCH 21/39 drm/amd/dal: move out transform code to dce_transform

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id Idc84756e1de765dd1588d845a93a95e9259a783b
---
 drivers/gpu/drm/amd/dal/dc/basics/conversion.h     |   2 +
 drivers/gpu/drm/amd/dal/dc/dc_hw_types.h           |   2 +
 drivers/gpu/drm/amd/dal/dc/dce/Makefile            |   2 +-
 .../dce110_transform.c => dce/dce_transform.c}     | 411 +++++++++++++++++----
 .../dce110_transform.h => dce/dce_transform.h}     |  64 ++--
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |  16 +-
 drivers/gpu/drm/amd/dal/dc/dce110/Makefile         |   3 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c    |  18 +-
 .../drm/amd/dal/dc/dce110/dce110_transform_scl.c   | 313 ----------------
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 111 +++---
 .../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h |   5 +-
 .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c    |  16 +-
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |  16 +-
 drivers/gpu/drm/amd/dal/dc/inc/core_types.h        |   2 -
 drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h      |  40 +-
 .../drm/amd/dal/include/display_clock_interface.h  |   1 -
 drivers/gpu/drm/amd/dal/include/scaler_types.h     |  61 ---
 17 files changed, 493 insertions(+), 590 deletions(-)
 rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_transform.c => dce/dce_transform.c} (64%)
 rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_transform.h => dce/dce_transform.h} (87%)
 delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c
 delete mode 100644 drivers/gpu/drm/amd/dal/include/scaler_types.h
drivers/gpu/drm/amd/dal/dc/basics/conversion.h +2 -0
index 24ff47352688..18cbe41e80ff 100644
@@ -26,6 +26,8 @@
 #ifndef __DAL_CONVERSION_H__
 #define __DAL_CONVERSION_H__
 
+#include "include/fixed31_32.h"
+
 uint16_t fixed_point_to_int_frac(
 	struct fixed31_32 arg,
 	uint8_t integer_bits,
drivers/gpu/drm/amd/dal/dc/dc_hw_types.h +2 -0
index 29e65a42930c..5605a5c96da7 100644
@@ -26,6 +26,8 @@
 #ifndef DC_HW_TYPES_H
 #define DC_HW_TYPES_H
 
+#include "os_types.h"
+
 /******************************************************************************
  * Data types for Virtual HW Layer of DAL3.
  * (see DAL3 design documents for HW Layer definition)
drivers/gpu/drm/amd/dal/dc/dce/Makefile +1 -1
index 6feb1755a60f..87e5f11024ca 100644
@@ -6,7 +6,7 @@
 #     offset/shift/mask stored in dce_hw struct
 
 DCE = dce_audio.o dce_stream_encoder.o dce_link_encoder.o dce_hwseq.o \
-dce_mem_input.o dce_scl_filters.o
+dce_mem_input.o dce_scl_filters.o dce_transform.o
 
 AMD_DAL_DCE = $(addprefix $(AMDDALPATH)/dc/dce/,$(DCE))
 
drivers/gpu/drm/amd/dal/dc/dce/dce_transform.c renamed from drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +337 -74

614 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce/dce_transform.h renamed from drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.h +42 -22

105 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +8 -8
index 951d8fb31914..6c17a52df574 100644
@@ -39,7 +39,7 @@
 #include "dce110/dce110_mem_input.h"
 #include "dce110/dce110_mem_input_v.h"
 #include "dce110/dce110_ipp.h"
-#include "dce110/dce110_transform.h"
+#include "dce/dce_transform.h"
 #include "dce110/dce110_opp.h"
 #include "dce110/dce110_clock_source.h"
 #include "dce/dce_audio.h"
@@ -216,7 +216,7 @@ static const struct dce110_ipp_reg_offsets dce100_ipp_reg_offsets[] = {
 		XFM_COMMON_REG_LIST_DCE100(id)\
 }
 
-static const struct dce110_transform_registers xfm_regs[] = {
+static const struct dce_transform_registers xfm_regs[] = {
 		transform_regs(0),
 		transform_regs(1),
 		transform_regs(2),
@@ -225,11 +225,11 @@ static const struct dce110_transform_registers xfm_regs[] = {
 		transform_regs(5)
 };
 
-static const struct dce110_transform_shift xfm_shift = {
+static const struct dce_transform_shift xfm_shift = {
 		XFM_COMMON_MASK_SH_LIST_DCE110(__SHIFT)
 };
 
-static const struct dce110_transform_mask xfm_mask = {
+static const struct dce_transform_mask xfm_mask = {
 		XFM_COMMON_MASK_SH_LIST_DCE110(_MASK)
 };
 
@@ -516,7 +516,7 @@ static struct mem_input *dce100_mem_input_create(
 
 static void dce100_transform_destroy(struct transform **xfm)
 {
-	dm_free(TO_DCE110_TRANSFORM(*xfm));
+	dm_free(TO_DCE_TRANSFORM(*xfm));
 	*xfm = NULL;
 }
 
@@ -524,13 +524,13 @@ static struct transform *dce100_transform_create(
 	struct dc_context *ctx,
 	uint32_t inst)
 {
-	struct dce110_transform *transform =
-		dm_alloc(sizeof(struct dce110_transform));
+	struct dce_transform *transform =
+		dm_alloc(sizeof(struct dce_transform));
 
 	if (!transform)
 		return NULL;
 
-	if (dce110_transform_construct(transform, ctx, inst,
+	if (dce_transform_construct(transform, ctx, inst,
 			&xfm_regs[inst], &xfm_shift, &xfm_mask)) {
 		transform->base.lb_memory_size = 0x6B0; /*1712*/
 		return &transform->base;
drivers/gpu/drm/amd/dal/dc/dce110/Makefile +1 -2
index 83d83df4e07b..cb6bb24e6298 100644
@@ -5,11 +5,10 @@
 DCE110 = dce110_ipp.o dce110_ipp_cursor.o \
 dce110_ipp_gamma.o dce110_opp.o dce110_opp_csc.o \
 dce110_timing_generator.o dce110_opp_formatter.o dce110_opp_regamma.o \
-dce110_transform.o dce110_transform_scl.o dce110_transform_v.o \
 dce110_compressor.o dce110_mem_input.o dce110_hw_sequencer.o \
 dce110_resource.o dce110_clock_source.o \
 dce110_opp_regamma_v.o dce110_opp_csc_v.o dce110_timing_generator_v.o \
-dce110_mem_input_v.o dce110_opp_v.o
+dce110_mem_input_v.o dce110_opp_v.o dce110_transform_v.o
 
 AMD_DAL_DCE110 = $(addprefix $(AMDDALPATH)/dc/dce110/,$(DCE110))
 
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +9 -9
index 802e22f263b3..7731f80db2fb 100644
@@ -41,7 +41,7 @@
 #include "dce110/dce110_mem_input.h"
 #include "dce110/dce110_mem_input_v.h"
 #include "dce110/dce110_ipp.h"
-#include "dce110/dce110_transform.h"
+#include "dce/dce_transform.h"
 #include "dce110/dce110_transform_v.h"
 #include "dce110/dce110_opp.h"
 #include "dce110/dce110_opp_v.h"
@@ -188,17 +188,17 @@ static const struct dce110_ipp_reg_offsets dce110_ipp_reg_offsets[] = {
 		XFM_COMMON_REG_LIST_DCE110(id)\
 }
 
-static const struct dce110_transform_registers xfm_regs[] = {
+static const struct dce_transform_registers xfm_regs[] = {
 		transform_regs(0),
 		transform_regs(1),
 		transform_regs(2)
 };
 
-static const struct dce110_transform_shift xfm_shift = {
+static const struct dce_transform_shift xfm_shift = {
 		XFM_COMMON_MASK_SH_LIST_DCE110(__SHIFT)
 };
 
-static const struct dce110_transform_mask xfm_mask = {
+static const struct dce_transform_mask xfm_mask = {
 		XFM_COMMON_MASK_SH_LIST_DCE110(_MASK)
 };
 
@@ -506,7 +506,7 @@ static struct mem_input *dce110_mem_input_create(
 
 static void dce110_transform_destroy(struct transform **xfm)
 {
-	dm_free(TO_DCE110_TRANSFORM(*xfm));
+	dm_free(TO_DCE_TRANSFORM(*xfm));
 	*xfm = NULL;
 }
 
@@ -514,13 +514,13 @@ static struct transform *dce110_transform_create(
 	struct dc_context *ctx,
 	uint32_t inst)
 {
-	struct dce110_transform *transform =
-		dm_alloc(sizeof(struct dce110_transform));
+	struct dce_transform *transform =
+		dm_alloc(sizeof(struct dce_transform));
 
 	if (!transform)
 		return NULL;
 
-	if (dce110_transform_construct(transform, ctx, inst,
+	if (dce_transform_construct(transform, ctx, inst,
 			&xfm_regs[inst], &xfm_shift, &xfm_mask))
 		return &transform->base;
 
@@ -1094,7 +1094,7 @@ static const struct resource_funcs dce110_res_pool_funcs = {
 static void underlay_create(struct dc_context *ctx, struct resource_pool *pool)
 {
 	struct dce110_timing_generator *dce110_tgv = dm_alloc(sizeof (*dce110_tgv));
-	struct dce110_transform *dce110_xfmv = dm_alloc(sizeof (*dce110_xfmv));
+	struct dce_transform *dce110_xfmv = dm_alloc(sizeof (*dce110_xfmv));
 	struct dce110_mem_input *dce110_miv = dm_alloc(sizeof (*dce110_miv));
 	struct dce110_opp *dce110_oppv = dm_alloc(sizeof (*dce110_oppv));
 
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_scl.c deleted +0 -313

313 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +54 -57

292 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.h +2 -3
index c5dd2b1e8e1d..267af34db3e5 100644
@@ -25,14 +25,13 @@
 #ifndef __DAL_TRANSFORM_V_DCE110_H__
 #define __DAL_TRANSFORM_V_DCE110_H__
 
-#include "transform.h"
-#include "dce110_transform.h"
+#include "../dce/dce_transform.h"
 
 #define LB_TOTAL_NUMBER_OF_ENTRIES 1712
 #define LB_BITS_PER_ENTRY 144
 
 bool dce110_transform_v_construct(
-	struct dce110_transform *xfm110,
+	struct dce_transform *xfm110,
 	struct dc_context *ctx);
 
 #endif
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +8 -8
index defc067d9236..5fbec7d3759f 100644
@@ -36,7 +36,7 @@
 #include "dce112/dce112_mem_input.h"
 
 #include "irq/dce110/irq_service_dce110.h"
-#include "dce110/dce110_transform.h"
+#include "dce/dce_transform.h"
 #include "dce/dce_link_encoder.h"
 #include "dce/dce_stream_encoder.h"
 #include "dce/dce_audio.h"
@@ -210,7 +210,7 @@ static const struct dce110_ipp_reg_offsets ipp_reg_offsets[] = {
 		XFM_COMMON_REG_LIST_DCE110(id)\
 }
 
-static const struct dce110_transform_registers xfm_regs[] = {
+static const struct dce_transform_registers xfm_regs[] = {
 		transform_regs(0),
 		transform_regs(1),
 		transform_regs(2),
@@ -219,11 +219,11 @@ static const struct dce110_transform_registers xfm_regs[] = {
 		transform_regs(5)
 };
 
-static const struct dce110_transform_shift xfm_shift = {
+static const struct dce_transform_shift xfm_shift = {
 		XFM_COMMON_MASK_SH_LIST_DCE110(__SHIFT)
 };
 
-static const struct dce110_transform_mask xfm_mask = {
+static const struct dce_transform_mask xfm_mask = {
 		XFM_COMMON_MASK_SH_LIST_DCE110(_MASK)
 };
 
@@ -540,7 +540,7 @@ static struct mem_input *dce112_mem_input_create(
 
 static void dce112_transform_destroy(struct transform **xfm)
 {
-	dm_free(TO_DCE110_TRANSFORM(*xfm));
+	dm_free(TO_DCE_TRANSFORM(*xfm));
 	*xfm = NULL;
 }
 
@@ -548,13 +548,13 @@ static struct transform *dce112_transform_create(
 	struct dc_context *ctx,
 	uint32_t inst)
 {
-	struct dce110_transform *transform =
-		dm_alloc(sizeof(struct dce110_transform));
+	struct dce_transform *transform =
+		dm_alloc(sizeof(struct dce_transform));
 
 	if (!transform)
 		return NULL;
 
-	if (dce110_transform_construct(transform, ctx, inst,
+	if (dce_transform_construct(transform, ctx, inst,
 			&xfm_regs[inst], &xfm_shift, &xfm_mask)) {
 		transform->base.lb_memory_size = 0x1404; /*5124*/
 		return &transform->base;
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +8 -8
index 735d4ad1c17d..d2fd25b97996 100644
@@ -41,7 +41,7 @@
 #include "dce/dce_stream_encoder.h"
 #include "dce80/dce80_mem_input.h"
 #include "dce80/dce80_ipp.h"
-#include "dce110/dce110_transform.h"
+#include "dce/dce_transform.h"
 #include "dce80/dce80_opp.h"
 #include "dce110/dce110_ipp.h"
 #include "dce110/dce110_clock_source.h"
@@ -217,7 +217,7 @@ static const struct dce110_ipp_reg_offsets ipp_reg_offsets[] = {
 		XFM_COMMON_REG_LIST_DCE_BASE(id)\
 }
 
-static const struct dce110_transform_registers xfm_regs[] = {
+static const struct dce_transform_registers xfm_regs[] = {
 		transform_regs(0),
 		transform_regs(1),
 		transform_regs(2),
@@ -226,11 +226,11 @@ static const struct dce110_transform_registers xfm_regs[] = {
 		transform_regs(5)
 };
 
-static const struct dce110_transform_shift xfm_shift = {
+static const struct dce_transform_shift xfm_shift = {
 		XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(__SHIFT)
 };
 
-static const struct dce110_transform_mask xfm_mask = {
+static const struct dce_transform_mask xfm_mask = {
 		XFM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(_MASK)
 };
 
@@ -498,7 +498,7 @@ static struct mem_input *dce80_mem_input_create(
 
 static void dce80_transform_destroy(struct transform **xfm)
 {
-	dm_free(TO_DCE110_TRANSFORM(*xfm));
+	dm_free(TO_DCE_TRANSFORM(*xfm));
 	*xfm = NULL;
 }
 
@@ -506,13 +506,13 @@ static struct transform *dce80_transform_create(
 	struct dc_context *ctx,
 	uint32_t inst)
 {
-	struct dce110_transform *transform =
-		dm_alloc(sizeof(struct dce110_transform));
+	struct dce_transform *transform =
+		dm_alloc(sizeof(struct dce_transform));
 
 	if (!transform)
 		return NULL;
 
-	if (dce110_transform_construct(transform, ctx, inst,
+	if (dce_transform_construct(transform, ctx, inst,
 			&xfm_regs[inst], &xfm_shift, &xfm_mask)) {
 		transform->prescaler_on = false;
 		transform->base.lb_memory_size = 0x6B0; /*1712*/
drivers/gpu/drm/amd/dal/dc/inc/core_types.h +0 -2
index e7f510b7d88f..f2eb8945d5c4 100644
@@ -29,7 +29,6 @@
 #include "dc.h"
 #include "bandwidth_calcs.h"
 #include "ddc_service_types.h"
-#include "scaler_types.h"
 #include "dc_bios_types.h"
 
 struct core_stream;
@@ -76,7 +75,6 @@ void enable_surface_flip_reporting(struct dc_surface *dc_surface,
 #include "stream_encoder.h"
 #include "clock_source.h"
 #include "audio.h"
-#include "scaler_types.h"
 #include "hw_sequencer_types.h"
 #include "opp.h"
 
drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +19 -21
index c1a90ffbe304..7f88272f8290 100644
@@ -26,8 +26,8 @@
 #ifndef __DAL_TRANSFORM_H__
 #define __DAL_TRANSFORM_H__
 
-#include "include/scaler_types.h"
 #include "dc_hw_types.h"
+#include "fixed31_32.h"
 
 #define CSC_TEMPERATURE_MATRIX_SIZE 9
 
@@ -36,22 +36,13 @@ struct bit_depth_reduction_params;
 struct transform {
 	const struct transform_funcs *funcs;
 	struct dc_context *ctx;
-	uint32_t inst;
-	struct scaler_filter *filter;
+	int inst;
 
 	int lb_total_entries_num;
 	int lb_bits_per_entry;
 	unsigned int lb_memory_size;
 };
 
-enum lb_pixel_depth {
-	/* do not change the values because it is used as bit vector */
-	LB_PIXEL_DEPTH_18BPP = 1,
-	LB_PIXEL_DEPTH_24BPP = 2,
-	LB_PIXEL_DEPTH_30BPP = 4,
-	LB_PIXEL_DEPTH_36BPP = 8
-};
-
 /* Colorimetry */
 enum colorimetry {
 	COLORIMETRY_NO_DATA = 0,
@@ -114,12 +105,19 @@ struct xfm_grph_csc_adjustment {
 	enum graphics_gamut_adjust_type gamut_adjust_type;
 };
 
-/*overscan or window*/
+enum lb_pixel_depth {
+	/* do not change the values because it is used as bit vector */
+	LB_PIXEL_DEPTH_18BPP = 1,
+	LB_PIXEL_DEPTH_24BPP = 2,
+	LB_PIXEL_DEPTH_30BPP = 4,
+	LB_PIXEL_DEPTH_36BPP = 8
+};
+
 struct overscan_info {
-	uint32_t left;
-	uint32_t right;
-	uint32_t top;
-	uint32_t bottom;
+	int left;
+	int right;
+	int top;
+	int bottom;
 };
 
 struct scaling_ratios {
@@ -130,21 +128,21 @@ struct scaling_ratios {
 };
 
 struct sharpness_adj {
-	uint32_t horz;
-	uint32_t vert;
+	int horz;
+	int vert;
 };
 
 struct line_buffer_params {
 	bool alpha_en;
 	bool pixel_expan_mode;
 	bool interleave_en;
-	uint32_t dynamic_pixel_depth;
+	int dynamic_pixel_depth;
 	enum lb_pixel_depth depth;
 };
 
 struct scaler_data {
-	uint32_t h_active;
-	uint32_t v_active;
+	int h_active;
+	int v_active;
 	struct scaling_taps taps;
 	struct rect viewport;
 	struct rect recout;
drivers/gpu/drm/amd/dal/include/display_clock_interface.h +0 -1
index 4556f4c8e388..2006fa21f54c 100644
@@ -29,7 +29,6 @@
 #include "hw_sequencer_types.h"
 #include "grph_object_defs.h"
 #include "signal_types.h"
-#include "scaler_types.h"
 
 /* Timing related information*/
 struct dc_timing_params {
drivers/gpu/drm/amd/dal/include/scaler_types.h deleted +0 -61

61 lines not on this page · raw message

Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#23 lore raw

PATCH 22/39 drm/amd/dal: fix infinite loop

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

- exposed by LCD enabled bios. root cause not understood yet

Change-Id I604432224856512b4d4f24da8ccc63b91395f1a0
---
 drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +1 -1
index 620ef03651f1..11cc05f9a3a0 100644
@@ -1040,7 +1040,7 @@ static bool construct(
 
 	link->public.link_enc_hw_inst = link->link_enc->transmitter;
 
-	for (i = 0; ; i++) {
+	for (i = 0; i < 4; i++) {
 		if (BP_RESULT_OK !=
 				bp_funcs->get_device_tag(dc_ctx->dc_bios, link->link_id, i, &link->device_tag)) {
 			DC_ERROR("Failed to find device tag!\n");
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#24 lore raw

PATCH 23/39 drm/amd/dal: Only set backlight level for eDP panel.

In reply to a message not in the archive

From: Yongqiang Sun <[email protected]>

Change-Id I67af5009aa86ea256e42c02ac902fe28f4ca65a4
---
 drivers/gpu/drm/amd/dal/dc/core/dc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +5 -3
index aaf61a1feb47..dbd7b4b6bfe9 100644
@@ -261,9 +261,11 @@ static bool set_backlight(struct dc *dc, unsigned int backlight_level,
 	struct core_dc *core_dc = DC_TO_CORE(dc);
 	int i;
 
-	for (i = 0; i < core_dc->link_count; i++)
-		dc_link_set_backlight_level(&core_dc->links[i]->public,
-				backlight_level, frame_ramp, stream);
+	if (stream->sink->sink_signal == SIGNAL_TYPE_EDP) {
+		for (i = 0; i < core_dc->link_count; i++)
+			dc_link_set_backlight_level(&core_dc->links[i]->public,
+					backlight_level, frame_ramp, stream);
+	}
 
 	return true;
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#25 lore raw

PATCH 24/39 drm/amd/dal: consolidate mem_input

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

- dce_mem_input_allocate_dmif
- dce_mem_input_free_dmif
- mem_input_program_display_marks (DCE11.2)

- also fix MC_HUB_RDREQ_DMIF_LIMIT wa is different in different DCE

- also add more robust error checking in new programming model -- more asserts

Change-Id Iea64d3c771375ff3d09ea4e7d15be4c63fe0ca32
---
 drivers/gpu/drm/amd/dal/dc/dc_helper.c             |   6 +-
 drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.c     | 191 ++++++++++
 drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.h     |  91 ++++-
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |  16 +-
 .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c   | 205 +----------
 .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c    |  17 +-
 .../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c   | 384 +--------------------
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c | 126 +------
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |  17 +-
 drivers/gpu/drm/amd/dal/dc/dm_services.h           |   8 +-
 drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h      |   1 +
 drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h        |   2 +-
 12 files changed, 334 insertions(+), 730 deletions(-)
drivers/gpu/drm/amd/dal/dc/dc_helper.c +4 -2
index 96724ba17e4b..22b72f0bcbbc 100644
@@ -114,7 +114,8 @@ uint32_t generic_reg_get(const struct dc_context *ctx,
 
 uint32_t generic_reg_wait(const struct dc_context *ctx,
 	uint32_t addr, uint32_t shift, uint32_t mask, uint32_t condition_value,
-	unsigned int delay_between_poll_us, unsigned int time_out_num_tries)
+	unsigned int delay_between_poll_us, unsigned int time_out_num_tries,
+	const char *func_name)
 {
 	uint32_t field_value;
 	uint32_t reg_val;
@@ -137,6 +138,7 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
 			return reg_val;
 	}
 
-	BREAK_TO_DEBUGGER();
+	DC_ERR("REG_WAIT timeout %dus * %d tries - ",
+			delay_between_poll_us, time_out_num_tries, func_name);
 	return reg_val;
 }
drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.c +191 -0

200 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.h +87 -4

134 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +13 -3
index 6c17a52df574..851247c647a1 100644
@@ -51,6 +51,10 @@
 #include "dce/dce_10_0_d.h"
 #include "dce/dce_10_0_sh_mask.h"
 
+#ifndef mmMC_HUB_RDREQ_DMIF_LIMIT
+#include "gmc/gmc_8_2_d.h"
+#include "gmc/gmc_8_2_sh_mask.h"
+#endif
 
 #ifndef mmDP_DPHY_INTERNAL_CTRL
 	#define mmDP_DPHY_INTERNAL_CTRL 0x4aa7
@@ -471,7 +475,10 @@ static const struct resource_create_funcs res_create_funcs = {
 	.create_hwseq = dce100_hwseq_create,
 };
 
-#define mi_inst_regs(id) { MI_REG_LIST(id) }
+#define mi_inst_regs(id) { \
+	MI_REG_LIST(id), \
+	.MC_HUB_RDREQ_DMIF_LIMIT = mmMC_HUB_RDREQ_DMIF_LIMIT \
+}
 static const struct dce_mem_input_registers mi_regs[] = {
 		mi_inst_regs(0),
 		mi_inst_regs(1),
@@ -482,11 +489,13 @@ static const struct dce_mem_input_registers mi_regs[] = {
 };
 
 static const struct dce_mem_input_shift mi_shifts = {
-		MI_DCE_MASK_SH_LIST(__SHIFT)
+		MI_DCE_MASK_SH_LIST(__SHIFT),
+		.ENABLE = MC_HUB_RDREQ_DMIF_LIMIT__ENABLE__SHIFT
 };
 
 static const struct dce_mem_input_mask mi_masks = {
-		MI_DCE_MASK_SH_LIST(_MASK)
+		MI_DCE_MASK_SH_LIST(_MASK),
+		.ENABLE = MC_HUB_RDREQ_DMIF_LIMIT__ENABLE_MASK
 };
 
 static struct mem_input *dce100_mem_input_create(
@@ -506,6 +515,7 @@ static struct mem_input *dce100_mem_input_create(
 		mi->regs = &mi_regs[inst];
 		mi->shifts = &mi_shifts;
 		mi->masks = &mi_masks;
+		mi->wa.single_head_rdreq_dmif_limit = 2;
 		return mi;
 	}
 
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +2 -203

214 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +14 -3
index 7731f80db2fb..dac53df2cb86 100644
@@ -54,6 +54,11 @@
 #include "dce/dce_11_0_d.h"
 #include "dce/dce_11_0_sh_mask.h"
 
+#ifndef mmMC_HUB_RDREQ_DMIF_LIMIT
+#include "gmc/gmc_8_2_d.h"
+#include "gmc/gmc_8_2_sh_mask.h"
+#endif
+
 #ifndef mmDP_DPHY_INTERNAL_CTRL
 	#define mmDP_DPHY_INTERNAL_CTRL 0x4aa7
 	#define mmDP0_DP_DPHY_INTERNAL_CTRL 0x4aa7
@@ -464,7 +469,10 @@ static const struct resource_create_funcs res_create_funcs = {
 	.create_hwseq = dce110_hwseq_create,
 };
 
-#define mi_inst_regs(id) { MI_REG_LIST(id) }
+#define mi_inst_regs(id) { \
+	MI_REG_LIST(id), \
+	.MC_HUB_RDREQ_DMIF_LIMIT = mmMC_HUB_RDREQ_DMIF_LIMIT \
+}
 static const struct dce_mem_input_registers mi_regs[] = {
 		mi_inst_regs(0),
 		mi_inst_regs(1),
@@ -472,11 +480,13 @@ static const struct dce_mem_input_registers mi_regs[] = {
 };
 
 static const struct dce_mem_input_shift mi_shifts = {
-		MI_DCE_MASK_SH_LIST(__SHIFT)
+		MI_DCE_MASK_SH_LIST(__SHIFT),
+		.ENABLE = MC_HUB_RDREQ_DMIF_LIMIT__ENABLE__SHIFT
 };
 
 static const struct dce_mem_input_mask mi_masks = {
-		MI_DCE_MASK_SH_LIST(_MASK)
+		MI_DCE_MASK_SH_LIST(_MASK),
+		.ENABLE = MC_HUB_RDREQ_DMIF_LIMIT__ENABLE_MASK
 };
 
 static struct mem_input *dce110_mem_input_create(
@@ -496,6 +506,7 @@ static struct mem_input *dce110_mem_input_create(
 		mi->regs = &mi_regs[inst];
 		mi->shifts = &mi_shifts;
 		mi->masks = &mi_masks;
+		mi->wa.single_head_rdreq_dmif_limit = 3;
 		return mi;
 	}
 
drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c +1 -383

396 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c +2 -124

135 lines not on this page · raw message

drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +14 -3
index d2fd25b97996..73110341cb4d 100644
@@ -56,6 +56,11 @@
 
 /* TODO remove this include */
 
+#ifndef mmMC_HUB_RDREQ_DMIF_LIMIT
+#include "gmc/gmc_7_1_d.h"
+#include "gmc/gmc_7_1_sh_mask.h"
+#endif
+
 #ifndef mmDP_DPHY_INTERNAL_CTRL
 #define mmDP_DPHY_INTERNAL_CTRL                         0x1CDE
 #define mmDP0_DP_DPHY_INTERNAL_CTRL                     0x1CDE
@@ -453,7 +458,10 @@ static const struct resource_create_funcs res_create_funcs = {
 	.create_hwseq = dce80_hwseq_create,
 };
 
-#define mi_inst_regs(id) { MI_REG_LIST(id) }
+#define mi_inst_regs(id) { \
+	MI_REG_LIST(id), \
+	.MC_HUB_RDREQ_DMIF_LIMIT = mmMC_HUB_RDREQ_DMIF_LIMIT \
+}
 static const struct dce_mem_input_registers mi_regs[] = {
 		mi_inst_regs(0),
 		mi_inst_regs(1),
@@ -464,11 +472,13 @@ static const struct dce_mem_input_registers mi_regs[] = {
 };
 
 static const struct dce_mem_input_shift mi_shifts = {
-		MI_DCE_MASK_SH_LIST(__SHIFT)
+		MI_DCE_MASK_SH_LIST(__SHIFT),
+		.ENABLE = MC_HUB_RDREQ_DMIF_LIMIT__ENABLE__SHIFT
 };
 
 static const struct dce_mem_input_mask mi_masks = {
-		MI_DCE_MASK_SH_LIST(_MASK)
+		MI_DCE_MASK_SH_LIST(_MASK),
+		.ENABLE = MC_HUB_RDREQ_DMIF_LIMIT__ENABLE_MASK
 };
 
 static struct mem_input *dce80_mem_input_create(
@@ -488,6 +498,7 @@ static struct mem_input *dce80_mem_input_create(
 		mi->regs = &mi_regs[inst];
 		mi->shifts = &mi_shifts;
 		mi->masks = &mi_masks;
+		mi->wa.single_head_rdreq_dmif_limit = 2;
 		return mi;
 	}
 
drivers/gpu/drm/amd/dal/dc/dm_services.h +4 -4
index 289264403983..9cb874a03d54 100644
@@ -70,10 +70,9 @@
 
 #endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */
 
-
-#define DC_ERR(err_msg)  do { \
+#define DC_ERR(...)  do { \
+	dm_error(__VA_ARGS__); \
 	BREAK_TO_DEBUGGER(); \
-	dm_error(err_msg); \
 } while (0)
 
 #define dm_alloc(size) kzalloc(size, GFP_KERNEL)
@@ -202,7 +201,8 @@ uint32_t generic_reg_update_ex(const struct dc_context *ctx,
  */
 unsigned int generic_reg_wait(const struct dc_context *ctx,
 	uint32_t addr, uint32_t mask, uint32_t shift, uint32_t condition_value,
-	unsigned int delay_between_poll_us, unsigned int time_out_num_tries);
+	unsigned int delay_between_poll_us, unsigned int time_out_num_tries,
+	const char *func_name);
 
 /**************************************
  * Power Play (PP) interfaces
drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h +1 -0
index e7026ec87bce..78dab74edc2d 100644
@@ -48,6 +48,7 @@ struct mem_input {
 	const struct dce_mem_input_registers *regs;
 	const struct dce_mem_input_shift *shifts;
 	const struct dce_mem_input_mask *masks;
+	struct dce_mem_input_wa wa;
 };
 
 struct mem_input_funcs {
drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h +1 -1
index 7a05141484c9..92a699337322 100644
@@ -156,7 +156,7 @@
 #define REG_WAIT(reg_name, field, val, delay, max_try)	\
 		generic_reg_wait(CTX, \
 				REG(reg_name), FN(reg_name, field), val,\
-				delay, max_try)
+				delay, max_try, __func__)
 
 /* macro to update (read, modify, write) register fields
  */
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#26 lore raw

PATCH 25/39 drm/amd/dal: remove adapter service interface/types

In reply to a message not in the archive

From: Dmytro Laktyushkin <[email protected]>

Change-Id Ic18b7b82a6f0a3b55b0e2ed4f2969897179cb2cc
---
 drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c      |   1 -
 .../gpu/drm/amd/dal/dc/bios/command_table_helper.c |   1 -
 .../dc/bios/dce110/command_table_helper_dce110.c   |   1 -
 .../dc/bios/dce112/command_table_helper_dce112.c   |   1 -
 .../dal/dc/bios/dce80/command_table_helper_dce80.c |   1 -
 drivers/gpu/drm/amd/dal/dc/core/dc.c               |   2 +-
 drivers/gpu/drm/amd/dal/dc/core/dc_link.c          |   1 -
 drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c      |   1 -
 drivers/gpu/drm/amd/dal/dc/core/dc_resource.c      |   1 -
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |   1 -
 .../amd/dal/dc/dce110/dce110_timing_generator.c    |   1 -
 .../amd/dal/dc/dce110/dce110_timing_generator_v.c  |   1 -
 .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c  |   1 -
 .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c    |   1 -
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |   1 -
 .../amd/dal/dc/gpu/dce110/display_clock_dce110.c   |   1 -
 .../amd/dal/dc/gpu/dce112/display_clock_dce112.c   |   1 -
 .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c |   1 -
 .../amd/dal/include/adapter_service_interface.h    | 320 ---------------------
 .../drm/amd/dal/include/adapter_service_types.h    |  62 ----
 .../gpu/drm/amd/dal/include/bios_parser_types.h    |  12 +-
 .../drm/amd/dal/include/irq_service_interface.h    |   2 -
 22 files changed, 12 insertions(+), 403 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/dal/include/adapter_service_interface.h
 delete mode 100644 drivers/gpu/drm/amd/dal/include/adapter_service_types.h
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +0 -1
index 67ecbca99c79..62c2fc5fc214 100644
@@ -28,7 +28,6 @@
 #include "atom.h"
 
 #include "dc_bios_types.h"
-#include "include/adapter_service_interface.h"
 #include "include/gpio_service_interface.h"
 #include "include/grph_object_ctrl_defs.h"
 #include "include/bios_parser_interface.h"
drivers/gpu/drm/amd/dal/dc/bios/command_table_helper.c +0 -1
index 32266e1d4a05..40d9a9921c45 100644
@@ -28,7 +28,6 @@
 #include "atom.h"
 
 #include "include/bios_parser_types.h"
-#include "include/adapter_service_types.h"
 
 #include "command_table_helper.h"
 
drivers/gpu/drm/amd/dal/dc/bios/dce110/command_table_helper_dce110.c +0 -1
index 092c0f6cbc6f..dff82dd11721 100644
@@ -28,7 +28,6 @@
 #include "atom.h"
 
 #include "include/bios_parser_types.h"
-#include "include/adapter_service_types.h"
 
 #include "../command_table_helper.h"
 
drivers/gpu/drm/amd/dal/dc/bios/dce112/command_table_helper_dce112.c +0 -1
index 41703e068692..8b72aa588b86 100644
@@ -28,7 +28,6 @@
 #include "atom.h"
 
 #include "include/bios_parser_types.h"
-#include "include/adapter_service_types.h"
 
 #include "../command_table_helper.h"
 
drivers/gpu/drm/amd/dal/dc/bios/dce80/command_table_helper_dce80.c +0 -1
index d725c4c136cc..295e16ef3f73 100644
@@ -30,7 +30,6 @@
 #include "include/grph_object_id.h"
 #include "include/grph_object_defs.h"
 #include "include/bios_parser_types.h"
-#include "include/adapter_service_types.h"
 
 #include "../command_table_helper.h"
 
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -1
index dbd7b4b6bfe9..7b11cb0ee737 100644
@@ -32,11 +32,11 @@
 
 #include "resource.h"
 
-#include "adapter_service_interface.h"
 #include "clock_source.h"
 #include "dc_bios_types.h"
 
 #include "bandwidth_calcs.h"
+#include "bios_parser_interface.h"
 #include "include/irq_service_interface.h"
 #include "transform.h"
 #include "timing_generator.h"
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +0 -1
index 11cc05f9a3a0..70a25546de1e 100644
@@ -27,7 +27,6 @@
 #include "dm_helpers.h"
 #include "dc.h"
 #include "core_dc.h"
-#include "adapter_service_interface.h"
 #include "grph_object_id.h"
 #include "gpio_service_interface.h"
 #include "core_status.h"
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +0 -1
index 7f6d5ec27058..6379ccfdb06e 100644
@@ -25,7 +25,6 @@
 
 #include "dm_services.h"
 #include "dm_helpers.h"
-#include "include/adapter_service_interface.h"
 #include "gpio_service_interface.h"
 #include "include/ddc_service_types.h"
 #include "include/grph_object_id.h"
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +0 -1
index 920a4ba42a6a..a9b2784f8168 100644
@@ -32,7 +32,6 @@
 #include "timing_generator.h"
 #include "transform.h"
 #include "set_mode_types.h"
-#include "adapter_service_interface.h"
 
 #include "virtual/virtual_stream_encoder.h"
 
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +0 -1
index 851247c647a1..08e0ca11a48d 100644
@@ -29,7 +29,6 @@
 
 #include "resource.h"
 #include "include/irq_service_interface.h"
-#include "include/adapter_service_interface.h"
 #include "../virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dce110/dce110_timing_generator.h"
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c +0 -1
index 3d736c15ca25..b1c97125f6fb 100644
@@ -34,7 +34,6 @@
 #include "dc.h"
 
 #include "include/grph_object_id.h"
-#include "include/adapter_service_interface.h"
 #include "include/logger_interface.h"
 #include "dce110_timing_generator.h"
 
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c +0 -1
index 56cf3fe3ad28..3bf3179e07c5 100644
@@ -9,7 +9,6 @@
 #include "dc.h"
 
 #include "include/grph_object_id.h"
-#include "include/adapter_service_interface.h"
 #include "include/logger_interface.h"
 #include "dce110_timing_generator.h"
 #include "dce110_timing_generator_v.h"
drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c +0 -1
index 70c4ea2ad294..22a5aba073ca 100644
@@ -31,7 +31,6 @@
 #include "gmc/gmc_8_1_d.h"
 
 #include "include/logger_interface.h"
-#include "include/adapter_service_interface.h"
 
 #include "dce112_compressor.h"
 
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +0 -1
index 5fbec7d3759f..c74288d98749 100644
@@ -30,7 +30,6 @@
 
 #include "resource.h"
 #include "include/irq_service_interface.h"
-#include "include/adapter_service_interface.h"
 #include "dce110/dce110_resource.h"
 #include "dce110/dce110_timing_generator.h"
 #include "dce112/dce112_mem_input.h"
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +0 -1
index 73110341cb4d..1d9ca64e2729 100644
@@ -31,7 +31,6 @@
 
 #include "resource.h"
 #include "include/irq_service_interface.h"
-#include "include/adapter_service_interface.h"
 #include "irq/dce80/irq_service_dce80.h"
 #include "dce110/dce110_timing_generator.h"
 #include "dce110/dce110_mem_input.h"
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +0 -1
index 5ea7ea1e7814..1bc39f12b6a1 100644
@@ -28,7 +28,6 @@
 #include "dce/dce_11_0_d.h"
 #include "dce/dce_11_0_sh_mask.h"
 
-#include "include/adapter_service_interface.h"
 #include "include/bios_parser_interface.h"
 #include "include/fixed32_32.h"
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c +0 -1
index 600a09cd6021..e3290af6d0a6 100644
@@ -28,7 +28,6 @@
 #include "dce/dce_11_2_d.h"
 #include "dce/dce_11_2_sh_mask.h"
 
-#include "include/adapter_service_interface.h"
 #include "include/bios_parser_interface.h"
 #include "include/fixed32_32.h"
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +0 -1
index fbac724a2407..eedcfd6232fc 100644
@@ -28,7 +28,6 @@
 #include "dce/dce_8_0_d.h"
 #include "dce/dce_8_0_sh_mask.h"
 
-#include "include/adapter_service_interface.h"
 #include "include/bios_parser_interface.h"
 #include "include/fixed32_32.h"
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h deleted +0 -320

320 lines not on this page · raw message

drivers/gpu/drm/amd/dal/include/adapter_service_types.h deleted +0 -62

62 lines not on this page · raw message

drivers/gpu/drm/amd/dal/include/bios_parser_types.h +11 -1
index 726cd23a8629..9ab9065735f7 100644
@@ -31,9 +31,19 @@
 #include "include/signal_types.h"
 #include "include/grph_object_ctrl_defs.h"
 #include "include/gpio_types.h"
-#include "include/adapter_service_types.h" /* for as_signal_type */
 #include "include/link_service_types.h"
 
+/* TODO: include signal_types.h and remove this enum */
+enum as_signal_type {
+	AS_SIGNAL_TYPE_NONE = 0L, /* no signal */
+	AS_SIGNAL_TYPE_DVI,
+	AS_SIGNAL_TYPE_HDMI,
+	AS_SIGNAL_TYPE_LVDS,
+	AS_SIGNAL_TYPE_DISPLAY_PORT,
+	AS_SIGNAL_TYPE_GPU_PLL,
+	AS_SIGNAL_TYPE_UNKNOWN
+};
+
 enum bp_result {
 	BP_RESULT_OK = 0, /* There was no error */
 	BP_RESULT_BADINPUT, /*Bad input parameter */
drivers/gpu/drm/amd/dal/include/irq_service_interface.h +0 -2
index 7eef54519f47..d6ebed524daf 100644
@@ -26,8 +26,6 @@
 #ifndef __DAL_IRQ_SERVICE_INTERFACE_H__
 #define __DAL_IRQ_SERVICE_INTERFACE_H__
 
-#include "include/adapter_service_types.h"
-
 struct irq_service_init_data {
 	struct dc_context *ctx;
 };
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#27 lore raw

PATCH 26/39 drm/amd/dal: Memory leak fixes

In reply to a message not in the archive

From: Leon Elazar <[email protected]>

[Problem]
DC Hw sequencer wansn't released during the destructor. DC Context was set to NULL before was actually released.

Change-Id If2c0caf0cc49d2f023adcdb083ef869d8712326d
---
 drivers/gpu/drm/amd/dal/dc/core/dc.c          |  6 +++---
 drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 10 ++++++++++
 drivers/gpu/drm/amd/dal/dc/inc/resource.h     |  3 +--
 3 files changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +3 -3
index 7b11cb0ee737..c42d0d49ca92 100644
@@ -455,8 +455,7 @@ static void destruct(struct core_dc *dc)
 
 	destroy_links(dc);
 
-	if (dc->res_pool)
-		dc->res_pool->funcs->destroy(&dc->res_pool);
+	dc_destroy_resource_pool(dc);
 
 	if (dc->ctx->gpio_service)
 		dal_gpio_service_destroy(&dc->ctx->gpio_service);
@@ -471,8 +470,9 @@ static void destruct(struct core_dc *dc)
 		dal_logger_destroy(&dc->ctx->logger);
 
 	dm_free(dc->current_context);
-	dm_free(dc->ctx);
+	dc->current_context = NULL;
 
+	dm_free(dc->ctx);
 	dc->ctx = NULL;
 }
 
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +10 -0
index a9b2784f8168..bd53d27e5414 100644
@@ -98,6 +98,16 @@ struct resource_pool *dc_create_resource_pool(
 	return false;
 }
 
+void dc_destroy_resource_pool(struct core_dc *dc)
+{
+	if (dc) {
+		if (dc->res_pool)
+			dc->res_pool->funcs->destroy(&dc->res_pool);
+
+		if (dc->hwseq)
+			dm_free(dc->hwseq);
+	}
+}
 
 static void update_num_audio(
 	const struct resource_straps *straps,
drivers/gpu/drm/amd/dal/dc/inc/resource.h +1 -2
index 33fb7d98b294..dae94706e5da 100644
@@ -76,8 +76,7 @@ struct resource_pool *dc_create_resource_pool(
 				enum dce_version dc_version,
 				struct hw_asic_id asic_id);
 
-void dc_destroy_resource_pool(struct resource_pool **pool,
-				enum dce_version dc_version);
+void dc_destroy_resource_pool(struct core_dc *dc);
 
 enum dc_status resource_map_pool_resources(
 		const struct core_dc *dc,
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#28 lore raw

PATCH 27/39 drm/amd/dal: remove unused function

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id Ie71affe21ba4f8cc29f51e7725956ea95e3b4d8e
---
 drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +0 -6
index 62c2fc5fc214..ebd2e419f8f2 100644
@@ -3661,12 +3661,6 @@ static void bios_parser_post_init(struct dc_bios *dcb)
 	process_ext_display_connection_info(bp);
 }
 
-static bool bios_parser_is_accelerated_mode(
-	struct dc_bios *dcb)
-{
-	return bios_is_accelerated_mode(dcb);
-}
-
 /**
  * bios_parser_set_scratch_critical_state
  *
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#29 lore raw

PATCH 28/39 drm/amd/dal: fix warnings in dce_stream_encoder.c

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id I3749a1d960423cc65aaf63b0ede36edb4c0ef08d
---
 drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 15 ---------------
 1 file changed, 15 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c +0 -15
index 6e1bca2fb737..c573a87fbff3 100644
@@ -223,14 +223,6 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
 	struct dc_crtc_timing *crtc_timing,
 	enum dc_color_space output_color_space)
 {
-	uint32_t h_active_start;
-	uint32_t v_active_start;
-	uint32_t misc0 = 0;
-	uint32_t misc1;
-	uint32_t h_blank;
-	uint32_t h_back_porch;
-	uint8_t synchronous_clock = 0; /* asynchronous mode */
-	uint8_t colorimetry_bpc;
 
 	struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
 
@@ -275,28 +267,23 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
 	case COLOR_DEPTH_666:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				0);
-		colorimetry_bpc = 0;
 		break;
 	case COLOR_DEPTH_888:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_8BPC);
-		colorimetry_bpc = 1;
 		break;
 	case COLOR_DEPTH_101010:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_10BPC);
 
-		colorimetry_bpc = 2;
 		break;
 	case COLOR_DEPTH_121212:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_12BPC);
-		colorimetry_bpc = 3;
 		break;
 	default:
 		REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
 				DP_COMPONENT_DEPTH_6BPC);
-		colorimetry_bpc = 0;
 		break;
 	}
 
@@ -438,8 +425,6 @@ static void dce110_stream_encoder_set_mst_bandwidth(
 	struct fixed31_32 avg_time_slots_per_mtp)
 {
 	struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
-	struct dc_context *ctx = enc110->base.ctx;
-	uint32_t retries = 0;
 	uint32_t x = dal_fixed31_32_floor(
 		avg_time_slots_per_mtp);
 	uint32_t y = dal_fixed31_32_ceil(
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#30 lore raw

PATCH 29/39 drm/amd/dal: fix warning in dce_link_encoder.c

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id I9a95819d9e60915410914ba5b979616f28640045
---
 drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +0 -2
index 968d4187273c..5ca59fa8bcca 100644
@@ -964,8 +964,6 @@ bool dce110_link_encoder_construct(
 	const struct dce110_link_enc_aux_registers *aux_regs,
 	const struct dce110_link_enc_hpd_registers *hpd_regs)
 {
-	struct graphics_object_encoder_cap_info enc_cap_info = {0};
-
 	enc110->base.funcs = &dce110_lnk_enc_funcs;
 	enc110->base.ctx = init_data->ctx;
 	enc110->base.id = init_data->encoder;
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#31 lore raw

PATCH 30/39 drm/amd/dal: fix bug in dal_display_clock_get_min_clocks_state

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Missing return.

Change-Id Idf77b5a73c89ec86a9b7ef5d231acac6bf58a4c7
---
 drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c +1 -1
index 4929cd2aa3da..bcc0a5132600 100644
@@ -118,7 +118,7 @@ bool dal_display_clock_get_min_clocks_state(
 	enum clocks_state *clocks_state)
 {
 	if (!disp_clk->funcs->get_min_clocks_state)
-		false;
+		return false;
 
 	*clocks_state = disp_clk->funcs->get_min_clocks_state(disp_clk);
 	return true;
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#32 lore raw

PATCH 31/39 drm/amd/dal: fix warning in dal_display_clock_dce112_construct

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id I86d5392afde592ca76a523f8c8cbd07a9cc22c6e
---
 drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c +0 -1
index e3290af6d0a6..9b7c9755e316 100644
@@ -842,7 +842,6 @@ bool dal_display_clock_dce112_construct(
 	struct display_clock_dce112 *dc112,
 	struct dc_context *ctx)
 {
-	struct dm_pp_static_clock_info *static_clk_info = {0};
 	struct display_clock *dc_base = &dc112->disp_clk_base;
 
 	/*if (NULL == as)
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#33 lore raw

PATCH 32/39 drm/amd/dal: fix warning in dce110_hw_sequencer.c

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id I53e4a0d4f66d6d09aef1d153e8d1f5eb3177bc4b
---
 drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +0 -3
index 74e1a191cfbe..484840efe58d 100644
@@ -1161,7 +1161,6 @@ static enum dc_status apply_ctx_to_hw_fpga(
 {
 	enum dc_status status = DC_ERROR_UNEXPECTED;
 	int i;
-	struct dc_bios *dcb = dc->ctx->dc_bios;
 
 	for (i = 0; i < context->res_ctx.pool->pipe_count; i++) {
 		struct pipe_ctx *pipe_ctx_old =
@@ -1414,7 +1413,6 @@ static void set_plane_config(
 	struct resource_context *res_ctx)
 {
 	struct mem_input *mi = pipe_ctx->mi;
-	struct dc_context *ctx = pipe_ctx->stream->ctx;
 	struct core_surface *surface = pipe_ctx->surface;
 	struct xfm_grph_csc_adjustment adjust;
 	struct out_csc_color_matrix tbl_entry;
@@ -1750,7 +1748,6 @@ static void dce110_program_front_end_for_pipe(
 {
 	struct mem_input *mi = pipe_ctx->mi;
 	struct pipe_ctx *old_pipe = NULL;
-	struct dc_context *ctx = pipe_ctx->stream->ctx;
 	struct core_surface *surface = pipe_ctx->surface;
 	struct xfm_grph_csc_adjustment adjust;
 	struct out_csc_color_matrix tbl_entry;
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#34 lore raw

PATCH 33/39 drm/amd/dal: fix warning in dce110_resource.c

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id I454e58ff8789177e6c75df59d10ed83019870819
---
 drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +0 -1
index dac53df2cb86..9d7fb832dd15 100644
@@ -1242,7 +1242,6 @@ static bool construct(
 	struct firmware_info info;
 	struct dc_bios *bp;
 	struct dm_pp_static_clock_info static_clk_info = {0};
-	struct resource_straps straps = {0};
 
 	ctx->dc_bios->regs = &bios_regs;
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#35 lore raw

PATCH 34/39 drm/amd/dal: fix include order in dce80_resource.c

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Fixes redefinition warnings

Change-Id I5f6c131ed0489208f1751e1eec81060dc741ab02
---
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +2 -3
index 1d9ca64e2729..738201b15722 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include "dce/dce_8_0_d.h"
+#include "dce/dce_8_0_sh_mask.h"
 
 #include "dm_services.h"
 
@@ -50,9 +52,6 @@
 
 #include "reg_helper.h"
 
-#include "dce/dce_8_0_d.h"
-#include "dce/dce_8_0_sh_mask.h"
-
 /* TODO remove this include */
 
 #ifndef mmMC_HUB_RDREQ_DMIF_LIMIT
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#36 lore raw

PATCH 35/39 drm/amd/dal: handle NULL mem_input in dc_init_dchub

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Fail gracefully if mem_input is NULL.

Change-Id Ie49de3cbc2a56d6cd1f28048ce034f984b63c037
---
 drivers/gpu/drm/amd/dal/dc/core/dc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +5 -1
index c42d0d49ca92..1e337e427d06 100644
@@ -1810,7 +1810,7 @@ bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data)
 {
 	int i;
 	struct core_dc *core_dc = DC_TO_CORE(dc);
-	struct mem_input *mi;
+	struct mem_input *mi = NULL;
 
 	for (i = 0; i < core_dc->res_pool->pipe_count; i++) {
 		if (core_dc->res_pool->mis[i] != NULL) {
@@ -1818,6 +1818,10 @@ bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data)
 			break;
 		}
 	}
+	if (mi == NULL) {
+		dm_error("no mem_input!\n");
+		return false;
+	}
 
 	if (mi->funcs->mem_input_update_dchub)
 		mi->funcs->mem_input_update_dchub(mi, dh_data);
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#37 lore raw

PATCH 36/39 drm/amd/dal: fix warning in dc_link_dp_set_test_pattern

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id I75cd9f310d5e0d1b1bea82165b1f2fdc70a08a94
---
 drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c +1 -2
index 2b0b23ac6cac..2585ec332e58 100644
@@ -2309,6 +2309,7 @@ bool dc_link_dp_set_test_pattern(
 	unsigned char link_qual_pattern[LANE_COUNT_DP_MAX] = {0};
 	union dpcd_training_pattern training_pattern;
 	union test_response test_response;
+	enum dpcd_phy_test_patterns pattern;
 
 	memset(&training_pattern, 0, sizeof(training_pattern));
 	memset(&test_response, 0, sizeof(test_response));
@@ -2376,8 +2377,6 @@ bool dc_link_dp_set_test_pattern(
 						p_link_settings);
 		}
 
-		enum dpcd_phy_test_patterns pattern;
-
 		switch (test_pattern) {
 		case DP_TEST_PATTERN_VIDEO_MODE:
 			pattern = PHY_TEST_PATTERN_NONE;
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#38 lore raw

PATCH 37/39 drm/amd/dal: fix warning in calculate_bandwidth

In reply to a message not in the archive

From: Alex Deucher <[email protected]>

Change-Id Ia7adbf8ef53244b4d87dc4e88f9165a1574c262e
---
 drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c +0 -2
index 0dbe47db3740..0b2bb3992f1a 100644
@@ -39,7 +39,6 @@ static void calculate_bandwidth(
 
 {
 	const int32_t pixels_per_chunk = 512;
-	const int32_t max_chunks_non_fbc_mode = 16;
 	const int32_t high = 2;
 	const int32_t mid = 1;
 	const int32_t low = 0;
@@ -51,7 +50,6 @@ static void calculate_bandwidth(
 	const uint32_t s_mid5 = 5;
 	const uint32_t s_mid6 = 6;
 	const uint32_t s_high = 7;
-	const uint32_t vertical_front_porch = 450; /*us*/
 	const uint32_t bus_efficiency = 1;
 	const uint32_t dmif_chunk_buff_margin = 1;
 
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#39 lore raw

PATCH 38/39 drm/amd/dal: fix wrong pll selection for hdmi

In reply to a message not in the archive

From: Tony Cheng <[email protected]>

- expose phy pll selection algorithm

Change-Id I770519f1fa83f3ccb5b4379d46d476c24ae5d7ed
---
 drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 6 +++---
 drivers/gpu/drm/amd/dal/dc/inc/resource.h           | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +3 -3
index c74288d98749..a9991aa28666 100644
@@ -902,7 +902,7 @@ enum dc_status dce112_validate_bandwidth(
 	return result;
 }
 
-static enum dc_status map_clock_resources(
+enum dc_status resource_map_phy_clock_resources(
 		const struct core_dc *dc,
 		struct validate_context *context)
 {
@@ -1001,7 +1001,7 @@ enum dc_status dce112_validate_with_context(
 	result = resource_map_pool_resources(dc, context);
 
 	if (result == DC_OK)
-		result = map_clock_resources(dc, context);
+		result = resource_map_phy_clock_resources(dc, context);
 
 	if (!resource_validate_attach_surfaces(
 			set, set_count, dc->current_context, context)) {
@@ -1037,7 +1037,7 @@ enum dc_status dce112_validate_guaranteed(
 	result = resource_map_pool_resources(dc, context);
 
 	if (result == DC_OK)
-		result = resource_map_clock_resources(dc, context);
+		result = resource_map_phy_clock_resources(dc, context);
 
 	if (result == DC_OK)
 		result = validate_mapped_resource(dc, context);
drivers/gpu/drm/amd/dal/dc/inc/resource.h +4 -0
index dae94706e5da..c1a236d54f72 100644
@@ -152,6 +152,10 @@ enum dc_status resource_map_clock_resources(
 		const struct core_dc *dc,
 		struct validate_context *context);
 
+enum dc_status resource_map_phy_clock_resources(
+		const struct core_dc *dc,
+		struct validate_context *context);
+
 bool pipe_need_reprogram(
 		struct pipe_ctx *pipe_ctx_old,
 		struct pipe_ctx *pipe_ctx);
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#40 lore raw

PATCH 39/39 drm/amd/dal: Configure audio before audio enable (Jack presence Hot Plug)

In reply to a message not in the archive

From: Reza Amini <[email protected]>

Change-Id Iec19ac35466f0762f305d167e961d72543f58ef7
---
 .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c    | 48 +++++++++++-----------
 1 file changed, 23 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +23 -25
index 484840efe58d..1a682996b531 100644
@@ -1284,32 +1284,22 @@ enum dc_status dce110_apply_ctx_to_hw(
 		if (pipe_ctx->top_pipe)
 			continue;
 
-		status = apply_single_controller_ctx_to_hw(
-				pipe_ctx,
-				context,
-				dc);
-
-		if (DC_OK != status)
-			return status;
-	}
-
-	/* Setup audio rate clock source */
-	/* Issue:
-	 * Audio lag happened on DP monitor when unplug a HDMI monitor
-	 *
-	 * Cause:
-	 * In case of DP and HDMI connected or HDMI only, DCCG_AUDIO_DTO_SEL
-	 * is set to either dto0 or dto1, audio should work fine.
-	 * In case of DP connected only, DCCG_AUDIO_DTO_SEL should be dto1,
-	 * set to dto0 will cause audio lag.
-	 *
-	 * Solution:
-	 * Not optimized audio wall dto setup. When mode set, iterate pipe_ctx,
-	 * find first available pipe with audio, setup audio wall DTO per topology
-	 * instead of per pipe.
-	 */
-	for (i = 0; i < context->res_ctx.pool->pipe_count; i++) {
 		if (context->res_ctx.pipe_ctx[i].audio != NULL) {
+			/* Setup audio rate clock source */
+			/* Issue:
+			* Audio lag happened on DP monitor when unplug a HDMI monitor
+			*
+			* Cause:
+			* In case of DP and HDMI connected or HDMI only, DCCG_AUDIO_DTO_SEL
+			* is set to either dto0 or dto1, audio should work fine.
+			* In case of DP connected only, DCCG_AUDIO_DTO_SEL should be dto1,
+			* set to dto0 will cause audio lag.
+			*
+			* Solution:
+			* Not optimized audio wall dto setup. When mode set, iterate pipe_ctx,
+			* find first available pipe with audio, setup audio wall DTO per topology
+			* instead of per pipe.
+			*/
 			struct audio_output audio_output;
 			struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
 
@@ -1342,6 +1332,14 @@ enum dc_status dce110_apply_ctx_to_hw(
 				programmed_audio_dto = true;
 			}
 		}
+
+		status = apply_single_controller_ctx_to_hw(
+				pipe_ctx,
+				context,
+				dc);
+
+		if (DC_OK != status)
+			return status;
 	}
 
 	dc->hwss.set_displaymarks(dc, context);
Signature · 6 lines
2.10.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx