clean up DPU for RM refactor
v6 cover clean up DPU for RM refactor
Based on the comments received for the patch series[1] and to make the review process a bit more easy, spliting up the patches for cleanup and resource manager refactor. This series cleans up and prepares the DPU for upcoming RM changes.
[1] https://patchwork.freedesktop.org/series/44669/
changes in v4:
- split clean up changes in separate commits
changes in v5:
- clean up dead code in RM
- remove both topology enums and RM specific topology
- update commit texts with reasons for removal
changes in v6:
- remove parameter checks in RM reserve
- use BIT(x) to define power handle event macros
- avoid head allocation for RM topology
Thanks and Regards,
Jeykumar S.
Jeykumar Sankaran (19):
drm/msm/dpu: remove debugfs support for misr drm/msm/dpu: squash power handle event types drm/msm/dpu: remove scalar config definitions drm/msm/dpu: remove resource pool manager drm/msm/dpu: remove ping pong split topology variables drm/msm/dpu: enable master-slave encoders explicitly drm/msm/dpu: use kms stored hw mdp block drm/msm/dpu: iterate for assigned hw ctl in virtual encoder drm/msm/dpu: avoid querying for hw intf before assignment drm/msm/dpu: make crtc get_mixer_width helper static drm/msm/dpu: move hw resource tracking to crtc state drm/msm/dpu: rename hw_ctl to lm_ctl
drm/msm/dpu: clean up destination scaler residue drm/msm/dpu: remove cdm block support from resource manager drm/msm/dpu: remove LOCK/CLEAR support in RM drm/msm/dpu: remove display H_TILE from encoder drm/msm/dpu: remove RM dependency on connector state drm/msm/dpu: relax parameter validation in encoders drm/msm/dpu: remove RM topology definition
drivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 467 +++------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 111 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 216 ++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 10 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 23 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 48 +-- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 125 +----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 56 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 56 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 323 -------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 139 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 14 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 29 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 7 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 29 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 7 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 33 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 18 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 17 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 3 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 16 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 15 +- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 14 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 285 +++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 44 -- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - 29 files changed, 214 insertions(+), 1908 deletions(-) delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1536366267-22336-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v6 1/19 drm/msm/dpu: remove debugfs support for misr
MISR support is the debug feature present in Snapdragon chipsets. At the layer mixer and interfaces, MISR algorithm can generate CRC signatures of the pixel data which can be used for validating the frames generated. Since there are no clients for this feature, strip down the support from the driver.
changes in v4:
- changed introduced in the series
changes in v5:
- update commit text with the need for the change(Sean)
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 139 --------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 127 ------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 6 - .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 28 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 29 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 7 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 29 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 7 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 3 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 6 - 11 files changed, 387 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -139
@@ -47,8 +47,6 @@#define LEFT_MIXER 0#define RIGHT_MIXER 1 -#define MISR_BUFF_SIZE 256 -static inline struct dpu_kms *_dpu_crtc_get_kms (struct drm_crtc *crtc) {struct msm_drm_private *priv;
@@ -1272,8 +1270,6 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg)struct drm_crtc *crtc = arg;struct dpu_crtc *dpu_crtc;struct drm_encoder *encoder; -struct dpu_crtc_mixer *m; -u32 i, misr_status;if (!crtc) {DPU_ERROR ("invalid crtc\n" );
@@ -1294,29 +1290,8 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg)dpu_encoder_virt_restore (encoder); } - -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; -if (!m->hw_lm || !m->hw_lm->ops.setup_misr || - !dpu_crtc->misr_enable) -continue ; - - m->hw_lm->ops.setup_misr (m->hw_lm, true, - dpu_crtc->misr_frame_count); - }break ;case DPU_POWER_EVENT_PRE_DISABLE : -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; -if (!m->hw_lm || !m->hw_lm->ops.collect_misr || - !dpu_crtc->misr_enable) -continue ; - - misr_status = m->hw_lm->ops.collect_misr (m->hw_lm); - dpu_crtc->misr_data[i] = misr_status ? misr_status : - dpu_crtc->misr_data[i]; - } -break ;case DPU_POWER_EVENT_POST_DISABLE :/** * Nothing to do. All the planes on the CRTC will be
@@ -1846,113 +1821,6 @@ static int _dpu_debugfs_status_open(struct inode *inode, struct file *file)return single_open (file, _dpu_debugfs_status_show, inode->i_private); } -static ssize_t _dpu_crtc_misr_setup (struct file *file, -const char __user *user_buf,size_t count,loff_t *ppos) -{ -struct dpu_crtc *dpu_crtc; -struct dpu_crtc_mixer *m; -int i =0 , rc; -char buf[MISR_BUFF_SIZE +1 ]; -u32 frame_count, enable; -size_t buff_copy; - -if (!file || !file->private_data) -return -EINVAL ; - - dpu_crtc = file->private_data; - buff_copy =min_t (size_t, count,MISR_BUFF_SIZE ); -if (copy_from_user (buf, user_buf, buff_copy)) { -DPU_ERROR ("buffer copy failed\n" ); -return -EINVAL ; - } - - buf[buff_copy] =0 ;/* end of string */ - -if (sscanf (buf,"%u %u" , &enable, &frame_count) !=2 ) -return -EINVAL ; - - rc =_dpu_crtc_power_enable (dpu_crtc, true); -if (rc) -return rc; - -mutex_lock (&dpu_crtc->crtc_lock); - dpu_crtc->misr_enable = enable; - dpu_crtc->misr_frame_count = frame_count; -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - dpu_crtc->misr_data[i] =0 ; - m = &dpu_crtc->mixers[i]; -if (!m->hw_lm || !m->hw_lm->ops.setup_misr) -continue ; - - m->hw_lm->ops.setup_misr (m->hw_lm, enable, frame_count); - } -mutex_unlock (&dpu_crtc->crtc_lock); -_dpu_crtc_power_enable (dpu_crtc, false); - -return count; -} - -static ssize_t _dpu_crtc_misr_read (struct file *file, -char __user *user_buff,size_t count,loff_t *ppos) -{ -struct dpu_crtc *dpu_crtc; -struct dpu_crtc_mixer *m; -int i =0 , rc; -u32 misr_status; -ssize_t len =0 ; -char buf[MISR_BUFF_SIZE +1 ] = {'\0' }; - -if (*ppos) -return 0 ; - -if (!file || !file->private_data) -return -EINVAL ; - - dpu_crtc = file->private_data; - rc =_dpu_crtc_power_enable (dpu_crtc, true); -if (rc) -return rc; - -mutex_lock (&dpu_crtc->crtc_lock); -if (!dpu_crtc->misr_enable) { - len +=snprintf (buf + len,MISR_BUFF_SIZE - len, -"disabled\n" ); - goto buff_check; - } - -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; -if (!m->hw_lm || !m->hw_lm->ops.collect_misr) -continue ; - - misr_status = m->hw_lm->ops.collect_misr (m->hw_lm); - dpu_crtc->misr_data[i] = misr_status ? misr_status : - dpu_crtc->misr_data[i]; - len +=snprintf (buf + len,MISR_BUFF_SIZE - len,"lm idx:%d\n" , - m->hw_lm->idx -LM_0 ); - len +=snprintf (buf + len,MISR_BUFF_SIZE - len,"0x%x\n" , - dpu_crtc->misr_data[i]); - } - -buff_check: -if (count <= len) { - len =0 ; - goto end; - } - -if (copy_to_user (user_buff, buf, len)) { - len = -EFAULT ; - goto end; - } - - *ppos += len;/* increase offset */ - -end: -mutex_unlock (&dpu_crtc->crtc_lock); -_dpu_crtc_power_enable (dpu_crtc, false); -return len; -} -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS (__prefix) \ static int __prefix ## _open(struct inode *inode, struct file *file) \ { \
@@ -2014,11 +1882,6 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc) .llseek = seq_lseek, .release = single_release, }; -static const struct file_operations debugfs_misr_fops = { - .open = simple_open, - .read = _dpu_crtc_misr_read, - .write = _dpu_crtc_misr_setup, - };if (!crtc)return -EINVAL ;
@@ -2041,8 +1904,6 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc) dpu_crtc->debugfs_root, &dpu_crtc->base, &dpu_crtc_debugfs_state_fops); -debugfs_create_file ("misr_data" ,0600 , dpu_crtc->debugfs_root, - dpu_crtc, &debugfs_misr_fops);return 0 ; }
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -6
@@ -156,9 +156,6 @@ struct dpu_crtc_frame_event {* @event_thread : Pointer to event handler thread * @event_worker : Event worker queue * @event_lock : Spinlock around event handling code -* @misr_enable : boolean entry indicates misr enable/disable status. -* @misr_frame_count : misr frame count provided by client -* @misr_data : store misr data before turning off the clocks. * @phandle: Pointer to power handler * @power_event : registered power event handle * @cur_perf : current performance committed to clock/bandwidth driver
@@ -206,9 +203,6 @@ struct dpu_crtc {/* for handling internal event thread */ spinlock_t event_lock; -bool misr_enable; -u32 misr_frame_count; -u32 misr_data[CRTC_DUAL_MIXERS ];struct dpu_power_handle *phandle;struct dpu_power_event *power_event;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -127
169 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +0 -6
@@ -114,8 +114,6 @@ struct dpu_encoder_virt_ops {* @handle_post_kickoff: Do any work necessary post-kickoff work * @trigger_start: Process start event on physical encoder * @needs_single_flush: Whether encoder slaves need to be flushed -* @setup_misr: Sets up MISR, enable and disables based on sysfs -* @collect_misr: Collects MISR data on frame update * @hw_reset: Issue HW recovery such as CTL reset and clear * DPU_ENC_ERR_NEEDS_HW_RESET state * @irq_control: Handler to enable/disable all the encoder IRQs
@@ -154,10 +152,6 @@ struct dpu_encoder_phys_ops {void (*handle_post_kickoff)(struct dpu_encoder_phys *phys_enc);void (*trigger_start)(struct dpu_encoder_phys *phys_enc);bool (*needs_single_flush)(struct dpu_encoder_phys *phys_enc); - -void (*setup_misr)(struct dpu_encoder_phys *phys_encs, -bool enable,u32 frame_count); -u32 (*collect_misr)(struct dpu_encoder_phys *phys_enc);void (*hw_reset)(struct dpu_encoder_phys *phys_enc);void (*irq_control)(struct dpu_encoder_phys *phys,bool enable);void (*prepare_idle_pc)(struct dpu_encoder_phys *phys_enc);
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +0 -28
@@ -756,32 +756,6 @@ static void dpu_encoder_phys_vid_irq_control(struct dpu_encoder_phys *phys_enc, } } -static void dpu_encoder_phys_vid_setup_misr (struct dpu_encoder_phys *phys_enc, -bool enable,u32 frame_count) -{ -struct dpu_encoder_phys_vid *vid_enc; - -if (!phys_enc) -return ; - vid_enc =to_dpu_encoder_phys_vid (phys_enc); - -if (vid_enc->hw_intf && vid_enc->hw_intf->ops.setup_misr) - vid_enc->hw_intf->ops.setup_misr (vid_enc->hw_intf, - enable, frame_count); -} - -static u32 dpu_encoder_phys_vid_collect_misr (struct dpu_encoder_phys *phys_enc) -{ -struct dpu_encoder_phys_vid *vid_enc; - -if (!phys_enc) -return 0 ; - vid_enc =to_dpu_encoder_phys_vid (phys_enc); - -return vid_enc->hw_intf && vid_enc->hw_intf->ops.collect_misr ? - vid_enc->hw_intf->ops.collect_misr (vid_enc->hw_intf) :0 ; -} -static int dpu_encoder_phys_vid_get_line_count (struct dpu_encoder_phys *phys_enc) {
@@ -817,8 +791,6 @@ static void dpu_encoder_phys_vid_init_ops(struct dpu_encoder_phys_ops *ops) ops->prepare_for_kickoff = dpu_encoder_phys_vid_prepare_for_kickoff; ops->handle_post_kickoff = dpu_encoder_phys_vid_handle_post_kickoff; ops->needs_single_flush = dpu_encoder_phys_vid_needs_single_flush; - ops->setup_misr = dpu_encoder_phys_vid_setup_misr; - ops->collect_misr = dpu_encoder_phys_vid_collect_misr; ops->hw_reset = dpu_encoder_helper_hw_reset; ops->get_line_count = dpu_encoder_phys_vid_get_line_count; }
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +0 -29
@@ -65,9 +65,6 @@#define INTF_FRAME_COUNT 0x0AC#define INTF_LINE_COUNT 0x0B0 -#define INTF_MISR_CTRL 0x180 -#define INTF_MISR_SIGNATURE 0x184 - static struct dpu_intf_cfg *_intf_offset(enum dpu_intf intf, struct dpu_mdss_cfg *m, void __iomem *addr,
@@ -246,30 +243,6 @@ static void dpu_hw_intf_get_status( } } -static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf, -bool enable,u32 frame_count) -{ -struct dpu_hw_blk_reg_map *c = &intf->hw; -u32 config =0 ; - -DPU_REG_WRITE (c,INTF_MISR_CTRL ,MISR_CTRL_STATUS_CLEAR ); -/* clear misr data */ -wmb (); - -if (enable) - config = (frame_count &MISR_FRAME_COUNT_MASK ) | -MISR_CTRL_ENABLE |INTF_MISR_CTRL_FREE_RUN_MASK ; - -DPU_REG_WRITE (c,INTF_MISR_CTRL , config); -} - -static u32 dpu_hw_intf_collect_misr (struct dpu_hw_intf *intf) -{ -struct dpu_hw_blk_reg_map *c = &intf->hw; - -return DPU_REG_READ (c,INTF_MISR_SIGNATURE ); -} -static u32 dpu_hw_intf_get_line_count (struct dpu_hw_intf *intf) {struct dpu_hw_blk_reg_map *c;
@@ -289,8 +262,6 @@ static void _setup_intf_ops(struct dpu_hw_intf_ops *ops, ops->setup_prg_fetch = dpu_hw_intf_setup_prg_fetch; ops->get_status = dpu_hw_intf_get_status; ops->enable_timing = dpu_hw_intf_enable_timing_engine; - ops->setup_misr = dpu_hw_intf_setup_misr; - ops->collect_misr = dpu_hw_intf_collect_misr; ops->get_line_count = dpu_hw_intf_get_line_count; }
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h +0 -7
@@ -59,8 +59,6 @@ struct intf_status {* @ setup_prog_fetch : enables/disables the programmable fetch logic * @ enable_timing: enable/disable timing engine * @ get_status: returns if timing engine is enabled or not -* @ setup_misr: enables/disables MISR in HW register -* @ collect_misr: reads and stores MISR data from HW register * @ get_line_count: reads current vertical line counter */ struct dpu_hw_intf_ops {
@@ -77,11 +75,6 @@ struct dpu_hw_intf_ops {void (*get_status)(struct dpu_hw_intf *intf,struct intf_status *status); -void (*setup_misr)(struct dpu_hw_intf *intf, -bool enable,u32 frame_count); - -u32 (*collect_misr)(struct dpu_hw_intf *intf); -u32 (*get_line_count)(struct dpu_hw_intf *intf); };
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +0 -29
@@ -34,9 +34,6 @@#define LM_BLEND0_FG_ALPHA 0x04#define LM_BLEND0_BG_ALPHA 0x08 -#define LM_MISR_CTRL 0x310 -#define LM_MISR_SIGNATURE 0x314 - static struct dpu_lm_cfg *_lm_offset(enum dpu_lm mixer, struct dpu_mdss_cfg *m, void __iomem *addr,
@@ -171,30 +168,6 @@ static void dpu_hw_lm_gc(struct dpu_hw_mixer *mixer, { } -static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx, -bool enable,u32 frame_count) -{ -struct dpu_hw_blk_reg_map *c = &ctx->hw; -u32 config =0 ; - -DPU_REG_WRITE (c,LM_MISR_CTRL ,MISR_CTRL_STATUS_CLEAR ); -/* clear misr data */ -wmb (); - -if (enable) - config = (frame_count &MISR_FRAME_COUNT_MASK ) | -MISR_CTRL_ENABLE |INTF_MISR_CTRL_FREE_RUN_MASK ; - -DPU_REG_WRITE (c,LM_MISR_CTRL , config); -} - -static u32 dpu_hw_lm_collect_misr (struct dpu_hw_mixer *ctx) -{ -struct dpu_hw_blk_reg_map *c = &ctx->hw; - -return DPU_REG_READ (c,LM_MISR_SIGNATURE ); -} -static void _setup_mixer_ops (struct dpu_mdss_cfg *m,struct dpu_hw_lm_ops *ops,unsigned long features)
@@ -207,8 +180,6 @@ static void _setup_mixer_ops(struct dpu_mdss_cfg *m, ops->setup_alpha_out = dpu_hw_lm_setup_color3; ops->setup_border_color = dpu_hw_lm_setup_border_color; ops->setup_gc = dpu_hw_lm_gc; - ops->setup_misr = dpu_hw_lm_setup_misr; - ops->collect_misr = dpu_hw_lm_collect_misr; };static struct dpu_hw_blk_ops dpu_hw_ops = {
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h +0 -7
@@ -66,13 +66,6 @@ struct dpu_hw_lm_ops {*/ void (*setup_gc)(struct dpu_hw_mixer *mixer,void *cfg); - -/* setup_misr: enables/disables MISR in HW register */ -void (*setup_misr)(struct dpu_hw_mixer *ctx, -bool enable,u32 frame_count); - -/* collect_misr: reads and stores MISR data from HW register */ -u32 (*collect_misr)(struct dpu_hw_mixer *ctx); };struct dpu_hw_mixer {
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c +0 -3
@@ -50,9 +50,6 @@#define QSEED3_CLK_CTRL0 0x54#define QSEED3_CLK_CTRL1 0x58#define QSEED3_CLK_STATUS 0x5C -#define QSEED3_MISR_CTRL 0x70 -#define QSEED3_MISR_SIGNATURE_0 0x74 -#define QSEED3_MISR_SIGNATURE_1 0x78#define QSEED3_PHASE_INIT_Y_H 0x90#define QSEED3_PHASE_INIT_Y_V 0x94#define QSEED3_PHASE_INIT_UV_H 0x98
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +0 -6
@@ -325,12 +325,6 @@ void dpu_reg_write(struct dpu_hw_blk_reg_map *c,#define DPU_REG_WRITE (c, off, val) dpu_reg_write(c, off, val, #off)#define DPU_REG_READ (c, off) dpu_reg_read(c, off) -#define MISR_FRAME_COUNT_MASK 0xFF -#define MISR_CTRL_ENABLE BIT(8) -#define MISR_CTRL_STATUS BIT(9) -#define MISR_CTRL_STATUS_CLEAR BIT(10) -#define INTF_MISR_CTRL_FREE_RUN_MASK BIT(31) -void *dpu_hw_util_get_dir (void ); void dpu_hw_setup_scaler3(struct dpu_hw_blk_reg_map *c,
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 2/19 drm/msm/dpu: squash power handle event types
In reply to a message not in the archiveDPU power handler maintained PRE/POST versions of power ENABLE/DISABLE events to accommodate tasks which need be handled before/after data bus voting. But since the bus voting API's are deprecated and removed from the driver, squash the events and their clients respective event handlers to handle only ENABLE/DISABLE events.
changes in v5:
- introduced in the series
changes in v6:
- define macro values using BIT(x) (Sean)
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 28 +++++------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 +++---- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 15 +++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 14 ++++-------- 4 files changed, 16 insertions(+), 49 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +6 -22
@@ -1281,26 +1281,12 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg)trace_dpu_crtc_handle_power_event (DRMID (crtc), event_type); -switch (event_type) { -case DPU_POWER_EVENT_POST_ENABLE : -/* restore encoder; crtc will be programmed during commit */ -drm_for_each_encoder (encoder, crtc->dev) { -if (encoder->crtc != crtc) -continue ; +/* restore encoder; crtc will be programmed during commit */ +drm_for_each_encoder (encoder, crtc->dev) { +if (encoder->crtc != crtc) +continue ; -dpu_encoder_virt_restore (encoder); - } -break ; -case DPU_POWER_EVENT_PRE_DISABLE : -case DPU_POWER_EVENT_POST_DISABLE : -/** -* Nothing to do. All the planes on the CRTC will be -* programmed for every frame -*/ -break ; -default : -DPU_DEBUG ("event:%d not handled\n" , event_type); -break ; +dpu_encoder_virt_restore (encoder); }mutex_unlock (&dpu_crtc->crtc_lock);
@@ -1429,9 +1415,7 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,drm_crtc_vblank_on (crtc); dpu_crtc->power_event =dpu_power_handle_register_event ( - dpu_crtc->phandle, -DPU_POWER_EVENT_POST_ENABLE |DPU_POWER_EVENT_POST_DISABLE | -DPU_POWER_EVENT_PRE_DISABLE , + dpu_crtc->phandle,DPU_POWER_EVENT_ENABLE , dpu_crtc_handle_power_event, crtc, dpu_crtc->name); }
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -5
@@ -967,8 +967,7 @@ static void dpu_kms_handle_power_event(u32 event_type, void *usr)if (!dpu_kms)return ; -if (event_type ==DPU_POWER_EVENT_POST_ENABLE ) -dpu_vbif_init_memtypes (dpu_kms); +dpu_vbif_init_memtypes (dpu_kms); }static int dpu_kms_hw_init (struct msm_kms *kms)
@@ -1155,10 +1154,9 @@ static int dpu_kms_hw_init(struct msm_kms *kms)/* * Handle (re)initializations during power enable */ -dpu_kms_handle_power_event (DPU_POWER_EVENT_POST_ENABLE , dpu_kms); +dpu_kms_handle_power_event (DPU_POWER_EVENT_ENABLE , dpu_kms); dpu_kms->power_event =dpu_power_handle_register_event ( - &dpu_kms->phandle, -DPU_POWER_EVENT_POST_ENABLE , + &dpu_kms->phandle,DPU_POWER_EVENT_ENABLE , dpu_kms_handle_power_event, dpu_kms,"kms" );pm_runtime_put_sync (&dpu_kms->pdev->dev);
drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +3 -12
@@ -145,6 +145,7 @@ int dpu_power_resource_enable(struct dpu_power_handle *phandle,bool changed = false;u32 max_usecase_ndx =VOTE_INDEX_DISABLE , prev_usecase_ndx;struct dpu_power_client *client; +u32 event_type;if (!phandle || !pclient) {pr_err ("invalid input argument\n" );
@@ -181,19 +182,9 @@ int dpu_power_resource_enable(struct dpu_power_handle *phandle,if (!changed) goto end; -if (enable) { -dpu_power_event_trigger_locked (phandle, -DPU_POWER_EVENT_PRE_ENABLE ); -dpu_power_event_trigger_locked (phandle, -DPU_POWER_EVENT_POST_ENABLE ); - - }else { -dpu_power_event_trigger_locked (phandle, -DPU_POWER_EVENT_PRE_DISABLE ); -dpu_power_event_trigger_locked (phandle, -DPU_POWER_EVENT_POST_DISABLE ); - } + event_type = enable ?DPU_POWER_EVENT_ENABLE :DPU_POWER_EVENT_DISABLE ; +dpu_power_event_trigger_locked (phandle, event_type); end:mutex_unlock (&phandle->phandle_lock);return 0 ;
drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +4 -10
@@ -23,17 +23,11 @@#include "dpu_io_util.h" -/* event will be triggered before power handler disable */ -#define DPU_POWER_EVENT_PRE_DISABLE 0x1 +/* event will be triggered on power handler disable */ +#define DPU_POWER_EVENT_DISABLE BIT(1) -/* event will be triggered after power handler disable */ -#define DPU_POWER_EVENT_POST_DISABLE 0x2 - -/* event will be triggered before power handler enable */ -#define DPU_POWER_EVENT_PRE_ENABLE 0x4 - -/* event will be triggered after power handler enable */ -#define DPU_POWER_EVENT_POST_ENABLE 0x8 +/* event will be triggered on power handler enable */ +#define DPU_POWER_EVENT_ENABLE BIT(2)/** * mdss_bus_vote_type: register bus vote type
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 3/19 drm/msm/dpu: remove scalar config definitions
In reply to a message not in the archivecleans up left out scalar config definitions from headers
changes in v4:
- none
changes in v5:
- none
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 10 ---------- 2 files changed, 12 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -2
@@ -161,7 +161,6 @@ struct dpu_crtc_frame_event {* @cur_perf : current performance committed to clock/bandwidth driver * @rp_lock : serialization lock for resource pool * @rp_head : list of active resource pool -* @scl3_cfg_lut : qseed3 lut config */ struct dpu_crtc {struct drm_crtc base;
@@ -172,7 +171,6 @@ struct dpu_crtc {u32 num_mixers;bool mixers_swapped;struct dpu_crtc_mixer mixers[CRTC_DUAL_MIXERS ]; -struct dpu_hw_scaler3_lut_cfg *scl3_lut_cfg;struct drm_pending_vblank_event *event;u32 vsync_count;
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +0 -10
@@ -148,16 +148,6 @@ struct dpu_hw_scaler3_cfg {struct dpu_hw_scaler3_de_cfg de; }; -struct dpu_hw_scaler3_lut_cfg { -bool is_configured; -u32 *dir_lut; -size_t dir_len; -u32 *cir_lut; -size_t cir_len; -u32 *sep_lut; -size_t sep_len; -}; -/** * struct dpu_drm_pix_ext_v1 - version 1 of pixel ext structure * @num_ext_pxls_lr: Number of total horizontal pixels
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 4/19 drm/msm/dpu: remove resource pool manager
In reply to a message not in the archiveresource pool manager utility was introduced to manage rotator sessions. Removing the support as the rotator feature doesn't exist.
changes in v4:
- none
changes in v5:
- none
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 205 ------------------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 56 --------- 2 files changed, 261 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -205
@@ -97,187 +97,6 @@ static inline int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool enable)return 0 ; } -/** -* _dpu_crtc_rp_to_crtc - get crtc from resource pool object -* @rp: Pointer to resource pool -* return: Pointer to drm crtc if success; null otherwise -*/ -static struct drm_crtc *_dpu_crtc_rp_to_crtc (struct dpu_crtc_respool *rp) -{ -if (!rp) -return NULL ; - - return container_of(rp, struct dpu_crtc_state, rp)->base.crtc; -} - -/** -* _dpu_crtc_rp_reclaim - reclaim unused, or all if forced, resources in pool -* @rp: Pointer to resource pool -* @force: True to reclaim all resources; otherwise, reclaim only unused ones -* return: None -*/ -static void _dpu_crtc_rp_reclaim (struct dpu_crtc_respool *rp,bool force) -{ -struct dpu_crtc_res *res, *next; -struct drm_crtc *crtc; - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -DPU_DEBUG ("crtc%d.%u %s\n" , crtc->base.id, rp->sequence_id, - force ?"destroy" :"free_unused" ); - -list_for_each_entry_safe (res, next, &rp->res_list, list) { -if (!force && !(res->flags &DPU_CRTC_RES_FLAG_FREE )) -continue ; -DPU_DEBUG ("crtc%d.%u reclaim res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, rp->sequence_id, - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -list_del (&res->list); -if (res->ops.put) - res->ops.put (res->val); -kfree (res); - } -} - -/** -* _dpu_crtc_rp_free_unused - free unused resource in pool -* @rp: Pointer to resource pool -* return: none -*/ -static void _dpu_crtc_rp_free_unused (struct dpu_crtc_respool *rp) -{ -mutex_lock (rp->rp_lock); -_dpu_crtc_rp_reclaim (rp, false); -mutex_unlock (rp->rp_lock); -} - -/** -* _dpu_crtc_rp_destroy - destroy resource pool -* @rp: Pointer to resource pool -* return: None -*/ -static void _dpu_crtc_rp_destroy (struct dpu_crtc_respool *rp) -{ -mutex_lock (rp->rp_lock); -list_del_init (&rp->rp_list); -_dpu_crtc_rp_reclaim (rp, true); -mutex_unlock (rp->rp_lock); -} - -/** -* _dpu_crtc_hw_blk_get - get callback for hardware block -* @val: Resource handle -* @type: Resource type -* @tag: Search tag for given resource -* return: Resource handle -*/ -static void *_dpu_crtc_hw_blk_get (void *val,u32 type,u64 tag) -{ -DPU_DEBUG ("res:%d/0x%llx/%pK\n" , type, tag, val); -return dpu_hw_blk_get (val, type, tag); -} - -/** -* _dpu_crtc_hw_blk_put - put callback for hardware block -* @val: Resource handle -* return: None -*/ -static void _dpu_crtc_hw_blk_put (void *val) -{ -DPU_DEBUG ("res://%pK\n" , val); -dpu_hw_blk_put (val); -} - -/** -* _dpu_crtc_rp_duplicate - duplicate resource pool and reset reference count -* @rp: Pointer to original resource pool -* @dup_rp: Pointer to duplicated resource pool -* return: None -*/ -static void _dpu_crtc_rp_duplicate (struct dpu_crtc_respool *rp, -struct dpu_crtc_respool *dup_rp) -{ -struct dpu_crtc_res *res, *dup_res; -struct drm_crtc *crtc; - -if (!rp || !dup_rp || !rp->rp_head) { -DPU_ERROR ("invalid resource pool\n" ); -return ; - } - - crtc =_dpu_crtc_rp_to_crtc (rp); -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -DPU_DEBUG ("crtc%d.%u duplicate\n" , crtc->base.id, rp->sequence_id); - -mutex_lock (rp->rp_lock); - dup_rp->sequence_id = rp->sequence_id +1 ; -INIT_LIST_HEAD (&dup_rp->res_list); - dup_rp->ops = rp->ops; -list_for_each_entry (res, &rp->res_list, list) { - dup_res =kzalloc (sizeof (struct dpu_crtc_res ),GFP_KERNEL ); -if (!dup_res) { -mutex_unlock (rp->rp_lock); -return ; - } -INIT_LIST_HEAD (&dup_res->list); -atomic_set (&dup_res->refcount,0 ); - dup_res->type = res->type; - dup_res->tag = res->tag; - dup_res->val = res->val; - dup_res->ops = res->ops; - dup_res->flags =DPU_CRTC_RES_FLAG_FREE ; -DPU_DEBUG ("crtc%d.%u dup res:0x%x/0x%llx/%pK/%d\n" , - crtc->base.id, dup_rp->sequence_id, - dup_res->type, dup_res->tag, dup_res->val, -atomic_read (&dup_res->refcount)); -list_add_tail (&dup_res->list, &dup_rp->res_list); -if (dup_res->ops.get) - dup_res->ops.get (dup_res->val,0 ,-1 ); - } - - dup_rp->rp_lock = rp->rp_lock; - dup_rp->rp_head = rp->rp_head; -INIT_LIST_HEAD (&dup_rp->rp_list); -list_add_tail (&dup_rp->rp_list, rp->rp_head); -mutex_unlock (rp->rp_lock); -} - -/** -* _dpu_crtc_rp_reset - reset resource pool after allocation -* @rp: Pointer to original resource pool -* @rp_lock: Pointer to serialization resource pool lock -* @rp_head: Pointer to crtc resource pool head -* return: None -*/ -static void _dpu_crtc_rp_reset (struct dpu_crtc_respool *rp, -struct mutex *rp_lock,struct list_head *rp_head) -{ -if (!rp || !rp_lock || !rp_head) { -DPU_ERROR ("invalid resource pool\n" ); -return ; - } - -mutex_lock (rp_lock); - rp->rp_lock = rp_lock; - rp->rp_head = rp_head; -INIT_LIST_HEAD (&rp->rp_list); - rp->sequence_id =0 ; -INIT_LIST_HEAD (&rp->res_list); - rp->ops.get = _dpu_crtc_hw_blk_get; - rp->ops.put = _dpu_crtc_hw_blk_put; -list_add_tail (&rp->rp_list, rp->rp_head); -mutex_unlock (rp_lock); -} -static void dpu_crtc_destroy (struct drm_crtc *crtc) {struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc);
@@ -965,8 +784,6 @@ static void dpu_crtc_destroy_state(struct drm_crtc *crtc,DPU_DEBUG ("crtc%d\n" , crtc->base.id); -_dpu_crtc_rp_destroy (&cstate->rp); -__drm_atomic_helper_crtc_destroy_state (state);kfree (cstate);
@@ -1220,8 +1037,6 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)/* duplicate base helper */ __drm_atomic_helper_crtc_duplicate_state (crtc, &cstate->base); -_dpu_crtc_rp_duplicate (&old_cstate->rp, &cstate->rp); -return &cstate->base; }
@@ -1258,9 +1073,6 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)return ; } -_dpu_crtc_rp_reset (&cstate->rp, &dpu_crtc->rp_lock, - &dpu_crtc->rp_head); - cstate->base.crtc = crtc; crtc->state = &cstate->base; }
@@ -1653,7 +1465,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, } end: -_dpu_crtc_rp_free_unused (&cstate->rp);kfree (pstates);return rc; }
@@ -1822,8 +1633,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v) {struct drm_crtc *crtc = (struct drm_crtc *) s->private;struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); -struct dpu_crtc_res *res; -struct dpu_crtc_respool *rp;int i;seq_printf (s,"client type: %d\n" ,dpu_crtc_get_client_type (crtc));
@@ -1840,17 +1649,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v) dpu_crtc->cur_perf.max_per_pipe_ib[i]); } -mutex_lock (&dpu_crtc->rp_lock); -list_for_each_entry (rp, &dpu_crtc->rp_head, rp_list) { -seq_printf (s,"rp.%d: " , rp->sequence_id); -list_for_each_entry (res, &rp->res_list, list) -seq_printf (s,"0x%x/0x%llx/%pK/%d " , - res->type, res->tag, res->val, -atomic_read (&res->refcount)); -seq_puts (s,"\n" ); - } -mutex_unlock (&dpu_crtc->rp_lock); -return 0 ; }DEFINE_DPU_DEBUGFS_SEQ_FOPS (dpu_crtc_debugfs_state);
@@ -1965,9 +1763,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane,spin_lock_init (&dpu_crtc->spin_lock);atomic_set (&dpu_crtc->frame_pending,0 ); -mutex_init (&dpu_crtc->rp_lock); -INIT_LIST_HEAD (&dpu_crtc->rp_head); -init_completion (&dpu_crtc->frame_done_comp);INIT_LIST_HEAD (&dpu_crtc->frame_event_list);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -56
80 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 5/19 drm/msm/dpu: remove ping pong split topology variables
In reply to a message not in the archiveremoves left out variables of previous ping pong
split topology cleanup.
changes in v4:
- none
changes in v5:
- none
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -3
@@ -213,7 +213,6 @@ struct dpu_crtc {/** * struct dpu_crtc_state - dpu container for atomic crtc state * @base: Base drm crtc state structure -* @is_ppsplit : Whether current topology requires PPSplit special handling * @bw_control : true if bw/clk controlled by core bw/clk properties * @bw_split_vote : true if bw controlled by llcc/dram bw properties * @lm_bounds : LM boundaries based on current mode full resolution, no ROI.
@@ -228,8 +227,6 @@ struct dpu_crtc_state {bool bw_control;bool bw_split_vote; - -bool is_ppsplit;struct drm_rect lm_bounds[CRTC_DUAL_MIXERS ];uint64_t input_fence_timeout_ns;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 6/19 drm/msm/dpu: enable master-slave encoders explicitly
In reply to a message not in the archiveIdentify slave-master encoders during initialization and enable the encoders explicitly as the current logic has redundant and ambiguous loops.
changes in v4:
- identify master/slave encoder while adding adding physical encoders(Sean)
changes in v5:
- get rid of temporary variable for phys enc(Sean)
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 43 ++++++++--------------------- 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +12 -31
@@ -180,6 +180,7 @@ struct dpu_encoder_virt {unsigned int num_phys_encs;struct dpu_encoder_phys *phys_encs[MAX_PHYS_ENCODERS_PER_VIRTUAL ];struct dpu_encoder_phys *cur_master; +struct dpu_encoder_phys *cur_slave;struct dpu_hw_pingpong *hw_pp[MAX_CHANNELS_PER_ENC ];bool intfs_swapped;
@@ -1141,7 +1142,7 @@ void dpu_encoder_virt_restore(struct drm_encoder *drm_enc)static void dpu_encoder_virt_enable (struct drm_encoder *drm_enc) {struct dpu_encoder_virt *dpu_enc =NULL ; -int i, ret =0 ; +int ret =0 ;struct drm_display_mode *cur_mode =NULL ;if (!drm_enc) {
@@ -1154,21 +1155,12 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)trace_dpu_enc_enable (DRMID (drm_enc), cur_mode->hdisplay, cur_mode->vdisplay); - dpu_enc->cur_master =NULL ; -for (i =0 ; i < dpu_enc->num_phys_encs; i++) { -struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; - -if (phys && phys->ops.is_master && phys->ops.is_master (phys)) { -DPU_DEBUG_ENC (dpu_enc,"master is now idx %d\n" , i); - dpu_enc->cur_master = phys; -break ; - } - } +/* always enable slave encoder before master */ +if (dpu_enc->cur_slave && dpu_enc->cur_slave->ops.enable) + dpu_enc->cur_slave->ops.enable (dpu_enc->cur_slave); -if (!dpu_enc->cur_master) { -DPU_ERROR ("virt encoder has no master! num_phys %d\n" , i); -return ; - } +if (dpu_enc->cur_master && dpu_enc->cur_master->ops.enable) + dpu_enc->cur_master->ops.enable (dpu_enc->cur_master); ret =dpu_encoder_resource_control (drm_enc,DPU_ENC_RC_EVENT_KICKOFF );if (ret) {
@@ -1177,21 +1169,6 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)return ; } -for (i =0 ; i < dpu_enc->num_phys_encs; i++) { -struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; - -if (!phys) -continue ; - -if (phys != dpu_enc->cur_master) { -if (phys->ops.enable) - phys->ops.enable (phys); - } - } - -if (dpu_enc->cur_master->ops.enable) - dpu_enc->cur_master->ops.enable (dpu_enc->cur_master); -_dpu_encoder_virt_enable_helper (drm_enc); }
@@ -2062,6 +2039,11 @@ static int dpu_encoder_virt_add_phys_encs( ++dpu_enc->num_phys_encs; } +if (params->split_role ==ENC_ROLE_SLAVE ) + dpu_enc->cur_slave = enc; +else + dpu_enc->cur_master = enc; +return 0 ; }
@@ -2228,7 +2210,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,if (ret) goto fail; - dpu_enc->cur_master =NULL ;spin_lock_init (&dpu_enc->enc_spinlock);atomic_set (&dpu_enc->frame_done_timeout,0 );
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 7/19 drm/msm/dpu: use kms stored hw mdp block
In reply to a message not in the archiveAvoid querying RM for hw mdp block. Use the one
stored in KMS during initialization.
changes in v4:
- none
changes in v5:
- none
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 12 +----------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 9 +-------- 2 files changed, 2 insertions(+), 19 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +1 -11
@@ -823,7 +823,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( {struct dpu_encoder_phys *phys_enc =NULL ;struct dpu_encoder_phys_cmd *cmd_enc =NULL ; -struct dpu_hw_mdp *hw_mdp;struct dpu_encoder_irq *irq;int i, ret =0 ;
@@ -836,14 +835,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( goto fail; } phys_enc = &cmd_enc->base; - - hw_mdp =dpu_rm_get_mdp (&p->dpu_kms->rm); -if (IS_ERR_OR_NULL (hw_mdp)) { - ret =PTR_ERR (hw_mdp); -DPU_ERROR ("failed to get mdptop\n" ); - goto fail_mdp_init; - } - phys_enc->hw_mdptop = hw_mdp; + phys_enc->hw_mdptop = p->dpu_kms->hw_mdp; phys_enc->intf_idx = p->intf_idx;dpu_encoder_phys_cmd_init_ops (&phys_enc->ops);
@@ -898,8 +890,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(return phys_enc; -fail_mdp_init: -kfree (cmd_enc); fail:return ERR_PTR (ret); }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +1 -8
@@ -801,7 +801,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(struct dpu_encoder_phys *phys_enc =NULL ;struct dpu_encoder_phys_vid *vid_enc =NULL ;struct dpu_rm_hw_iter iter; -struct dpu_hw_mdp *hw_mdp;struct dpu_encoder_irq *irq;int i, ret =0 ;
@@ -818,13 +817,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init( phys_enc = &vid_enc->base; - hw_mdp =dpu_rm_get_mdp (&p->dpu_kms->rm); -if (IS_ERR_OR_NULL (hw_mdp)) { - ret =PTR_ERR (hw_mdp); -DPU_ERROR ("failed to get mdptop\n" ); - goto fail; - } - phys_enc->hw_mdptop = hw_mdp; + phys_enc->hw_mdptop = p->dpu_kms->hw_mdp; phys_enc->intf_idx = p->intf_idx;/**
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 8/19 drm/msm/dpu: iterate for assigned hw ctl in virtual encoder
In reply to a message not in the archiveIn virtual encoder modeset, DPU makes RM request to assign hw blocks for the display. It is also expected in modeset to iterate and associate the physical encoders with their relevant hw blocks. Ping pong blocks are already handled here but hw ctl blocks are not. This change moves the hw_ctl iteration and mapping from physical encoder to virtual encoder.
changes in v4:
- Fix hw_ctl initialization (Sean)
changes in v5:
- Update commit text with details on why the change is needed (Sean)
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 23 +++++++++++++++++++--- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 19 ------------------ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 19 ------------------ 3 files changed, 20 insertions(+), 41 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +20 -3
@@ -1011,9 +1011,10 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,struct dpu_kms *dpu_kms;struct list_head *connector_list;struct drm_connector *conn =NULL , *conn_iter; -struct dpu_rm_hw_iter pp_iter; +struct dpu_rm_hw_iter pp_iter, ctl_iter;struct msm_display_topology topology;enum dpu_rm_topology_name topology_name; +struct dpu_hw_ctl *hw_ctl[MAX_CHANNELS_PER_ENC ] = {NULL };int i =0 , ret;if (!drm_enc) {
@@ -1061,17 +1062,33 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, dpu_enc->hw_pp[i] = (struct dpu_hw_pingpong *) pp_iter.hw; } +dpu_rm_init_hw_iter (&ctl_iter, drm_enc->base.id,DPU_HW_BLK_CTL ); +for (i =0 ; i <MAX_CHANNELS_PER_ENC ; i++) { +if (!dpu_rm_get_hw (&dpu_kms->rm, &ctl_iter)) +break ; + hw_ctl[i] = (struct dpu_hw_ctl *)ctl_iter.hw; + } + topology_name =dpu_rm_get_topology_name (topology);for (i =0 ; i < dpu_enc->num_phys_encs; i++) {struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];if (phys) {if (!dpu_enc->hw_pp[i]) { -DPU_ERROR_ENC (dpu_enc, -"invalid pingpong block for the encoder\n" ); +DPU_ERROR_ENC (dpu_enc,"no pp block assigned" +"at idx: %d\n" , i);return ; } + +if (!hw_ctl[i]) { +DPU_ERROR_ENC (dpu_enc,"no ctl block assigned" +"at idx: %d\n" , i); +return ; + } + phys->hw_pp = dpu_enc->hw_pp[i]; + phys->hw_ctl = hw_ctl[i]; + phys->connector = conn->state->connector; phys->topology_name = topology_name;if (phys->ops.mode_set)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +0 -19
@@ -196,9 +196,6 @@ static void dpu_encoder_phys_cmd_mode_set( {struct dpu_encoder_phys_cmd *cmd_enc =to_dpu_encoder_phys_cmd (phys_enc); -struct dpu_rm *rm = &phys_enc->dpu_kms->rm; -struct dpu_rm_hw_iter iter; -int i, instance;if (!phys_enc || !mode || !adj_mode) {DPU_ERROR ("invalid args\n" );
@@ -208,22 +205,6 @@ static void dpu_encoder_phys_cmd_mode_set(DPU_DEBUG_CMDENC (cmd_enc,"caching mode:\n" );drm_mode_debug_printmodeline (adj_mode); - instance = phys_enc->split_role ==ENC_ROLE_SLAVE ?1 :0 ; - -/* Retrieve previously allocated HW Resources. Shouldn't fail */ -dpu_rm_init_hw_iter (&iter, phys_enc->parent->base.id,DPU_HW_BLK_CTL ); -for (i =0 ; i <= instance; i++) { -if (dpu_rm_get_hw (rm, &iter)) - phys_enc->hw_ctl = (struct dpu_hw_ctl *)iter.hw; - } - -if (IS_ERR_OR_NULL (phys_enc->hw_ctl)) { -DPU_ERROR_CMDENC (cmd_enc,"failed to init ctl: %ld\n" , -PTR_ERR (phys_enc->hw_ctl)); - phys_enc->hw_ctl =NULL ; -return ; - } -_dpu_encoder_phys_cmd_setup_irq_hw_idx (phys_enc); }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +0 -19
@@ -395,9 +395,6 @@ static void dpu_encoder_phys_vid_mode_set(struct drm_display_mode *mode, struct drm_display_mode *adj_mode) { - struct dpu_rm *rm; -struct dpu_rm_hw_iter iter; -int i, instance; struct dpu_encoder_phys_vid *vid_enc;if (!phys_enc || !phys_enc->dpu_kms) {
@@ -405,7 +402,6 @@ static void dpu_encoder_phys_vid_mode_set(return ; } - rm = &phys_enc->dpu_kms->rm; vid_enc =to_dpu_encoder_phys_vid (phys_enc);if (adj_mode) {
@@ -414,21 +410,6 @@ static void dpu_encoder_phys_vid_mode_set(DPU_DEBUG_VIDENC (vid_enc,"caching mode:\n" ); } - instance = phys_enc->split_role ==ENC_ROLE_SLAVE ?1 :0 ; - -/* Retrieve previously allocated HW Resources. Shouldn't fail */ -dpu_rm_init_hw_iter (&iter, phys_enc->parent->base.id,DPU_HW_BLK_CTL ); -for (i =0 ; i <= instance; i++) { -if (dpu_rm_get_hw (rm, &iter)) - phys_enc->hw_ctl = (struct dpu_hw_ctl *)iter.hw; - } -if (IS_ERR_OR_NULL (phys_enc->hw_ctl)) { -DPU_ERROR_VIDENC (vid_enc,"failed to init ctl, %ld\n" , -PTR_ERR (phys_enc->hw_ctl)); - phys_enc->hw_ctl =NULL ; -return ; - } -_dpu_encoder_phys_vid_setup_irq_hw_idx (phys_enc); }
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 9/19 drm/msm/dpu: avoid querying for hw intf before assignment
In reply to a message not in the archiveResource manager assigns hw_intf blocks for the encoder only on modeset. If queried for hw_intf objects during init, it will be NULL. Since hw_intf objects are needed only after encoder enable, defer the query to encoder enable which will be triggered after modeset.
changes in v4:
- Add details on commit text on why the change is needed (Sean)
changes in v5:
- Reword commit text on the usage of hw_intf objects (Sean)
changes in v6:
- none
--- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 53 +++++++--------------- 1 file changed, 16 insertions(+), 37 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +16 -37
@@ -462,7 +462,7 @@ static void dpu_encoder_phys_vid_enable(struct dpu_encoder_phys *phys_enc) {struct msm_drm_private *priv;struct dpu_encoder_phys_vid *vid_enc; -struct dpu_hw_intf *intf; +struct dpu_rm_hw_iter iter;struct dpu_hw_ctl *ctl;u32 flush_mask =0 ;
@@ -474,11 +474,20 @@ static void dpu_encoder_phys_vid_enable(struct dpu_encoder_phys *phys_enc) priv = phys_enc->parent->dev->dev_private; vid_enc =to_dpu_encoder_phys_vid (phys_enc); - intf = vid_enc->hw_intf; ctl = phys_enc->hw_ctl; -if (!vid_enc->hw_intf || !phys_enc->hw_ctl) { -DPU_ERROR ("invalid hw_intf %d hw_ctl %d\n" , - vid_enc->hw_intf !=0 , phys_enc->hw_ctl !=0 ); + +dpu_rm_init_hw_iter (&iter, phys_enc->parent->base.id,DPU_HW_BLK_INTF ); +while (dpu_rm_get_hw (&phys_enc->dpu_kms->rm, &iter)) { +struct dpu_hw_intf *hw_intf = (struct dpu_hw_intf *)iter.hw; + +if (hw_intf->idx == phys_enc->intf_idx) { + vid_enc->hw_intf = hw_intf; +break ; + } + } + +if (!vid_enc->hw_intf) { +DPU_ERROR ("hw_intf not assigned\n" );return ; }
@@ -500,7 +509,7 @@ static void dpu_encoder_phys_vid_enable(struct dpu_encoder_phys *phys_enc) !dpu_encoder_phys_vid_is_master(phys_enc)) goto skip_flush; - ctl->ops.get_bitmask_intf (ctl, &flush_mask, intf->idx); + ctl->ops.get_bitmask_intf (ctl, &flush_mask, vid_enc->hw_intf->idx); ctl->ops.update_pending_flush (ctl, flush_mask); skip_flush:
@@ -531,22 +540,13 @@ static void dpu_encoder_phys_vid_get_hw_resources( struct dpu_encoder_hw_resources *hw_res, struct drm_connector_state *conn_state) { - struct dpu_encoder_phys_vid *vid_enc; -if (!phys_enc || !hw_res) {DPU_ERROR ("invalid arg(s), enc %d hw_res %d conn_state %d\n" , phys_enc !=0 , hw_res !=0 , conn_state !=0 );return ; } - vid_enc =to_dpu_encoder_phys_vid (phys_enc); -if (!vid_enc->hw_intf) { -DPU_ERROR ("invalid arg(s), hw_intf\n" ); -return ; - } - -DPU_DEBUG_VIDENC (vid_enc,"\n" ); - hw_res->intfs[vid_enc->hw_intf->idx -INTF_0 ] =INTF_MODE_VIDEO ; + hw_res->intfs[phys_enc->intf_idx -INTF_0 ] =INTF_MODE_VIDEO ; } static int _dpu_encoder_phys_vid_wait_for_vblank(
@@ -781,7 +781,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init( {struct dpu_encoder_phys *phys_enc =NULL ;struct dpu_encoder_phys_vid *vid_enc =NULL ; -struct dpu_rm_hw_iter iter;struct dpu_encoder_irq *irq;int i, ret =0 ;
@@ -801,26 +800,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init( phys_enc->hw_mdptop = p->dpu_kms->hw_mdp; phys_enc->intf_idx = p->intf_idx; -/** -* hw_intf resource permanently assigned to this encoder -* Other resources allocated at atomic commit time by use case -*/ -dpu_rm_init_hw_iter (&iter,0 ,DPU_HW_BLK_INTF ); -while (dpu_rm_get_hw (&p->dpu_kms->rm, &iter)) { -struct dpu_hw_intf *hw_intf = (struct dpu_hw_intf *)iter.hw; - -if (hw_intf->idx == p->intf_idx) { - vid_enc->hw_intf = hw_intf; -break ; - } - } - -if (!vid_enc->hw_intf) { - ret = -EINVAL ; -DPU_ERROR ("failed to get hw_intf\n" ); - goto fail; - } -DPU_DEBUG_VIDENC (vid_enc,"\n" );dpu_encoder_phys_vid_init_ops (&phys_enc->ops);
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 10/19 drm/msm/dpu: make crtc get_mixer_width helper static
In reply to a message not in the archiveMark CRTC get_mixer_width helper API static as it is not used outside the file.
changes in v4:
- Patch introduced in the series
changes in v5:
- Simplify the inline function (Sean)
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 12 +++++++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 18 ------------------ 2 files changed, 9 insertions(+), 21 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +9 -3
@@ -47,6 +47,12 @@#define LEFT_MIXER 0#define RIGHT_MIXER 1 +static inline int _dpu_crtc_get_mixer_width (struct dpu_crtc_state *cstate, +struct drm_display_mode *mode) +{ +return mode->hdisplay / cstate->num_mixers; +} +static inline struct dpu_kms *_dpu_crtc_get_kms (struct drm_crtc *crtc) {struct msm_drm_private *priv;
@@ -601,7 +607,7 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, cstate =to_dpu_crtc_state (state); adj_mode = &state->adjusted_mode; - crtc_split_width =dpu_crtc_get_mixer_width (dpu_crtc, cstate, adj_mode); + crtc_split_width =_dpu_crtc_get_mixer_width (cstate, adj_mode);for (i =0 ; i < dpu_crtc->num_mixers; i++) {struct drm_rect *r = &cstate->lm_bounds[i];
@@ -1283,7 +1289,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,memset (pipe_staged,0 ,sizeof (pipe_staged)); - mixer_width =dpu_crtc_get_mixer_width (dpu_crtc, cstate, mode); + mixer_width =_dpu_crtc_get_mixer_width (cstate, mode);_dpu_crtc_setup_lm_bounds (crtc, state);
@@ -1519,7 +1525,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)mutex_lock (&dpu_crtc->crtc_lock); mode = &crtc->state->adjusted_mode; - out_width =dpu_crtc_get_mixer_width (dpu_crtc, cstate, mode); + out_width =_dpu_crtc_get_mixer_width (cstate, mode);seq_printf (s,"crtc:%d width:%d height:%d\n" , crtc->base.id, mode->hdisplay, mode->vdisplay);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -18
@@ -238,24 +238,6 @@ struct dpu_crtc_state { container_of(x, struct dpu_crtc_state, base)/** -* dpu_crtc_get_mixer_width - get the mixer width -* Mixer width will be same as panel width(/2 for split) - */ -static inline int dpu_crtc_get_mixer_width (struct dpu_crtc *dpu_crtc, -struct dpu_crtc_state *cstate,struct drm_display_mode *mode) -{ -u32 mixer_width; - -if (!dpu_crtc || !cstate || !mode) -return 0 ; - - mixer_width = (dpu_crtc->num_mixers ==CRTC_DUAL_MIXERS ? - mode->hdisplay /CRTC_DUAL_MIXERS : mode->hdisplay); - -return mixer_width; -} - -/** * dpu_crtc_get_mixer_height - get the mixer height * Mixer height will be same as panel height */
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 11/19 drm/msm/dpu: move hw resource tracking to crtc state
In reply to a message not in the archivePrep changes for state based resource management.
Moves all the hw block tracking for the crtc to the state object.
changes in v4:
- Serialize crtc state access in debugfs handlers (Sean)
- Split the crtc width query as a separate change (Sean)
changes in v5:
- mode set lock all before crtc state access (Sean)
- remove unwanted memset for hw mixer cache (Sean)
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 59 +++++++++++++++----------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 22 ++++++------ 2 files changed, 39 insertions(+), 42 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +28 -31
@@ -155,9 +155,9 @@ static void _dpu_crtc_program_lm_output_roi(struct drm_crtc *crtc) crtc_state =to_dpu_crtc_state (crtc->state); lm_horiz_position =0 ; -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < crtc_state->num_mixers; lm_idx++) {const struct drm_rect *lm_roi = &crtc_state->lm_bounds[lm_idx]; -struct dpu_hw_mixer *hw_lm = dpu_crtc->mixers[lm_idx].hw_lm; +struct dpu_hw_mixer *hw_lm = crtc_state->mixers[lm_idx].hw_lm;struct dpu_hw_mixer_cfg cfg;if (!lm_roi || !drm_rect_visible (lm_roi))
@@ -238,7 +238,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, fb ? fb->modifier : 0);/* blend config update */ -for (lm_idx =0 ; lm_idx < dpu_crtc->num_mixers; lm_idx++) { +for (lm_idx =0 ; lm_idx < cstate->num_mixers; lm_idx++) {_dpu_crtc_setup_blend_cfg (mixer + lm_idx, pstate, format);
@@ -262,7 +262,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,static void _dpu_crtc_blend_setup (struct drm_crtc *crtc) {struct dpu_crtc *dpu_crtc; -struct dpu_crtc_state *dpu_crtc_state; +struct dpu_crtc_state *cstate;struct dpu_crtc_mixer *mixer;struct dpu_hw_ctl *ctl;struct dpu_hw_mixer *lm;
@@ -273,17 +273,12 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)return ; dpu_crtc =to_dpu_crtc (crtc); - dpu_crtc_state =to_dpu_crtc_state (crtc->state); - mixer = dpu_crtc->mixers; + cstate =to_dpu_crtc_state (crtc->state); + mixer = cstate->mixers;DPU_DEBUG ("%s\n" , dpu_crtc->name); -if (dpu_crtc->num_mixers >CRTC_DUAL_MIXERS ) { -DPU_ERROR ("invalid number mixers: %d\n" , dpu_crtc->num_mixers); -return ; - } - -for (i =0 ; i < dpu_crtc->num_mixers; i++) { +for (i =0 ; i < cstate->num_mixers; i++) {if (!mixer[i].hw_lm || !mixer[i].hw_ctl) {DPU_ERROR ("invalid lm or ctl assigned to mixer\n" );return ;
@@ -300,7 +295,7 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)_dpu_crtc_blend_setup_mixer (crtc, dpu_crtc, mixer); -for (i =0 ; i < dpu_crtc->num_mixers; i++) { +for (i =0 ; i < cstate->num_mixers; i++) { ctl = mixer[i].hw_ctl; lm = mixer[i].hw_lm;
@@ -522,7 +517,7 @@ static void _dpu_crtc_setup_mixer_for_encoder(struct drm_crtc *crtc, struct drm_encoder *enc) { - struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); + struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);struct dpu_kms *dpu_kms =_dpu_crtc_get_kms (crtc);struct dpu_rm *rm = &dpu_kms->rm;struct dpu_crtc_mixer *mixer;
@@ -534,8 +529,8 @@ static void _dpu_crtc_setup_mixer_for_encoder(dpu_rm_init_hw_iter (&ctl_iter, enc->base.id,DPU_HW_BLK_CTL );/* Set up all the mixers and ctls reserved by this encoder */ -for (i = dpu_crtc->num_mixers; i <ARRAY_SIZE (dpu_crtc->mixers); i++) { - mixer = &dpu_crtc->mixers[i]; +for (i = cstate->num_mixers; i <ARRAY_SIZE (cstate->mixers); i++) { + mixer = &cstate->mixers[i];if (!dpu_rm_get_hw (rm, &lm_iter))break ;
@@ -560,7 +555,7 @@ static void _dpu_crtc_setup_mixer_for_encoder( mixer->encoder = enc; - dpu_crtc->num_mixers++; + cstate->num_mixers++;DPU_DEBUG ("setup mixer %d: lm %d\n" , i, mixer->hw_lm->idx -LM_0 ); DPU_DEBUG("setup mixer %d: ctl %d\n",
@@ -573,10 +568,6 @@ static void _dpu_crtc_setup_mixers(struct drm_crtc *crtc)struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc);struct drm_encoder *enc; - dpu_crtc->num_mixers =0 ; - dpu_crtc->mixers_swapped = false; -memset (dpu_crtc->mixers,0 ,sizeof (dpu_crtc->mixers)); -mutex_lock (&dpu_crtc->crtc_lock);/* Check for mixers on all encoders attached to this crtc */ list_for_each_entry (enc, &crtc->dev->mode_config.encoder_list, head) {
@@ -609,7 +600,7 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, adj_mode = &state->adjusted_mode; crtc_split_width =_dpu_crtc_get_mixer_width (cstate, adj_mode); -for (i =0 ; i < dpu_crtc->num_mixers; i++) { +for (i =0 ; i < cstate->num_mixers; i++) {struct drm_rect *r = &cstate->lm_bounds[i]; r->x1 = crtc_split_width * i; r->y1 =0 ;
@@ -626,6 +617,7 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state *old_state) {struct dpu_crtc *dpu_crtc; +struct dpu_crtc_state *cstate;struct drm_encoder *encoder;struct drm_device *dev;unsigned long flags;
@@ -645,10 +637,11 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,DPU_DEBUG ("crtc%d\n" , crtc->base.id); dpu_crtc =to_dpu_crtc (crtc); + cstate =to_dpu_crtc_state (crtc->state); dev = crtc->dev; smmu_state = &dpu_crtc->smmu_state; -if (!dpu_crtc->num_mixers) { +if (!cstate->num_mixers) {_dpu_crtc_setup_mixers (crtc);_dpu_crtc_setup_lm_bounds (crtc, crtc->state); }
@@ -675,7 +668,7 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,* it means we are trying to flush a CRTC whose state is disabled: * nothing else needs to be done. */ -if (unlikely (!dpu_crtc->num_mixers)) +if (unlikely (!cstate->num_mixers))return ;_dpu_crtc_blend_setup (crtc);
@@ -739,7 +732,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc *crtc,* it means we are trying to flush a CRTC whose state is disabled: * nothing else needs to be done. */ -if (unlikely (!dpu_crtc->num_mixers)) +if (unlikely (!cstate->num_mixers))return ;/*
@@ -854,7 +847,7 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)* it means we are trying to start a CRTC whose state is disabled: * nothing else needs to be done. */ -if (unlikely (!dpu_crtc->num_mixers)) +if (unlikely (!cstate->num_mixers))return ;DPU_ATRACE_BEGIN ("crtc_commit" );
@@ -1088,12 +1081,14 @@ static void dpu_crtc_handle_power_event(u32 event_type, void *arg)struct drm_crtc *crtc = arg;struct dpu_crtc *dpu_crtc;struct drm_encoder *encoder; +struct dpu_crtc_state *cstate;if (!crtc) {DPU_ERROR ("invalid crtc\n" );return ; } dpu_crtc =to_dpu_crtc (crtc); + cstate =to_dpu_crtc_state (dpu_crtc->base.state);mutex_lock (&dpu_crtc->crtc_lock);
@@ -1174,9 +1169,8 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)dpu_power_handle_unregister_event (dpu_crtc->phandle, dpu_crtc->power_event); -memset (dpu_crtc->mixers,0 ,sizeof (dpu_crtc->mixers)); - dpu_crtc->num_mixers =0 ; - dpu_crtc->mixers_swapped = false; +memset (cstate->mixers,0 ,sizeof (cstate->mixers)); + cstate->num_mixers =0 ;/* disable clk & bw control until clk & bw properties are set */ cstate->bw_control = false;
@@ -1521,6 +1515,8 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) dpu_crtc = s->private; crtc = &dpu_crtc->base; + +drm_modeset_lock_all (crtc->dev); cstate =to_dpu_crtc_state (crtc->state);mutex_lock (&dpu_crtc->crtc_lock);
@@ -1532,8 +1528,8 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)seq_puts (s,"\n" ); -for (i =0 ; i < dpu_crtc->num_mixers; ++i) { - m = &dpu_crtc->mixers[i]; +for (i =0 ; i < cstate->num_mixers; ++i) { + m = &cstate->mixers[i];if (!m->hw_lm)seq_printf (s,"\tmixer[%d] has no lm\n" , i);else if (!m->hw_ctl)
@@ -1613,6 +1609,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)seq_printf (s,"vblank_enable:%d\n" , dpu_crtc->vblank_requested);mutex_unlock (&dpu_crtc->crtc_lock); +drm_modeset_unlock_all (crtc->dev);return 0 ; }
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +11 -11
@@ -121,11 +121,6 @@ struct dpu_crtc_frame_event {* struct dpu_crtc - virtualized CRTC data structure * @base : Base drm crtc structure * @name : ASCII description of this crtc -* @num_ctls : Number of ctl paths in use -* @num_mixers : Number of mixers in use -* @mixers_swapped: Whether the mixers have been swapped for left/right update -* especially in the case of DSC Merge. -* @mixers : List of active mixers * @event : Pointer to last received drm vblank event. If there is a * pending vblank event, this will be non-null. * @vsync_count : Running count of received vsync events
@@ -164,12 +159,6 @@ struct dpu_crtc {struct drm_crtc base;char name[DPU_CRTC_NAME_SIZE ]; -/* HW Resources reserved for the crtc */ -u32 num_ctls; -u32 num_mixers; -bool mixers_swapped; -struct dpu_crtc_mixer mixers[CRTC_DUAL_MIXERS ]; -struct drm_pending_vblank_event *event;u32 vsync_count;
@@ -221,6 +210,10 @@ struct dpu_crtc {* @property_values: Current crtc property values * @input_fence_timeout_ns : Cached input fence timeout, in ns * @new_perf: new performance state being requested +* @num_mixers : Number of mixers in use +* @mixers : List of active mixers +* @num_ctls : Number of ctl paths in use +* @hw_ctls : List of active ctl paths */ struct dpu_crtc_state {struct drm_crtc_state base;
@@ -232,6 +225,13 @@ struct dpu_crtc_state {uint64_t input_fence_timeout_ns;struct dpu_core_perf_params new_perf; + +/* HW Resources reserved for the crtc */ +u32 num_mixers; +struct dpu_crtc_mixer mixers[CRTC_DUAL_MIXERS ]; + +u32 num_ctls; +struct dpu_hw_ctl *hw_ctls[CRTC_DUAL_MIXERS ]; };#define to_dpu_crtc_state (x) \
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 12/19 drm/msm/dpu: rename hw_ctl to lm_ctl
In reply to a message not in the archiveRename hw_ctl to lm_ctl to mean the ctl associated with the hw layer mixer block.
sed -i 's/\([*@.>]\)hw_ctl\([^s]\)/\1lm_ctl\2/g' dpu_crtc.c dpu_crtc.h
changes in v4:
- Specifiy shell command used for renaming (Sean)
changes in v5:
- none
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 26 +++++++++++++------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +13 -13
@@ -194,7 +194,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,return ; } - ctl = mixer->hw_ctl; + ctl = mixer->lm_ctl; lm = mixer->hw_lm; stage_cfg = &dpu_crtc->stage_cfg; cstate =to_dpu_crtc_state (crtc->state);
@@ -279,15 +279,15 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)DPU_DEBUG ("%s\n" , dpu_crtc->name);for (i =0 ; i < cstate->num_mixers; i++) { -if (!mixer[i].hw_lm || !mixer[i].hw_ctl) { +if (!mixer[i].hw_lm || !mixer[i].lm_ctl) {DPU_ERROR ("invalid lm or ctl assigned to mixer\n" );return ; } mixer[i].mixer_op_mode =0 ; mixer[i].flush_mask =0 ; -if (mixer[i].hw_ctl->ops.clear_all_blendstages) - mixer[i].hw_ctl->ops.clear_all_blendstages ( - mixer[i].hw_ctl); +if (mixer[i].lm_ctl->ops.clear_all_blendstages) + mixer[i].lm_ctl->ops.clear_all_blendstages ( + mixer[i].lm_ctl); }/* initialize stage cfg */
@@ -296,7 +296,7 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc)_dpu_crtc_blend_setup_mixer (crtc, dpu_crtc, mixer);for (i =0 ; i < cstate->num_mixers; i++) { - ctl = mixer[i].hw_ctl; + ctl = mixer[i].lm_ctl; lm = mixer[i].hw_lm; lm->ops.setup_alpha_out (lm, mixer[i].mixer_op_mode);
@@ -540,14 +540,14 @@ static void _dpu_crtc_setup_mixer_for_encoder(if (!dpu_rm_get_hw (rm, &ctl_iter)) {DPU_DEBUG ("no ctl assigned to lm %d, using previous\n" , mixer->hw_lm->idx -LM_0 ); - mixer->hw_ctl = last_valid_ctl; + mixer->lm_ctl = last_valid_ctl; }else { - mixer->hw_ctl = (struct dpu_hw_ctl *)ctl_iter.hw; - last_valid_ctl = mixer->hw_ctl; + mixer->lm_ctl = (struct dpu_hw_ctl *)ctl_iter.hw; + last_valid_ctl = mixer->lm_ctl; }/* Shouldn't happen, mixers are always >= ctls */ -if (!mixer->hw_ctl) { +if (!mixer->lm_ctl) {DPU_ERROR ("no valid ctls found for lm %d\n" , mixer->hw_lm->idx -LM_0 );return ;
@@ -559,7 +559,7 @@ static void _dpu_crtc_setup_mixer_for_encoder(DPU_DEBUG ("setup mixer %d: lm %d\n" , i, mixer->hw_lm->idx -LM_0 );DPU_DEBUG ("setup mixer %d: ctl %d\n" , - i, mixer->hw_ctl->idx -CTL_0 ); + i, mixer->lm_ctl->idx -CTL_0 ); } }
@@ -1532,11 +1532,11 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) m = &cstate->mixers[i];if (!m->hw_lm)seq_printf (s,"\tmixer[%d] has no lm\n" , i); -else if (!m->hw_ctl) +else if (!m->lm_ctl)seq_printf (s,"\tmixer[%d] has no ctl\n" , i);else seq_printf (s,"\tmixer:%d ctl:%d width:%d height:%d\n" , - m->hw_lm->idx -LM_0 , m->hw_ctl->idx -CTL_0 , + m->hw_lm->idx -LM_0 , m->lm_ctl->idx -CTL_0 , out_width, mode->vdisplay); }
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +2 -2
@@ -83,14 +83,14 @@ struct dpu_crtc_smmu_state_data {/** * struct dpu_crtc_mixer: stores the map for each virtual pipeline in the CRTC * @hw_lm: LM HW Driver context -* @hw_ctl: CTL Path HW driver context +* @lm_ctl: CTL Path HW driver context * @encoder: Encoder attached to this lm & ctl * @mixer_op_mode: mixer blending operation mode * @flush_mask: mixer flush mask for ctl, mixer and pipe */ struct dpu_crtc_mixer {struct dpu_hw_mixer *hw_lm; -struct dpu_hw_ctl *hw_ctl; +struct dpu_hw_ctl *lm_ctl;struct drm_encoder *encoder;u32 mixer_op_mode;u32 flush_mask;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 13/19 drm/msm/dpu: clean up destination scaler residue
In reply to a message not in the archiveDestination scaling(DS) is a Snapdragon hardware feature to scale up the display ROI after layer blending. DPU driver doesn't support programming of DS blocks yet. This change cleans up the residual code present in catalog and RM for DS block handling. Support for the same can be added back when the feature is formally implemented.
changes in v5:
- introduced in the series
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 42 +++++--------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 40 ------------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 7 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 10 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 -- 5 files changed, 7 insertions(+), 94 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +7 -35
@@ -74,7 +74,6 @@ .base = 0x0, .len = 0x45C, .features = 0, .highest_bank_bit = 0x2, - .has_dest_scaler = true, .clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2AC, .bit_off = 0}, .clk_ctrls[DPU_CLK_CTRL_VIG1] = {
@@ -220,48 +219,23 @@ }, }; -#define LM_BLK (_name, _id, _base, _ds, _pp, _lmpair) \ +#define LM_BLK (_name, _id, _base, _pp, _lmpair) \ { \ .name = _name, .id = _id, \ .base = _base, .len = 0x320, \ .features = MIXER_SDM845_MASK, \ .sblk = &sdm845_lm_sblk, \ - .ds = _ds, \ .pingpong = _pp, \ .lm_pair_mask = (1 << _lmpair) \ }static struct dpu_lm_cfg sdm845_lm[] = { -LM_BLK ("lm_0" ,LM_0 ,0x44000 ,DS_0 ,PINGPONG_0 ,LM_1 ), -LM_BLK ("lm_1" ,LM_1 ,0x45000 ,DS_1 ,PINGPONG_1 ,LM_0 ), -LM_BLK ("lm_2" ,LM_2 ,0x46000 ,DS_MAX ,PINGPONG_2 ,LM_5 ), -LM_BLK ("lm_3" ,LM_3 ,0x0 ,DS_MAX ,PINGPONG_MAX ,0 ), -LM_BLK ("lm_4" ,LM_4 ,0x0 ,DS_MAX ,PINGPONG_MAX ,0 ), -LM_BLK ("lm_5" ,LM_5 ,0x49000 ,DS_MAX ,PINGPONG_3 ,LM_2 ), -}; - -/************************************************************* -* DS sub blocks config -*************************************************************/ -static const struct dpu_ds_top_cfg sdm845_ds_top = { - .name ="ds_top_0" , .id =DS_TOP , - .base =0x60000 , .len =0xc , - .maxinputwidth =DEFAULT_DPU_LINE_WIDTH , - .maxoutputwidth =DEFAULT_DPU_OUTPUT_LINE_WIDTH , - .maxupscale =MAX_UPSCALE_RATIO , -}; - -#define DS_BLK (_name, _id, _base) \ - {\ - .name = _name, .id = _id, \ - .base = _base, .len = 0x800, \ - .features = DPU_SSPP_SCALER_QSEED3, \ - .top = &sdm845_ds_top \ - } - -static struct dpu_ds_cfg sdm845_ds[] = { -DS_BLK ("ds_0" ,DS_0 ,0x800 ), -DS_BLK ("ds_1" ,DS_1 ,0x1000 ), +LM_BLK ("lm_0" ,LM_0 ,0x44000 ,PINGPONG_0 ,LM_1 ), +LM_BLK ("lm_1" ,LM_1 ,0x45000 ,PINGPONG_1 ,LM_0 ), +LM_BLK ("lm_2" ,LM_2 ,0x46000 ,PINGPONG_2 ,LM_5 ), +LM_BLK ("lm_3" ,LM_3 ,0x0 ,PINGPONG_MAX ,0 ), +LM_BLK ("lm_4" ,LM_4 ,0x0 ,PINGPONG_MAX ,0 ), +LM_BLK ("lm_5" ,LM_5 ,0x49000 ,PINGPONG_3 ,LM_2 ), };/*************************************************************
@@ -454,8 +428,6 @@ static void sdm845_cfg_init(struct dpu_mdss_cfg *dpu_cfg) .sspp = sdm845_sspp, .mixer_count = ARRAY_SIZE(sdm845_lm), .mixer = sdm845_lm, - .ds_count = ARRAY_SIZE(sdm845_ds), - .ds = sdm845_ds, .pingpong_count = ARRAY_SIZE(sdm845_pp), .pingpong = sdm845_pp, .cdm_count = ARRAY_SIZE(sdm845_cdm),
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +0 -40
@@ -428,7 +428,6 @@ struct dpu_clk_ctrl_reg {* @highest_bank_bit: UBWC parameter * @ubwc_static: ubwc static configuration * @ubwc_swizzle: ubwc default swizzle setting -* @has_dest_scaler: indicates support of destination scaler * @clk_ctrls clock control register definition */ struct dpu_mdp_cfg {
@@ -436,7 +435,6 @@ struct dpu_mdp_cfg {u32 highest_bank_bit;u32 ubwc_static;u32 ubwc_swizzle; -bool has_dest_scaler;struct dpu_clk_ctrl_reg clk_ctrls[DPU_CLK_CTRL_MAX ]; };
@@ -474,50 +472,16 @@ struct dpu_sspp_cfg {* @features bit mask identifying sub-blocks/features * @sblk: LM Sub-blocks information * @pingpong: ID of connected PingPong, PINGPONG_MAX if unsupported -* @ds: ID of connected DS, DS_MAX if unsupported * @lm_pair_mask: Bitmask of LMs that can be controlled by same CTL */ struct dpu_lm_cfg {DPU_HW_BLK_INFO ;const struct dpu_lm_sub_blks *sblk;u32 pingpong; -u32 ds;unsigned long lm_pair_mask; };/** -* struct dpu_ds_top_cfg - information of dest scaler top -* @id enum identifying this block -* @base register offset of this block -* @features bit mask identifying features -* @version hw version of dest scaler -* @maxinputwidth maximum input line width -* @maxoutputwidth maximum output line width -* @maxupscale maximum upscale ratio -*/ -struct dpu_ds_top_cfg { -DPU_HW_BLK_INFO ; -u32 version; -u32 maxinputwidth; -u32 maxoutputwidth; -u32 maxupscale; -}; - -/** -* struct dpu_ds_cfg - information of dest scaler blocks -* @id enum identifying this block -* @base register offset wrt DS top offset -* @features bit mask identifying features -* @version hw version of the qseed block -* @top DS top information -*/ -struct dpu_ds_cfg { -DPU_HW_BLK_INFO ; -u32 version; -const struct dpu_ds_top_cfg *top; -}; - -/** * struct dpu_pingpong_cfg - information of PING-PONG blocks * @id enum identifying this block * @base register offset of this block
@@ -728,9 +692,6 @@ struct dpu_mdss_cfg {u32 mixer_count;struct dpu_lm_cfg *mixer; -u32 ds_count; -struct dpu_ds_cfg *ds; -u32 pingpong_count;struct dpu_pingpong_cfg *pingpong;
@@ -771,7 +732,6 @@ struct dpu_mdss_hw_cfg_handler {#define BLK_DMA (s) ((s)->dma)#define BLK_CURSOR (s) ((s)->cursor)#define BLK_MIXER (s) ((s)->mixer) -#define BLK_DS (s) ((s)->ds)#define BLK_PINGPONG (s) ((s)->pingpong)#define BLK_CDM (s) ((s)->cdm)#define BLK_INTF (s) ((s)->intf)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +0 -7
@@ -173,13 +173,6 @@ enum dpu_dspp {DSPP_MAX }; -enum dpu_ds { -DS_TOP , -DS_0 , -DS_1 , -DS_MAX -}; -enum dpu_ctl {CTL_0 =1 ,CTL_1 ,
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +0 -10
@@ -27,7 +27,6 @@#define RM_RQ_LOCK (r) ((r)->top_ctrl & BIT(DPU_RM_TOPCTL_RESERVE_LOCK))#define RM_RQ_CLEAR (r) ((r)->top_ctrl & BIT(DPU_RM_TOPCTL_RESERVE_CLEAR)) -#define RM_RQ_DS (r) ((r)->top_ctrl & BIT(DPU_RM_TOPCTL_DS))#define RM_IS_TOPOLOGY_MATCH (t, r) ((t).num_lm == (r).num_lm && \ (t).num_comp_enc == (r).num_enc && \ (t).num_intf == (r).num_intf)
@@ -820,15 +819,6 @@ static int _dpu_rm_populate_requirements(return -EINVAL ; } -/** -* Set the requirement based on caps if not set from user space -* This will ensure to select LM tied with DS blocks -* Currently, DS blocks are tied with LM 0 and LM 1 (primary display) -*/ -if (!RM_RQ_DS (reqs) && rm->hw_mdp->caps->has_dest_scaler && - conn_state->connector->connector_type ==DRM_MODE_CONNECTOR_DSI ) - reqs->top_ctrl |=BIT (DPU_RM_TOPCTL_DS ); -DRM_DEBUG_KMS ("top_ctrl: 0x%llX num_h_tiles: %d\n" , reqs->top_ctrl, reqs->hw_res.display_num_of_h_tiles); DRM_DEBUG_KMS("num_lm: %d num_ctl: %d topology: %d split_display: %d\n",
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +0 -2
@@ -45,12 +45,10 @@ enum dpu_rm_topology_name {* release any reservation held by this display. * Normal behavior would not impact the * reservation list during the AtomicTest phase. -* @DPU_RM_TOPCTL_DS : Require layer mixers with DS capabilities */ enum dpu_rm_topology_control {DPU_RM_TOPCTL_RESERVE_LOCK ,DPU_RM_TOPCTL_RESERVE_CLEAR , -DPU_RM_TOPCTL_DS , };/**
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 14/19 drm/msm/dpu: remove cdm block support from resource manager
In reply to a message not in the archiveSupport for CDM block is not present in DPU. Remove CDM handlers from resource manager.
changes in v4:
- Introduced in the series
changes in v5:
- Remove catalog references to CDM (Sean)
changes in v6:
- none
--- drivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 5 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 14 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 16 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 323 ----------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 139 ---------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 14 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 26 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 18 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 17 -- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 68 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - 14 files changed, 11 insertions(+), 640 deletions(-) delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h
drivers/gpu/drm/msm/Makefile +0 -1
@@ -58,7 +58,6 @@ msm-y := \ disp/dpu1/dpu_formats.o \ disp/dpu1/dpu_hw_blk.o \ disp/dpu1/dpu_hw_catalog.o \ - disp/dpu1/dpu_hw_cdm.o \ disp/dpu1/dpu_hw_ctl.o \ disp/dpu1/dpu_hw_interrupts.o \ disp/dpu1/dpu_hw_intf.o \
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +0 -2
@@ -32,14 +32,12 @@/** * Encoder functions and data types * @intfs: Interfaces this encoder is using, INTF_MODE_NONE if unused -* @needs_cdm: Encoder requests a CDM based on pixel format conversion needs * @display_num_of_h_tiles: Number of horizontal tiles in case of split * interface * @topology: Topology of the display */ struct dpu_encoder_hw_resources {enum dpu_intf_mode intfs[INTF_MAX ]; -bool needs_cdm;u32 display_num_of_h_tiles; };
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +0 -5
@@ -22,7 +22,6 @@#include "dpu_hw_pingpong.h" #include "dpu_hw_ctl.h" #include "dpu_hw_top.h" -#include "dpu_hw_cdm.h" #include "dpu_encoder.h" #define DPU_ENCODER_NAME_MAX 16
@@ -204,8 +203,6 @@ struct dpu_encoder_irq {* @parent_ops: Callbacks exposed by the parent to the phys_enc * @hw_mdptop: Hardware interface to the top registers * @hw_ctl: Hardware interface to the ctl registers -* @hw_cdm: Hardware interface to the cdm registers -* @cdm_cfg: Chroma-down hardware configuration * @hw_pp: Hardware interface to the ping pong registers * @dpu_kms: Pointer to the dpu_kms top level * @cached_mode: DRM mode cached at mode_set time, acted on in enable
@@ -235,8 +232,6 @@ struct dpu_encoder_phys {const struct dpu_encoder_virt_ops *parent_ops;struct dpu_hw_mdp *hw_mdptop;struct dpu_hw_ctl *hw_ctl; -struct dpu_hw_cdm *hw_cdm; -struct dpu_hw_cdm_cfg cdm_cfg;struct dpu_hw_pingpong *hw_pp;struct dpu_kms *dpu_kms;struct drm_display_mode cached_mode;
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +0 -14
@@ -295,18 +295,6 @@ };/************************************************************* -* CDM sub blocks config -*************************************************************/ -static struct dpu_cdm_cfg sdm845_cdm[] = { - { - .name ="cdm_0" , .id =CDM_0 , - .base =0x79200 , .len =0x224 , - .features =0 , - .intf_connect =BIT (INTF_3 ), - }, -}; - -/************************************************************* * VBIF sub blocks config *************************************************************/ /* VBIF QOS remap */
@@ -430,8 +418,6 @@ static void sdm845_cfg_init(struct dpu_mdss_cfg *dpu_cfg) .mixer = sdm845_lm, .pingpong_count = ARRAY_SIZE(sdm845_pp), .pingpong = sdm845_pp, - .cdm_count = ARRAY_SIZE(sdm845_cdm), - .cdm = sdm845_cdm, .intf_count = ARRAY_SIZE(sdm845_intf), .intf = sdm845_intf, .vbif_count = ARRAY_SIZE(sdm845_vbif),
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +0 -16
@@ -494,18 +494,6 @@ struct dpu_pingpong_cfg { };/** -* struct dpu_cdm_cfg - information of chroma down blocks -* @id enum identifying this block -* @base register offset of this block -* @features bit mask identifying sub-blocks/features -* @intf_connect Bitmask of INTF IDs this CDM can connect to -*/ -struct dpu_cdm_cfg { -DPU_HW_BLK_INFO ; -unsigned long intf_connect; -}; - -/** * struct dpu_intf_cfg - information of timing engine blocks * @id enum identifying this block * @base register offset of this block
@@ -695,9 +683,6 @@ struct dpu_mdss_cfg {u32 pingpong_count;struct dpu_pingpong_cfg *pingpong; -u32 cdm_count; -struct dpu_cdm_cfg *cdm; -u32 intf_count;struct dpu_intf_cfg *intf;
@@ -733,7 +718,6 @@ struct dpu_mdss_hw_cfg_handler {#define BLK_CURSOR (s) ((s)->cursor)#define BLK_MIXER (s) ((s)->mixer)#define BLK_PINGPONG (s) ((s)->pingpong) -#define BLK_CDM (s) ((s)->cdm)#define BLK_INTF (s) ((s)->intf)#define BLK_AD (s) ((s)->ad)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c deleted +0 -323
323 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h deleted +0 -139
139 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +0 -14
@@ -224,19 +224,6 @@ static inline int dpu_hw_ctl_get_bitmask_intf(struct dpu_hw_ctl *ctx,return 0 ; } -static inline int dpu_hw_ctl_get_bitmask_cdm (struct dpu_hw_ctl *ctx, -u32 *flushbits,enum dpu_cdm cdm) -{ -switch (cdm) { -case CDM_0 : - *flushbits |=BIT (26 ); -break ; -default : -return -EINVAL ; - } -return 0 ; -} -static u32 dpu_hw_ctl_poll_reset_status (struct dpu_hw_ctl *ctx,u32 timeout_us) {struct dpu_hw_blk_reg_map *c = &ctx->hw;
@@ -485,7 +472,6 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops, ops->get_bitmask_sspp = dpu_hw_ctl_get_bitmask_sspp; ops->get_bitmask_mixer = dpu_hw_ctl_get_bitmask_mixer; ops->get_bitmask_intf = dpu_hw_ctl_get_bitmask_intf; - ops->get_bitmask_cdm = dpu_hw_ctl_get_bitmask_cdm; };static struct dpu_hw_blk_ops dpu_hw_ops = {
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +0 -4
@@ -142,10 +142,6 @@ struct dpu_hw_ctl_ops {u32 *flushbits, enum dpu_intf blk); -int (*get_bitmask_cdm)(struct dpu_hw_ctl *ctx, -u32 *flushbits, -enum dpu_cdm blk); -/** * Set all blend stages to disabled * @ctx : ctl path ctx pointer
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +9 -17
@@ -100,7 +100,6 @@ enum dpu_hw_blk_type {DPU_HW_BLK_SSPP ,DPU_HW_BLK_LM ,DPU_HW_BLK_CTL , -DPU_HW_BLK_CDM ,DPU_HW_BLK_PINGPONG ,DPU_HW_BLK_INTF , DPU_HW_BLK_WB,
@@ -182,12 +181,6 @@ enum dpu_ctl {CTL_MAX }; -enum dpu_cdm { -CDM_0 =1 , -CDM_1 , -CDM_MAX -}; -enum dpu_pingpong {PINGPONG_0 =1 ,PINGPONG_1 ,
@@ -444,15 +437,14 @@ struct dpu_mdss_color {* Define bit masks for h/w logging. */ #define DPU_DBG_MASK_NONE (1 << 0) -#define DPU_DBG_MASK_CDM (1 << 1) -#define DPU_DBG_MASK_INTF (1 << 2) -#define DPU_DBG_MASK_LM (1 << 3) -#define DPU_DBG_MASK_CTL (1 << 4) -#define DPU_DBG_MASK_PINGPONG (1 << 5) -#define DPU_DBG_MASK_SSPP (1 << 6) -#define DPU_DBG_MASK_WB (1 << 7) -#define DPU_DBG_MASK_TOP (1 << 8) -#define DPU_DBG_MASK_VBIF (1 << 9) -#define DPU_DBG_MASK_ROT (1 << 10) +#define DPU_DBG_MASK_INTF (1 << 1) +#define DPU_DBG_MASK_LM (1 << 2) +#define DPU_DBG_MASK_CTL (1 << 3) +#define DPU_DBG_MASK_PINGPONG (1 << 4) +#define DPU_DBG_MASK_SSPP (1 << 5) +#define DPU_DBG_MASK_WB (1 << 6) +#define DPU_DBG_MASK_TOP (1 << 7) +#define DPU_DBG_MASK_VBIF (1 << 8) +#define DPU_DBG_MASK_ROT (1 << 9)#endif /* _DPU_HW_MDSS_H */
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +0 -18
@@ -98,23 +98,6 @@ static void dpu_hw_setup_split_pipe(struct dpu_hw_mdp *mdp,DPU_REG_WRITE (c,SPLIT_DISPLAY_EN , cfg->en &0x1 ); } -static void dpu_hw_setup_cdm_output (struct dpu_hw_mdp *mdp, -struct cdm_output_cfg *cfg) -{ -struct dpu_hw_blk_reg_map *c; -u32 out_ctl =0 ; - -if (!mdp || !cfg) -return ; - - c = &mdp->hw; - -if (cfg->intf_en) - out_ctl |=BIT (19 ); - -DPU_REG_WRITE (c,MDP_OUT_CTL_0 , out_ctl); -} -static bool dpu_hw_setup_clk_force_ctrl (struct dpu_hw_mdp *mdp,enum dpu_clk_ctrl_type clk_ctrl,bool enable) {
@@ -307,7 +290,6 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, unsigned long cap) { ops->setup_split_pipe = dpu_hw_setup_split_pipe; - ops->setup_cdm_output = dpu_hw_setup_cdm_output; ops->setup_clk_force_ctrl = dpu_hw_setup_clk_force_ctrl; ops->get_danger_status = dpu_hw_get_danger_status; ops->setup_vsync_source = dpu_hw_setup_vsync_source;
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h +0 -17
@@ -52,14 +52,6 @@ struct split_pipe_cfg { };/** -* struct cdm_output_cfg: output configuration for cdm -* @intf_en : enable/disable interface output -*/ -struct cdm_output_cfg { -bool intf_en; -}; - -/** * struct dpu_danger_safe_status: danger and safe status signals * @mdp: top level status * @sspp: source pipe status
@@ -89,7 +81,6 @@ struct dpu_vsync_source_cfg {* Assumption is these functions will be called after clocks are enabled. * @setup_split_pipe : Programs the pipe control registers * @setup_pp_split : Programs the pp split control registers -* @setup_cdm_output : programs cdm control * @setup_traffic_shaper : programs traffic shaper control */ struct dpu_hw_mdp_ops {
@@ -102,14 +93,6 @@ struct dpu_hw_mdp_ops { struct split_pipe_cfg *p);/** -* setup_cdm_output() : Setup selection control of the cdm data path -* @mdp : mdp top context driver -* @cfg : cdm output configuration -*/ -void (*setup_cdm_output)(struct dpu_hw_mdp *mdp, -struct cdm_output_cfg *cfg); - -/** * setup_traffic_shaper() : Setup traffic shaper control * @mdp : mdp top context driver * @cfg : traffic shaper configuration
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +2 -66
120 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0 -4
@@ -868,10 +868,6 @@TP_printk ("id:%d type:%d enc_id:%u" , __entry->id, __entry->type, __entry->enc_id) ); -DEFINE_EVENT (dpu_rm_iter_template, dpu_rm_reserve_cdm, - TP_PROTO(uint32_t id, enum dpu_hw_blk_type type, uint32_t enc_id), -TP_ARGS (id, type, enc_id) -);DEFINE_EVENT (dpu_rm_iter_template, dpu_rm_reserve_intf, TP_PROTO(uint32_t id, enum dpu_hw_blk_type type, uint32_t enc_id), TP_ARGS(id, type, enc_id)
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 15/19 drm/msm/dpu: remove LOCK/CLEAR support in RM
In reply to a message not in the archiveDPU had the support to LOCK the hw resources in atomic check and CLEAR the locked resources explicitly through custom property values. Now that DPU is stripped off of all the custom properties, the RM handlers for this feature will be no-op's. This change gets rid of all its references.
changes in v5:
- Introduced in the series.
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 25 ++----------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 16 ---------------- 2 files changed, 2 insertions(+), 39 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +2 -23
@@ -24,8 +24,6 @@#define RESERVED_BY_OTHER (h, r) \ ((h)->rsvp && ((h)->rsvp->enc_id != (r)->enc_id)) -#define RM_RQ_LOCK (r) ((r)->top_ctrl & BIT(DPU_RM_TOPCTL_RESERVE_LOCK)) -#define RM_RQ_CLEAR (r) ((r)->top_ctrl & BIT(DPU_RM_TOPCTL_RESERVE_CLEAR))#define RM_IS_TOPOLOGY_MATCH (t, r) ((t).num_lm == (r).num_lm && \ (t).num_comp_enc == (r).num_enc && \ (t).num_intf == (r).num_intf)
@@ -48,12 +46,10 @@ struct dpu_rm_topology_def {/** * struct dpu_rm_requirements - Reservation requirements parameter bundle -* @top_ctrl: topology control preference from kernel client * @top: selected topology for the display * @hw_res: Hardware resources required as reported by the encoders */ struct dpu_rm_requirements { -uint64_t top_ctrl;const struct dpu_rm_topology_def *topology;struct dpu_encoder_hw_resources hw_res; };
@@ -755,8 +751,7 @@ static int _dpu_rm_populate_requirements(return -EINVAL ; } -DRM_DEBUG_KMS ("top_ctrl: 0x%llX num_h_tiles: %d\n" , reqs->top_ctrl, - reqs->hw_res.display_num_of_h_tiles); +DRM_DEBUG_KMS ("num_h_tiles: %d\n" , reqs->hw_res.display_num_of_h_tiles); DRM_DEBUG_KMS("num_lm: %d num_ctl: %d topology: %d split_display: %d\n", reqs->topology->num_lm, reqs->topology->num_ctl, reqs->topology->top_name,
@@ -956,18 +951,6 @@ int dpu_rm_reserve( rsvp_cur =_dpu_rm_get_rsvp (rm, enc); -/* -* User can request that we clear out any reservation during the -* atomic_check phase by using this CLEAR bit -*/ -if (rsvp_cur && test_only &&RM_RQ_CLEAR (&reqs)) { -DPU_DEBUG ("test_only & CLEAR: clear rsvp[s%de%d]\n" , - rsvp_cur->seq, rsvp_cur->enc_id); -_dpu_rm_release_rsvp (rm, rsvp_cur, conn_state->connector); - rsvp_cur =NULL ; -_dpu_rm_print_rsvps (rm,DPU_RM_STAGE_AFTER_CLEAR ); - } -/* Check the proposed reservation, store it in hw's "next" field */ ret =_dpu_rm_make_next_rsvp (rm, enc, crtc_state, conn_state, rsvp_nxt, &reqs);
@@ -977,7 +960,7 @@ int dpu_rm_reserve(if (ret) {DPU_ERROR ("failed to reserve hw resources: %d\n" , ret);_dpu_rm_release_rsvp (rm, rsvp_nxt, conn_state->connector); - }else if (test_only && !RM_RQ_LOCK (&reqs)) { + }else if (test_only) {/* * Normally, if test_only, test the reservation and then undo * However, if the user requests LOCK, then keep the reservation
@@ -987,10 +970,6 @@ int dpu_rm_reserve( rsvp_nxt->seq, rsvp_nxt->enc_id);_dpu_rm_release_rsvp (rm, rsvp_nxt, conn_state->connector); }else { -if (test_only &&RM_RQ_LOCK (&reqs)) -DPU_DEBUG ("test_only & LOCK: lock rsvp[s%de%d]\n" , - rsvp_nxt->seq, rsvp_nxt->enc_id); -_dpu_rm_release_rsvp (rm, rsvp_cur, conn_state->connector); ret =_dpu_rm_commit_rsvp (rm, rsvp_nxt, conn_state);
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +0 -16
@@ -36,22 +36,6 @@ enum dpu_rm_topology_name { };/** -* enum dpu_rm_topology_control - HW resource use case in use by connector -* @DPU_RM_TOPCTL_RESERVE_LOCK: If set, in AtomicTest phase, after a successful -* test, reserve the resources for this display. -* Normal behavior would not impact the reservation -* list during the AtomicTest phase. -* @DPU_RM_TOPCTL_RESERVE_CLEAR: If set, in AtomicTest phase, before testing, -* release any reservation held by this display. -* Normal behavior would not impact the -* reservation list during the AtomicTest phase. -*/ -enum dpu_rm_topology_control { -DPU_RM_TOPCTL_RESERVE_LOCK , -DPU_RM_TOPCTL_RESERVE_CLEAR , -}; - -/** * struct dpu_rm - DPU dynamic hardware resource manager * @dev: device handle for event logging purposes * @rsvps: list of hardware reservations by each crtc->encoder->connector
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 16/19 drm/msm/dpu: remove display H_TILE from encoder
In reply to a message not in the archiveEncoder H_TILE values are not used for allocating the hw blocks. no. of hw_intf blocks provides the info.
changes in v4:
- remove irrelevant changes (Sean)
- retain log macros (Sean)
changes in v5:
- none
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 ----- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 1 - 3 files changed, 9 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -5
@@ -175,8 +175,6 @@ struct dpu_encoder_virt {spinlock_t enc_spinlock;uint32_t bus_scaling_client; -uint32_t display_num_of_h_tiles; -unsigned int num_phys_encs;struct dpu_encoder_phys *phys_encs[MAX_PHYS_ENCODERS_PER_VIRTUAL ];struct dpu_encoder_phys *cur_master;
@@ -455,7 +453,6 @@ void dpu_encoder_get_hw_resources(struct drm_encoder *drm_enc,/* Query resources used by phys encs, expected to be without overlap */ memset (hw_res,0 ,sizeof (*hw_res)); - hw_res->display_num_of_h_tiles = dpu_enc->display_num_of_h_tiles;for (i =0 ; i < dpu_enc->num_phys_encs; i++) {struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
@@ -2104,8 +2101,6 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,WARN_ON (disp_info->num_of_h_tiles <1 ); - dpu_enc->display_num_of_h_tiles = disp_info->num_of_h_tiles; -DPU_DEBUG ("dsi_info->num_of_h_tiles %d\n" , disp_info->num_of_h_tiles); if ((disp_info->capabilities & MSM_DISPLAY_CAP_CMD_MODE) ||
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +0 -3
@@ -32,13 +32,10 @@/** * Encoder functions and data types * @intfs: Interfaces this encoder is using, INTF_MODE_NONE if unused -* @display_num_of_h_tiles: Number of horizontal tiles in case of split -* interface * @topology: Topology of the display */ struct dpu_encoder_hw_resources {enum dpu_intf_mode intfs[INTF_MAX ]; -u32 display_num_of_h_tiles; };/**
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +0 -1
@@ -751,7 +751,6 @@ static int _dpu_rm_populate_requirements(return -EINVAL ; } -DRM_DEBUG_KMS ("num_h_tiles: %d\n" , reqs->hw_res.display_num_of_h_tiles); DRM_DEBUG_KMS("num_lm: %d num_ctl: %d topology: %d split_display: %d\n", reqs->topology->num_lm, reqs->topology->num_ctl, reqs->topology->top_name,
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 17/19 drm/msm/dpu: remove RM dependency on connector state
In reply to a message not in the archiveConnector states were passed around RM to update the custom topology connector property with chosen topology data. Now that we got rid of both custom properties and topology names, this change cleans up the mechanism to pass connector states across RM helpers and encoder functions.
changes in v5:
- Introduced in the series
changes in v6:
- remove parameter checking in rm reserve (Jordan)
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 15 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 3 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 63 +++++----------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 - 7 files changed, 26 insertions(+), 71 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +7 -8
@@ -436,15 +436,14 @@ int dpu_encoder_helper_unregister_irq(struct dpu_encoder_phys *phys_enc, }void dpu_encoder_get_hw_resources (struct drm_encoder *drm_enc, -struct dpu_encoder_hw_resources *hw_res, -struct drm_connector_state *conn_state) +struct dpu_encoder_hw_resources *hw_res) {struct dpu_encoder_virt *dpu_enc =NULL ;int i =0 ; -if (!hw_res || !drm_enc || !conn_state) { -DPU_ERROR ("invalid argument(s), drm_enc %d, res %d, state %d\n" , - drm_enc !=0 , hw_res !=0 , conn_state !=0 ); +if (!hw_res || !drm_enc) { +DPU_ERROR ("invalid argument(s), drm_enc %d, res %d\n" , + drm_enc !=0 , hw_res !=0 );return ; }
@@ -458,7 +457,7 @@ void dpu_encoder_get_hw_resources(struct drm_encoder *drm_enc,struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];if (phys && phys->ops.get_hw_resources) - phys->ops.get_hw_resources (phys, hw_res, conn_state); + phys->ops.get_hw_resources (phys, hw_res); } }
@@ -652,7 +651,7 @@ static int dpu_encoder_virt_atomic_check(if (drm_atomic_crtc_needs_modeset (crtc_state) && dpu_enc->mode_set_complete) { ret =dpu_rm_reserve (&dpu_kms->rm, drm_enc, crtc_state, - conn_state, topology, true); + topology, true); dpu_enc->mode_set_complete = false; } }
@@ -1044,7 +1043,7 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,/* Reserve dynamic resources now. Indicating non-AtomicTest phase */ ret =dpu_rm_reserve (&dpu_kms->rm, drm_enc, drm_enc->crtc->state, - conn->state, topology, false); + topology, false);if (ret) {DPU_ERROR_ENC (dpu_enc,"failed to reserve hw resources, %d\n" , ret);
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +1 -3
@@ -51,11 +51,9 @@ struct dpu_encoder_kickoff_params {* dpu_encoder_get_hw_resources - Populate table of required hardware resources * @encoder: encoder pointer * @hw_res: resource table to populate with encoder required resources -* @conn_state: report hw reqs based on this proposed connector state */ void dpu_encoder_get_hw_resources (struct drm_encoder *encoder, -struct dpu_encoder_hw_resources *hw_res, -struct drm_connector_state *conn_state); +struct dpu_encoder_hw_resources *hw_res);/** * dpu_encoder_register_vblank_callback - provide callback to encoder that
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +1 -2
@@ -140,8 +140,7 @@ struct dpu_encoder_phys_ops { struct drm_connector_state *conn_state);void (*destroy)(struct dpu_encoder_phys *encoder);void (*get_hw_resources)(struct dpu_encoder_phys *encoder, -struct dpu_encoder_hw_resources *hw_res, -struct drm_connector_state *conn_state); +struct dpu_encoder_hw_resources *hw_res);int (*control_vblank_irq)(struct dpu_encoder_phys *enc,bool enable);int (*wait_for_commit_done)(struct dpu_encoder_phys *phys_enc);int (*wait_for_tx_complete)(struct dpu_encoder_phys *phys_enc);
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +1 -2
@@ -599,8 +599,7 @@ static void dpu_encoder_phys_cmd_destroy(struct dpu_encoder_phys *phys_enc)static void dpu_encoder_phys_cmd_get_hw_resources (struct dpu_encoder_phys *phys_enc, -struct dpu_encoder_hw_resources *hw_res, -struct drm_connector_state *conn_state) +struct dpu_encoder_hw_resources *hw_res) {struct dpu_encoder_phys_cmd *cmd_enc =to_dpu_encoder_phys_cmd (phys_enc);
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +3 -4
@@ -537,12 +537,11 @@ static void dpu_encoder_phys_vid_destroy(struct dpu_encoder_phys *phys_enc)static void dpu_encoder_phys_vid_get_hw_resources (struct dpu_encoder_phys *phys_enc, -struct dpu_encoder_hw_resources *hw_res, -struct drm_connector_state *conn_state) +struct dpu_encoder_hw_resources *hw_res) {if (!phys_enc || !hw_res) { -DPU_ERROR ("invalid arg(s), enc %d hw_res %d conn_state %d\n" , - phys_enc !=0 , hw_res !=0 , conn_state !=0 ); +DPU_ERROR ("invalid arg(s), enc %d hw_res %d\n" , + phys_enc !=0 , hw_res !=0 );return ; }
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +13 -50
148 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +0 -2
@@ -107,7 +107,6 @@ int dpu_rm_init(struct dpu_rm *rm,* @rm: DPU Resource Manager handle * @drm_enc: DRM Encoder handle * @crtc_state: Proposed Atomic DRM CRTC State handle -* @conn_state: Proposed Atomic DRM Connector State handle * @topology: Pointer to topology info for the display * @test_only: Atomic-Test phase, discard results (unless property overrides) * @Return: 0 on Success otherwise -ERROR
@@ -115,7 +114,6 @@ int dpu_rm_init(struct dpu_rm *rm,int dpu_rm_reserve (struct dpu_rm *rm,struct drm_encoder *drm_enc,struct drm_crtc_state *crtc_state, -struct drm_connector_state *conn_state,struct msm_display_topology topology,bool test_only);
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 18/19 drm/msm/dpu: relax parameter validation in encoders
In reply to a message not in the archiveDPU, being over protective, validates every parameter of a module. This change traces the call stack for some of encoder functions affected by previous set of clean up patches and cleans up unwanted validations.
changes in v5:
- Introduced in the series
changes in v6:
- none
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 14 -------------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 6 ------ 3 files changed, 26 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -6
@@ -441,12 +441,6 @@ void dpu_encoder_get_hw_resources(struct drm_encoder *drm_enc,struct dpu_encoder_virt *dpu_enc =NULL ;int i =0 ; -if (!hw_res || !drm_enc) { -DPU_ERROR ("invalid argument(s), drm_enc %d, res %d\n" , - drm_enc !=0 , hw_res !=0 ); -return ; - } - dpu_enc =to_dpu_encoder_virt (drm_enc);DPU_DEBUG_ENC (dpu_enc,"\n" );
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +0 -14
@@ -601,20 +601,6 @@ static void dpu_encoder_phys_cmd_get_hw_resources(struct dpu_encoder_phys *phys_enc, struct dpu_encoder_hw_resources *hw_res) { - struct dpu_encoder_phys_cmd *cmd_enc = -to_dpu_encoder_phys_cmd (phys_enc); - -if (!phys_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - } - -if ((phys_enc->intf_idx -INTF_0 ) >=INTF_MAX ) { -DPU_ERROR ("invalid intf idx:%d\n" , phys_enc->intf_idx); -return ; - } - -DPU_DEBUG_CMDENC (cmd_enc,"\n" ); hw_res->intfs[phys_enc->intf_idx - INTF_0] = INTF_MODE_CMD; }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +0 -6
@@ -539,12 +539,6 @@ static void dpu_encoder_phys_vid_get_hw_resources(struct dpu_encoder_phys *phys_enc, struct dpu_encoder_hw_resources *hw_res) { -if (!phys_enc || !hw_res) { -DPU_ERROR ("invalid arg(s), enc %d hw_res %d\n" , - phys_enc !=0 , hw_res !=0 ); -return ; - } - hw_res->intfs[phys_enc->intf_idx - INTF_0] = INTF_MODE_VIDEO; }
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v6 19/19 drm/msm/dpu: remove RM topology definition
In reply to a message not in the archiveRM maintained a redundant definition for display topology to identify the no. of hw blocks needed for a display and their hardware dependencies. This information can be implicitly deduced from the msm_display_topology structure available in RM reserve request. In addition to getting rid of the redundant topology, this change also removes the topology name enums and their usages.
changes in v4:
- remove the topology name enum entirely (Sean)
changes in v5:
- remove RM topology definition and their references (Sean)
- Implement helper for dual mixer CRTC (Sean)
changes in v6:
- avoid heap memory for topology (Sean)
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 10 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 122 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 24 ---- 7 files changed, 52 insertions(+), 124 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +10 -0
@@ -238,6 +238,16 @@ struct dpu_crtc_state { container_of(x, struct dpu_crtc_state, base)/** +* dpu_crtc_state_is_stereo - Is crtc virtualized with two mixers? +* @cstate: Pointer to dpu crtc state +* @Return: true - has two mixers, false - has one mixer + */ +static inline bool dpu_crtc_state_is_stereo (struct dpu_crtc_state *cstate) +{ +return cstate->num_mixers ==CRTC_DUAL_MIXERS ; +} + +/** * dpu_crtc_get_mixer_height - get the mixer height * Mixer height will be same as panel height */
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -3
@@ -1003,7 +1003,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,struct drm_connector *conn =NULL , *conn_iter;struct dpu_rm_hw_iter pp_iter, ctl_iter;struct msm_display_topology topology; -enum dpu_rm_topology_name topology_name;struct dpu_hw_ctl *hw_ctl[MAX_CHANNELS_PER_ENC ] = {NULL };int i =0 , ret;
@@ -1059,7 +1058,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, hw_ctl[i] = (struct dpu_hw_ctl *)ctl_iter.hw; } - topology_name =dpu_rm_get_topology_name (topology);for (i =0 ; i < dpu_enc->num_phys_encs; i++) {struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
@@ -1080,7 +1078,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, phys->hw_ctl = hw_ctl[i]; phys->connector = conn->state->connector; - phys->topology_name = topology_name;if (phys->ops.mode_set) phys->ops.mode_set (phys, mode, adj_mode); }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +0 -1
@@ -32,7 +32,6 @@/** * Encoder functions and data types * @intfs: Interfaces this encoder is using, INTF_MODE_NONE if unused -* @topology: Topology of the display */ struct dpu_encoder_hw_resources {enum dpu_intf_mode intfs[INTF_MAX ];
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +6 -3
@@ -23,6 +23,7 @@#include "dpu_hw_ctl.h" #include "dpu_hw_top.h" #include "dpu_encoder.h" +#include "dpu_crtc.h" #define DPU_ENCODER_NAME_MAX 16
@@ -209,7 +210,6 @@ struct dpu_encoder_irq {* @split_role: Role to play in a split-panel configuration * @intf_mode: Interface mode * @intf_idx: Interface index on dpu hardware -* @topology_name: topology selected for the display * @enc_spinlock: Virtual-Encoder-Wide Spin Lock for IRQ purposes * @enable_state: Enable state tracking * @vblank_refcount: Reference count of vblank request
@@ -237,7 +237,6 @@ struct dpu_encoder_phys {enum dpu_enc_split_role split_role;enum dpu_intf_mode intf_mode;enum dpu_intf intf_idx; -enum dpu_rm_topology_name topology_name;spinlock_t *enc_spinlock;enum dpu_enc_enable_state enable_state;atomic_t vblank_refcount;
@@ -355,11 +354,15 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(static inline enum dpu_3d_blend_mode dpu_encoder_helper_get_3d_blend_mode (struct dpu_encoder_phys *phys_enc) { +struct dpu_crtc_state *dpu_cstate; +if (!phys_enc || phys_enc->enable_state ==DPU_ENC_DISABLING )return BLEND_3D_NONE ; + dpu_cstate =to_dpu_crtc_state (phys_enc->parent->crtc->state); +if (phys_enc->split_role ==ENC_ROLE_SOLO && - phys_enc->topology_name ==DPU_RM_TOPOLOGY_DUALPIPE_3DMERGE ) +dpu_crtc_state_is_stereo (dpu_cstate))return BLEND_3D_H_ROW_INT ;return BLEND_3D_NONE ;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +4 -3
@@ -355,13 +355,14 @@ static void dpu_encoder_phys_vid_underrun_irq(void *arg, int irq_idx)static bool _dpu_encoder_phys_is_dual_ctl (struct dpu_encoder_phys *phys_enc) { +struct dpu_crtc_state *dpu_cstate; +if (!phys_enc)return false; -if (phys_enc->topology_name ==DPU_RM_TOPOLOGY_DUALPIPE ) -return true; + dpu_cstate =to_dpu_crtc_state (phys_enc->parent->crtc->state); -return false; +return dpu_cstate->num_ctls >1 ; } static bool dpu_encoder_phys_vid_needs_single_flush(
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +32 -90
253 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +0 -24
@@ -21,21 +21,6 @@#include "dpu_hw_top.h" /** -* enum dpu_rm_topology_name - HW resource use case in use by connector -* @DPU_RM_TOPOLOGY_NONE: No topology in use currently -* @DPU_RM_TOPOLOGY_SINGLEPIPE: 1 LM, 1 PP, 1 INTF/WB -* @DPU_RM_TOPOLOGY_DUALPIPE: 2 LM, 2 PP, 2 INTF/WB -* @DPU_RM_TOPOLOGY_DUALPIPE_3DMERGE: 2 LM, 2 PP, 3DMux, 1 INTF/WB -*/ -enum dpu_rm_topology_name { -DPU_RM_TOPOLOGY_NONE =0 , -DPU_RM_TOPOLOGY_SINGLEPIPE , -DPU_RM_TOPOLOGY_DUALPIPE , -DPU_RM_TOPOLOGY_DUALPIPE_3DMERGE , -DPU_RM_TOPOLOGY_MAX , -}; - -/** * struct dpu_rm - DPU dynamic hardware resource manager * @dev: device handle for event logging purposes * @rsvps: list of hardware reservations by each crtc->encoder->connector
@@ -167,13 +152,4 @@ void dpu_rm_init_hw_iter(*/ int dpu_rm_check_property_topctl (uint64_t val); -/** -* dpu_rm_get_topology_name - returns the name of the the given topology -* definition -* @topology: topology definition -* @Return: name of the topology -*/ -enum dpu_rm_topology_name -dpu_rm_get_topology_name (struct msm_display_topology topology); -#endif /* __DPU_RM_H__ */
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Quoted 7 lines · Jeykumar Sankaran
Based on the comments received for the patch series[1] and to make the review process a bit more easy, spliting up the patches for cleanup and resource manager refactor. This series cleans up and prepares the DPU for upcoming RM changes.
Quoted 10 lines
changes in v4:
- split clean up changes in separate commits
changes in v5:
- clean up dead code in RM
- remove both topology enums and RM specific topology
- update commit texts with reasons for removal
changes in v6:
- remove parameter checks in RM reserve
- use BIT(x) to define power handle event macros
- avoid head allocation for RM topology
Thanks for the revision, I've put the last 3 patches in dpu-staging.
Nice work!
Sean
Quoted 62 lines
Thanks and Regards,
Jeykumar S.Jeykumar Sankaran (19):
drm/msm/dpu: remove debugfs support for misr drm/msm/dpu: squash power handle event types drm/msm/dpu: remove scalar config definitions drm/msm/dpu: remove resource pool manager drm/msm/dpu: remove ping pong split topology variables drm/msm/dpu: enable master-slave encoders explicitly drm/msm/dpu: use kms stored hw mdp block drm/msm/dpu: iterate for assigned hw ctl in virtual encoder drm/msm/dpu: avoid querying for hw intf before assignment drm/msm/dpu: make crtcget_mixer_widthhelper static drm/msm/dpu: move hw resource tracking to crtc state drm/msm/dpu: renamehw_ctltolm_ctl
drm/msm/dpu: clean up destination scaler residue drm/msm/dpu: remove cdm block support from resource manager drm/msm/dpu: remove LOCK/CLEAR support in RM drm/msm/dpu: remove displayH_TILEfrom encoder drm/msm/dpu: remove RM dependency on connector state drm/msm/dpu: relax parameter validation in encoders drm/msm/dpu: remove RM topology definitiondrivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 467 +++------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 111 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 216 ++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 10 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 23 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 48 +-- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 125 +----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 56 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 56 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 323 -------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 139 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 14 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 4 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 29 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 7 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 29 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 7 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 33 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 18 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 17 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 3 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 16 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 15 +- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 14 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 285 +++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 44 -- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - 29 files changed, 214 insertions(+), 1908 deletions(-) delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.hSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno