drm/msm/dpu: remove dev from RM

Not used. Remove from RM.

changes in v2:
	- none

Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 56555c3a750a597ff2e3d6a6639c523c5a14ae6d..05edd8580a814a56cf390387a0fb530c3315b15a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -877,8 +877,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
                goto power_error;
        }
 
-       rc = dpu_rm_init(&dpu_kms->rm, dpu_kms->catalog, dpu_kms->mmio,
-                       dpu_kms->dev);
+       rc = dpu_rm_init(&dpu_kms->rm, dpu_kms->catalog, dpu_kms->mmio);
        if (rc) {
                DPU_ERROR("rm init failed: %d\n", rc);
                goto power_error;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
index 36a929bc1d18716649ee5d6967d31493d6d07402..5ce89b9050da8b02cfe76cec3518d60db68a7367 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
@@ -224,13 +224,12 @@ static int _dpu_rm_hw_blk_create(
 
 int dpu_rm_init(struct dpu_rm *rm,
                struct dpu_mdss_cfg *cat,
-               void __iomem *mmio,
-               struct drm_device *dev)
+               void __iomem *mmio)
 {
        int rc, i;
        enum dpu_hw_blk_type type;
 
-       if (!rm || !cat || !mmio || !dev) {
+       if (!rm || !cat || !mmio) {
                DPU_ERROR("invalid kms\n");
                return -EINVAL;
        }
@@ -243,8 +242,6 @@ int dpu_rm_init(struct dpu_rm *rm,
        for (type = 0; type < DPU_HW_BLK_MAX; type++)
                INIT_LIST_HEAD(&rm->hw_blks[type]);
 
-       rm->dev = dev;
-
        /* Some of the sub-blocks require an mdptop to be created */
        rm->hw_mdp = dpu_hw_mdptop_init(MDP_TOP, mmio, cat);
        if (IS_ERR_OR_NULL(rm->hw_mdp)) {

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
index 0dd3c2131ca19b2f0648b172016c7b8105abc6d0..f41fd19e24bd2b7d8a280a80a7c83811218ce87f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
@@ -22,7 +22,6 @@
 
 /**
  * struct dpu_rm - DPU dynamic hardware resource manager
- * @dev: device handle for event logging purposes
  * @hw_blks: array of lists of hardware resources present in the system, one
  *     list per type of hardware block
  * @hw_mdp: hardware object for mdp_top
@@ -30,7 +29,6 @@
  * @rm_lock: resource manager mutex
  */
 struct dpu_rm {
-       struct drm_device *dev;
        struct list_head hw_blks[DPU_HW_BLK_MAX];
        struct dpu_hw_mdp *hw_mdp;
        uint32_t lm_max_width;
@@ -63,13 +61,11 @@ struct dpu_rm_hw_iter {
  * @rm: DPU Resource Manager handle
  * @cat: Pointer to hardware catalog
  * @mmio: mapped register io address of MDP
- * @dev: device handle for event logging purposes
  * @Return: 0 on Success otherwise -ERROR
  */
 int dpu_rm_init(struct dpu_rm *rm,
                struct dpu_mdss_cfg *cat,
-               void __iomem *mmio,
-               struct drm_device *dev);
+               void __iomem *mmio);
 
 /**
  * dpu_rm_destroy - Free all memory allocated by dpu_rm_init