Commit 1ed92616 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2024-11-04' of https://gitlab.freedesktop.org/drm/msm into drm-next 



Late updates for v6.13

MDSS:
- cleanup UBWC registers handling

DP:
- Mass-rename the symbols

DPU:
- SSPP handling cleanup
- Move kerneldoc comments from headers to source files
- Misc small fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGuGL6k3CKXZ0Qv-FTQ589+_PWNtid6i7MmVJLopBm2sYg@mail.gmail.com
parents bf99ceb6 86313a9c

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ DISPLAY_HEADERS = \ 
	generated/mdp4.xml.h \

	generated/mdp5.xml.h \

	generated/mdp_common.xml.h \

	generated/mdss.xml.h \

	generated/sfpb.xml.h



$(addprefix $(obj)/,$(adreno-y)): $(addprefix $(obj)/,$(ADRENO_HEADERS))

drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

+0 −46
Original line number Diff line number Diff line
@@ -8,72 +8,26 @@ 
#include "dpu_kms.h"

#include "dpu_hw_interrupts.h"



/**

 * dpu_core_irq_preinstall - perform pre-installation of core IRQ handler

 * @kms:		MSM KMS handle

 * @return:		none

 */

void dpu_core_irq_preinstall(struct msm_kms *kms);



/**

 * dpu_core_irq_uninstall - uninstall core IRQ handler

 * @kms:		MSM KMS handle

 * @return:		none

 */

void dpu_core_irq_uninstall(struct msm_kms *kms);



/**

 * dpu_core_irq - core IRQ handler

 * @kms:		MSM KMS handle

 * @return:		interrupt handling status

 */

irqreturn_t dpu_core_irq(struct msm_kms *kms);



/**

 * dpu_core_irq_read - IRQ helper function for reading IRQ status

 * @dpu_kms:		DPU handle

 * @irq_idx:		irq index

 * @return:		non-zero if irq detected; otherwise no irq detected

 */

u32 dpu_core_irq_read(

		struct dpu_kms *dpu_kms,

		unsigned int irq_idx);



/**

 * dpu_core_irq_register_callback - For registering callback function on IRQ

 *                             interrupt

 * @dpu_kms:		DPU handle

 * @irq_idx:		irq index

 * @irq_cb:		IRQ callback funcion.

 * @irq_arg:		IRQ callback argument.

 * @return:		0 for success registering callback, otherwise failure

 *

 * This function supports registration of multiple callbacks for each interrupt.

 */

int dpu_core_irq_register_callback(

		struct dpu_kms *dpu_kms,

		unsigned int irq_idx,

		void (*irq_cb)(void *arg),

		void *irq_arg);



/**

 * dpu_core_irq_unregister_callback - For unregistering callback function on IRQ

 *                             interrupt

 * @dpu_kms:		DPU handle

 * @irq_idx:		irq index

 * @return:		0 for success registering callback, otherwise failure

 *

 * This function supports registration of multiple callbacks for each interrupt.

 */

int dpu_core_irq_unregister_callback(

		struct dpu_kms *dpu_kms,

		unsigned int irq_idx);



/**

 * dpu_debugfs_core_irq_init - register core irq debugfs

 * @dpu_kms: pointer to kms

 * @parent: debugfs directory root

 */

void dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,

		struct dentry *parent);

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c

+24 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static u64 _dpu_core_perf_calc_clk(const struct dpu_perf_cfg *perf_cfg, 


	mode = &state->adjusted_mode;



	crtc_clk = mode->vtotal * mode->hdisplay * drm_mode_vrefresh(mode);

	crtc_clk = (u64)mode->vtotal * mode->hdisplay * drm_mode_vrefresh(mode);



	drm_atomic_crtc_for_each_plane(plane, crtc) {

		pstate = to_dpu_plane_state(plane->state);
@@ -140,6 +140,12 @@ static void _dpu_core_perf_calc_crtc(const struct dpu_core_perf *core_perf, 
			perf->max_per_pipe_ib, perf->bw_ctl);

}



/**

 * dpu_core_perf_crtc_check - validate performance of the given crtc state

 * @crtc: Pointer to crtc

 * @state: Pointer to new crtc state

 * return: zero if success, or error code otherwise

 */

int dpu_core_perf_crtc_check(struct drm_crtc *crtc,

		struct drm_crtc_state *state)

{
@@ -301,6 +307,12 @@ static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms) 
	return clk_rate;

}



/**

 * dpu_core_perf_crtc_update - update performance of the given crtc

 * @crtc: Pointer to crtc

 * @params_changed: true if crtc parameters are modified

 * return: zero if success, or error code otherwise

 */

int dpu_core_perf_crtc_update(struct drm_crtc *crtc,

			      int params_changed)

{
@@ -446,6 +458,11 @@ static const struct file_operations dpu_core_perf_mode_fops = { 
	.write = _dpu_core_perf_mode_write,

};



/**

 * dpu_core_perf_debugfs_init - initialize debugfs for core performance context

 * @dpu_kms: Pointer to the dpu_kms struct

 * @parent: Pointer to parent debugfs

 */

int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent)

{

	struct dpu_core_perf *perf = &dpu_kms->perf;
@@ -482,6 +499,12 @@ int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent) 
}

#endif



/**

 * dpu_core_perf_init - initialize the given core performance context

 * @perf: Pointer to core performance context

 * @perf_cfg: Pointer to platform performance configuration

 * @max_core_clk_rate: Maximum core clock rate

 */

int dpu_core_perf_init(struct dpu_core_perf *perf,

		const struct dpu_perf_cfg *perf_cfg,

		unsigned long max_core_clk_rate)

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h

+0 −27
Original line number Diff line number Diff line
@@ -54,47 +54,20 @@ struct dpu_core_perf { 
	u64 fix_core_ab_vote;

};



/**

 * dpu_core_perf_crtc_check - validate performance of the given crtc state

 * @crtc: Pointer to crtc

 * @state: Pointer to new crtc state

 * return: zero if success, or error code otherwise

 */

int dpu_core_perf_crtc_check(struct drm_crtc *crtc,

		struct drm_crtc_state *state);



/**

 * dpu_core_perf_crtc_update - update performance of the given crtc

 * @crtc: Pointer to crtc

 * @params_changed: true if crtc parameters are modified

 * return: zero if success, or error code otherwise

 */

int dpu_core_perf_crtc_update(struct drm_crtc *crtc,

			      int params_changed);



/**

 * dpu_core_perf_crtc_release_bw - release bandwidth of the given crtc

 * @crtc: Pointer to crtc

 */

void dpu_core_perf_crtc_release_bw(struct drm_crtc *crtc);



/**

 * dpu_core_perf_init - initialize the given core performance context

 * @perf: Pointer to core performance context

 * @perf_cfg: Pointer to platform performance configuration

 * @max_core_clk_rate: Maximum core clock rate

 */

int dpu_core_perf_init(struct dpu_core_perf *perf,

		const struct dpu_perf_cfg *perf_cfg,

		unsigned long max_core_clk_rate);



struct dpu_kms;



/**

 * dpu_core_perf_debugfs_init - initialize debugfs for core performance context

 * @dpu_kms: Pointer to the dpu_kms struct

 * @debugfs_parent: Pointer to parent debugfs

 */

int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent);



#endif /* _DPU_CORE_PERF_H_ */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+30 −1
Original line number Diff line number Diff line
@@ -572,6 +572,10 @@ static void _dpu_crtc_complete_flip(struct drm_crtc *crtc) 
	spin_unlock_irqrestore(&dev->event_lock, flags);

}



/**

 * dpu_crtc_get_intf_mode - get interface mode of the given crtc

 * @crtc: Pointert to crtc

 */

enum dpu_intf_mode dpu_crtc_get_intf_mode(struct drm_crtc *crtc)

{

	struct drm_encoder *encoder;
@@ -594,6 +598,10 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct drm_crtc *crtc) 
	return INTF_MODE_NONE;

}



/**

 * dpu_crtc_vblank_callback - called on vblank irq, issues completion events

 * @crtc: Pointer to drm crtc object

 */

void dpu_crtc_vblank_callback(struct drm_crtc *crtc)

{

	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
@@ -704,6 +712,10 @@ void dpu_crtc_frame_event_cb(struct drm_crtc *crtc, u32 event) 
	kthread_queue_work(priv->event_thread[crtc_id].worker, &fevent->work);

}



/**

 * dpu_crtc_complete_commit - callback signalling completion of current commit

 * @crtc: Pointer to drm crtc object

 */

void dpu_crtc_complete_commit(struct drm_crtc *crtc)

{

	trace_dpu_crtc_complete_commit(DRMID(crtc));
@@ -934,6 +946,10 @@ static int _dpu_crtc_wait_for_frame_done(struct drm_crtc *crtc) 
	return rc;

}



/**

 * dpu_crtc_commit_kickoff - trigger kickoff of the commit for this crtc

 * @crtc: Pointer to drm crtc object

 */

void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)

{

	struct drm_encoder *encoder;
@@ -1243,6 +1259,11 @@ static enum drm_mode_status dpu_crtc_mode_valid(struct drm_crtc *crtc, 
				      4096);

}



/**

 * dpu_crtc_vblank - enable or disable vblanks for this crtc

 * @crtc: Pointer to drm crtc object

 * @en: true to enable vblanks, false to disable

 */

int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)

{

	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
@@ -1462,7 +1483,15 @@ static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { 
	.get_scanout_position = dpu_crtc_get_scanout_position,

};



/* initialize crtc */

/**

 * dpu_crtc_init - create a new crtc object

 * @dev: dpu device

 * @plane: base plane

 * @cursor: cursor plane

 * @return: new crtc object or error

 *

 * initialize CRTC

 */

struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane,

				struct drm_plane *cursor)

{