amdgpu/dc: fix a bunch of misc whitespace.

PATCH In review Dave Airlie 2 participants 4 messages Oct 3, 2017 2 messages not in the archive

Subsystems (3)

DRM drivers Radeon and amdgpu DRM drivers AMD display core

lore

Share & tools

lore

Dave Airlie

author

2017-10-03 04:27 UTC #0 lore raw

PATCH 1/3 amdgpu/dc: fix a bunch of misc whitespace.

From: Dave Airlie <[email protected]>

This just aligns a few things with kernel style.

Signed-off-by Dave Airlie <[email protected]>

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |  8 ++--
 drivers/gpu/drm/amd/display/dc/dc_types.h          | 16 ++++----
 .../display/dc/dce110/dce110_timing_generator.c    |  4 +-
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  | 16 ++++----
 .../gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c | 46 +++++++++++-----------
 .../amd/display/include/grph_object_ctrl_defs.h    | 20 +++++-----
 6 files changed, 55 insertions(+), 55 deletions(-)

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +4 -4

index 888d268..3c323c1 100644
@@ -1473,10 +1473,10 @@ void decide_link_settings(struct dc_stream_state *stream,
 		return;
 	}
 
-    /* search for the minimum link setting that:
-     * 1. is supported according to the link training result
-     * 2. could support the b/w requested by the timing
-     */
+	/* search for the minimum link setting that:
+	 * 1. is supported according to the link training result
+	 * 2. could support the b/w requested by the timing
+	 */
 	while (current_link_setting.link_rate <=
 			link->verified_link_cap.link_rate) {
 		link_bw = bandwidth_in_kbps_from_link_settings(

drivers/gpu/drm/amd/display/dc/dc_types.h +8 -8

index a47f7472..6b891fd 100644
@@ -429,14 +429,14 @@ union audio_sample_rates {
 };
 
 struct audio_speaker_flags {
-    uint32_t FL_FR:1;
-    uint32_t LFE:1;
-    uint32_t FC:1;
-    uint32_t RL_RR:1;
-    uint32_t RC:1;
-    uint32_t FLC_FRC:1;
-    uint32_t RLC_RRC:1;
-    uint32_t SUPPORT_AI:1;
+	uint32_t FL_FR:1;
+	uint32_t LFE:1;
+	uint32_t FC:1;
+	uint32_t RL_RR:1;
+	uint32_t RC:1;
+	uint32_t FLC_FRC:1;
+	uint32_t RLC_RRC:1;
+	uint32_t SUPPORT_AI:1;
 };
 
 struct audio_speaker_info {

drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c +2 -2

index bcd544d..67ac737 100644
@@ -1238,8 +1238,8 @@ void dce110_timing_generator_setup_global_swap_lock(
 			DCP_GSL_CONTROL,
 			DCP_GSL_HSYNC_FLIP_FORCE_DELAY);
 
-        /* Keep signal low (pending high) during 6 lines.
-         * Also defines minimum interval before re-checking signal. */
+	/* Keep signal low (pending high) during 6 lines.
+	 * Also defines minimum interval before re-checking signal. */
 	set_reg_field_value(value,
 			HFLIP_CHECK_DELAY,
 			DCP_GSL_CONTROL,

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +8 -8

index c4875c3..d3fee15 100644
@@ -2396,14 +2396,14 @@ static void program_all_pipe_in_tree(
 		dcn10_power_on_fe(dc, pipe_ctx, context);
 
 		/* temporary dcn1 wa:
-                 *   watermark update requires toggle after a/b/c/d sets are programmed
-                 *   if hubp is pg then wm value doesn't get properaged to hubp
-                 *   need to toggle after ungate to ensure wm gets to hubp.
-                 *
-                 * final solution:  we need to get SMU to do the toggle as
-                 * DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST is owned by SMU we should have 
-                 * both driver and fw accessing same register
-                 */
+		 *   watermark update requires toggle after a/b/c/d sets are programmed
+		 *   if hubp is pg then wm value doesn't get properaged to hubp
+		 *   need to toggle after ungate to ensure wm gets to hubp.
+		 *
+		 * final solution:  we need to get SMU to do the toggle as
+		 * DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST is owned by SMU we should have
+		 * both driver and fw accessing same register
+		 */
 		toggle_watermark_change_req(dc->hwseq);
 
 		update_dchubp_dpp(dc, pipe_ctx, context);

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c +23 ~~-23~~

60 lines not on this page · raw message

drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h +10 ~~-10~~

index 92fe00f..7a9b43f 100644
@@ -183,9 +183,9 @@ struct dc_firmware_info {
 };
 
 struct step_and_delay_info {
-    uint32_t step;
-    uint32_t delay;
-    uint32_t recommended_ref_div;
+	uint32_t step;
+	uint32_t delay;
+	uint32_t recommended_ref_div;
 };
 
 struct spread_spectrum_info {

@@ -266,16 +266,16 @@ struct transmitter_configuration {
 #define NUMBER_OF_AVAILABLE_SCLK 5
 
 struct i2c_reg_info {
-    unsigned char       i2c_reg_index;
-    unsigned char       i2c_reg_val;
+	unsigned char       i2c_reg_index;
+	unsigned char       i2c_reg_val;
 };
 
 struct ext_hdmi_settings {
-    unsigned char   slv_addr;
-    unsigned char   reg_num;
-    struct i2c_reg_info      reg_settings[9];
-    unsigned char   reg_num_6g;
-    struct i2c_reg_info      reg_settings_6g[3];
+	unsigned char   slv_addr;
+	unsigned char   reg_num;
+	struct i2c_reg_info      reg_settings[9];
+	unsigned char   reg_num_6g;
+	struct i2c_reg_info      reg_settings_6g[3];
 };

Signature · 6 lines

2.9.5

_______________________________________________
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): 20171003042715.9305-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

Dave Airlie

author

2017-10-03 04:27 UTC #2 lore raw

PATCH 2/3 amdgpu/dc: kfree already checks for NULL.

From: Dave Airlie <[email protected]>

Don't bother checking for it.

Found with the cocci ifnullfree.cocci script.

Signed-off-by Dave Airlie <[email protected]>

---
 drivers/gpu/drm/amd/display/dc/basics/vector.c          |  3 +--
 drivers/gpu/drm/amd/display/dc/bios/bios_parser.c       |  7 ++-----
 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c      |  7 ++-----
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c       |  3 +--
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 11 +++--------
 5 files changed, 9 insertions(+), 22 deletions(-)

drivers/gpu/drm/amd/display/dc/basics/vector.c +1 -2

index e00fc4db..217b8f1 100644
@@ -130,8 +130,7 @@ struct vector *dal_vector_create(
 void dal_vector_destruct(
 	struct vector *vector)
 {
-	if (vector->container != NULL)
-		kfree(vector->container);
+	kfree(vector->container);
 	vector->count = 0;
 	vector->capacity = 0;
 }

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +2 -5

index 2e003b5..6d2f886 100644
@@ -119,11 +119,8 @@ struct dc_bios *bios_parser_create(
 
 static void destruct(struct bios_parser *bp)
 {
-	if (bp->base.bios_local_image)
-		kfree(bp->base.bios_local_image);
-
-	if (bp->base.integrated_info)
-		kfree(bp->base.integrated_info);
+	kfree(bp->base.bios_local_image);
+	kfree(bp->base.integrated_info);
 }
 
 static void bios_parser_destroy(struct dc_bios **dcb)

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +2 -5

index 0c623b3..3d65e2a 100644
@@ -85,11 +85,8 @@ static struct atom_encoder_caps_record *get_encoder_cap_record(
 
 static void destruct(struct bios_parser *bp)
 {
-	if (bp->base.bios_local_image)
-		kfree(bp->base.bios_local_image);
-
-	if (bp->base.integrated_info)
-		kfree(bp->base.integrated_info);
+	kfree(bp->base.bios_local_image);
+	kfree(bp->base.integrated_info);
 }
 
 static void firmware_parser_destroy(struct dc_bios **dcb)

drivers/gpu/drm/amd/display/dc/core/dc_resource.c +1 -2

index 057bfe6..77b3474 100644
@@ -159,8 +159,7 @@ void dc_destroy_resource_pool(struct dc  *dc)
 		if (dc->res_pool)
 			dc->res_pool->funcs->destroy(&dc->res_pool);
 
-		if (dc->hwseq)
-			kfree(dc->hwseq);
+		kfree(dc->hwseq);
 	}
 }

drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +3 -8

index 89036af..28e768d 100644
@@ -619,14 +619,9 @@ void dce110_clock_source_destroy(struct clock_source **clk_src)
 
 	dce110_clk_src = TO_DCE110_CLK_SRC(*clk_src);
 
-	if (dce110_clk_src->dp_ss_params)
-		kfree(dce110_clk_src->dp_ss_params);
-
-	if (dce110_clk_src->hdmi_ss_params)
-		kfree(dce110_clk_src->hdmi_ss_params);
-
-	if (dce110_clk_src->dvi_ss_params)
-		kfree(dce110_clk_src->dvi_ss_params);
+	kfree(dce110_clk_src->dp_ss_params);
+	kfree(dce110_clk_src->hdmi_ss_params);
+	kfree(dce110_clk_src->dvi_ss_params);
 
 	kfree(dce110_clk_src);
 	*clk_src = NULL;

Signature · 6 lines

2.9.5

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

Dave Airlie

author

2017-10-03 04:27 UTC #3 lore raw

PATCH 3/3 amdgpu/dm: don't use after free.

In reply to a message not in the archive

From: Dave Airlie <[email protected]>

This dereference acrtc after freeing it.

Found by the kfree cocci script.

Signed-off-by Dave Airlie <[email protected]>

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
 1 file changed, 1 deletion(-)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -1

index 61ccddd..4f89731 100644
@@ -3174,7 +3174,6 @@ int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
 fail:
 	kfree(acrtc);
 	kfree(cursor_plane);
-	acrtc->crtc_id = -1;
 	return res;
 }

Signature · 6 lines

2.9.5

_______________________________________________
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): 20171003042715.9305-3-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

Harry Wentland

Reviewed-by

2017-10-03 15:17 UTC #5 lore raw

Re: [PATCH 3/3] amdgpu/dm: don't use after free.

Quoted 7 lines · Dave Airlie

From: Dave Airlie <[email protected]>
This dereference acrtc after freeing it.
Found by the kfree cocci script.
Signed-off-by Dave Airlie <[email protected]>

Series is

Reviewed-by Harry Wentland <[email protected]>

Harry

Quoted 10 lines

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -0
index 61ccddd..4f89731 100644

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm, · line 3179

Quoted 7 lines

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -1

@@ -3174,7 +3174,6 @@ int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
 fail:
 	kfree(acrtc);
 	kfree(cursor_plane);
-	acrtc->crtc_id = -1;
 	return res;
 }

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