Commit f913454a authored by Abhinav Kumar's avatar Abhinav Kumar Committed by Rob Clark
Browse files

drm/msm/dp: move debugfs node to /sys/kernel/debug/dri/*/ 



Move the MSM DP debugfs node from /sys/kernel/debug/drm_dp
to /sys/kernel/debug/dri/*/ as required for video pattern
compliance test suite.

Changes in v2: rebase on top of latest patchset of dependency

Signed-off-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent d11a9369

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

+7 −0
Original line number Diff line number Diff line
@@ -195,10 +195,15 @@ static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) 
	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

	void *p = dpu_hw_util_get_log_mask_ptr();

	struct dentry *entry;

	struct drm_device *dev;

	struct msm_drm_private *priv;



	if (!p)

		return -EINVAL;



	dev = dpu_kms->dev;

	priv = dev->dev_private;



	entry = debugfs_create_dir("debug", minor->debugfs_root);



	debugfs_create_x32(DPU_DEBUGFS_HWMASKNAME, 0600, entry, p);
@@ -207,6 +212,8 @@ static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) 
	dpu_debugfs_vbif_init(dpu_kms, entry);

	dpu_debugfs_core_irq_init(dpu_kms, entry);



	msm_dp_debugfs_init(priv->dp, minor);



	return dpu_core_perf_debugfs_init(dpu_kms, entry);

}

#endif

drivers/gpu/drm/msm/dp/dp_debug.c

+11 −20
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/debugfs.h>

#include <drm/drm_connector.h>

#include <drm/drm_file.h>



#include "dp_parser.h"

#include "dp_catalog.h"
@@ -15,7 +16,7 @@ 
#include "dp_debug.h"

#include "dp_display.h"



#define DEBUG_NAME "drm_dp"

#define DEBUG_NAME "msm_dp"



struct dp_debug_private {

	struct dentry *root;
@@ -25,6 +26,7 @@ struct dp_debug_private { 
	struct dp_panel *panel;

	struct drm_connector **connector;

	struct device *dev;

	struct drm_device *drm_dev;



	struct dp_debug dp_debug;

};
@@ -206,41 +208,29 @@ static const struct file_operations dp_debug_fops = { 
	.read = dp_debug_read_info,

};



static int dp_debug_init(struct dp_debug *dp_debug)

static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)

{

	int rc = 0;

	struct dp_debug_private *debug = container_of(dp_debug,

			struct dp_debug_private, dp_debug);

	struct dentry *dir, *file;

	struct dentry *file;



	dir = debugfs_create_dir(DEBUG_NAME, NULL);

	if (IS_ERR_OR_NULL(dir)) {

		rc = PTR_ERR(dir);

		DRM_ERROR("[%s] debugfs create dir failed, rc = %d\n",

				  DEBUG_NAME, rc);

		goto error;

	}



	file = debugfs_create_file("dp_debug", 0444, dir,

	file = debugfs_create_file("dp_debug", 0444, minor->debugfs_root,

			debug, &dp_debug_fops);

	if (IS_ERR_OR_NULL(file)) {

		rc = PTR_ERR(file);

		DRM_ERROR("[%s] debugfs create file failed, rc=%d\n",

				  DEBUG_NAME, rc);

		goto error_remove_dir;

	}



	debug->root = dir;

	return rc;

 error_remove_dir:

	debugfs_remove(dir);

 error:

	debug->root = minor->debugfs_root;



	return rc;

}



struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,

		struct dp_usbpd *usbpd, struct dp_link *link,

		struct drm_connector **connector)

		struct drm_connector **connector, struct drm_minor *minor)

{

	int rc = 0;

	struct dp_debug_private *debug;
@@ -263,6 +253,7 @@ struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel, 
	debug->link = link;

	debug->panel = panel;

	debug->dev = dev;

	debug->drm_dev = minor->dev;

	debug->connector = connector;



	dp_debug = &debug->dp_debug;
@@ -270,7 +261,7 @@ struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel, 
	dp_debug->hdisplay = 0;

	dp_debug->vrefresh = 0;



	rc = dp_debug_init(dp_debug);

	rc = dp_debug_init(dp_debug, minor);

	if (rc) {

		devm_kfree(dev, debug);

		goto error;

drivers/gpu/drm/msm/dp/dp_debug.h

+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct dp_debug { 
 * @usbpd: instance of usbpd module

 * @link: instance of link module

 * @connector: double pointer to display connector

 * @minor: pointer to drm minor number after device registration

 * return: pointer to allocated debug module data

 *

 * This function sets up the debug module and provides a way
@@ -42,7 +43,9 @@ struct dp_debug { 
 */

struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,

		struct dp_usbpd *usbpd, struct dp_link *link,

		struct drm_connector **connector);

		struct drm_connector **connector,

		struct drm_minor *minor);



/**

 * dp_debug_put()

 *

drivers/gpu/drm/msm/dp/dp_display.c

+20 −14
Original line number Diff line number Diff line
@@ -229,10 +229,8 @@ static int dp_display_bind(struct device *dev, struct device *master, 
	}



	rc = dp_register_audio_driver(dev, dp->audio);

	if (rc) {

	if (rc)

		DRM_ERROR("Audio registration Dp failed\n");

		goto end;

	}



end:

	return rc;
@@ -773,19 +771,8 @@ static int dp_init_sub_modules(struct dp_display_private *dp) 
		goto error_audio;

	}



	dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd,

			dp->link, &dp->dp_display.connector);

	if (IS_ERR(dp->debug)) {

		rc = PTR_ERR(dp->debug);

		DRM_ERROR("failed to initialize debug, rc = %d\n", rc);

		dp->debug = NULL;

		goto error_debug;

	}



	return rc;



error_debug:

	dp_audio_put(dp->audio);

error_audio:

	dp_ctrl_put(dp->ctrl);

error_ctrl:
@@ -1299,6 +1286,25 @@ void msm_dp_irq_postinstall(struct msm_dp *dp_display) 
	dp_add_event(dp, EV_HPD_INIT_SETUP, 0, 100);

}



void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)

{

	struct dp_display_private *dp;

	struct device *dev;

	int rc;



	dp = container_of(dp_display, struct dp_display_private, dp_display);

	dev = &dp->pdev->dev;



	dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd,

					dp->link, &dp->dp_display.connector,

					minor);

	if (IS_ERR(dp->debug)) {

		rc = PTR_ERR(dp->debug);

		DRM_ERROR("failed to initialize debug, rc = %d\n", rc);

		dp->debug = NULL;

	}

}



int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,

			struct drm_encoder *encoder)

{

drivers/gpu/drm/msm/msm_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ void msm_dp_display_mode_set(struct msm_dp *dp, struct drm_encoder *encoder, 
				struct drm_display_mode *adjusted_mode);

void msm_dp_irq_postinstall(struct msm_dp *dp_display);



void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor);



#else

static inline int __init msm_dp_register(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE