fe34464df5
The current iteration in get_dsi_id_from_intf() is wrong: instead of iterating until hw_cfg->intf.count, we need to iterate until MDP5_INTF_NUM_MAX here. Let's take the example of msm8x16: hw_cfg->intf.count = 1 intfs[0] = INTF_Disabled intfs[1] = INTF_DSI If we stop iterating once i reaches hw_cfg->intf.count (== 1), we will miss the test for intfs[1]. Actually, this hw_cfg->intf.count entry is quite confusing and is not (or *should not be*) used anywhere else; let's remove it. Signed-off-by: Stephane Viau <sviau@codeaurora.org>
110 lines
2.8 KiB
C
110 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 2014 The Linux Foundation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#ifndef __MDP5_CFG_H__
|
|
#define __MDP5_CFG_H__
|
|
|
|
#include "msm_drv.h"
|
|
|
|
/*
|
|
* mdp5_cfg
|
|
*
|
|
* This module configures the dynamic offsets used by mdp5.xml.h
|
|
* (initialized in mdp5_cfg.c)
|
|
*/
|
|
extern const struct mdp5_cfg_hw *mdp5_cfg;
|
|
|
|
#define MAX_CTL 8
|
|
#define MAX_BASES 8
|
|
#define MAX_SMP_BLOCKS 44
|
|
#define MAX_CLIENTS 32
|
|
|
|
typedef DECLARE_BITMAP(mdp5_smp_state_t, MAX_SMP_BLOCKS);
|
|
|
|
#define MDP5_SUB_BLOCK_DEFINITION \
|
|
int count; \
|
|
uint32_t base[MAX_BASES]
|
|
|
|
struct mdp5_sub_block {
|
|
MDP5_SUB_BLOCK_DEFINITION;
|
|
};
|
|
|
|
struct mdp5_lm_block {
|
|
MDP5_SUB_BLOCK_DEFINITION;
|
|
uint32_t nb_stages; /* number of stages per blender */
|
|
};
|
|
|
|
struct mdp5_ctl_block {
|
|
MDP5_SUB_BLOCK_DEFINITION;
|
|
uint32_t flush_hw_mask; /* FLUSH register's hardware mask */
|
|
};
|
|
|
|
struct mdp5_smp_block {
|
|
int mmb_count; /* number of SMP MMBs */
|
|
int mmb_size; /* MMB: size in bytes */
|
|
uint32_t clients[MAX_CLIENTS]; /* SMP port allocation /pipe */
|
|
mdp5_smp_state_t reserved_state;/* SMP MMBs statically allocated */
|
|
int reserved[MAX_CLIENTS]; /* # of MMBs allocated per client */
|
|
};
|
|
|
|
#define MDP5_INTF_NUM_MAX 5
|
|
|
|
struct mdp5_intf_block {
|
|
uint32_t base[MAX_BASES];
|
|
u32 connect[MDP5_INTF_NUM_MAX]; /* array of enum mdp5_intf_type */
|
|
};
|
|
|
|
struct mdp5_cfg_hw {
|
|
char *name;
|
|
|
|
struct mdp5_sub_block mdp;
|
|
struct mdp5_smp_block smp;
|
|
struct mdp5_ctl_block ctl;
|
|
struct mdp5_sub_block pipe_vig;
|
|
struct mdp5_sub_block pipe_rgb;
|
|
struct mdp5_sub_block pipe_dma;
|
|
struct mdp5_lm_block lm;
|
|
struct mdp5_sub_block dspp;
|
|
struct mdp5_sub_block ad;
|
|
struct mdp5_sub_block pp;
|
|
struct mdp5_intf_block intf;
|
|
|
|
uint32_t max_clk;
|
|
};
|
|
|
|
/* platform config data (ie. from DT, or pdata) */
|
|
struct mdp5_cfg_platform {
|
|
struct iommu_domain *iommu;
|
|
};
|
|
|
|
struct mdp5_cfg {
|
|
const struct mdp5_cfg_hw *hw;
|
|
struct mdp5_cfg_platform platform;
|
|
};
|
|
|
|
struct mdp5_kms;
|
|
struct mdp5_cfg_handler;
|
|
|
|
const struct mdp5_cfg_hw *mdp5_cfg_get_hw_config(struct mdp5_cfg_handler *cfg_hnd);
|
|
struct mdp5_cfg *mdp5_cfg_get_config(struct mdp5_cfg_handler *cfg_hnd);
|
|
int mdp5_cfg_get_hw_rev(struct mdp5_cfg_handler *cfg_hnd);
|
|
|
|
#define mdp5_cfg_intf_is_virtual(intf_type) ({ \
|
|
typeof(intf_type) __val = (intf_type); \
|
|
(__val) >= INTF_VIRTUAL ? true : false; })
|
|
|
|
struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,
|
|
uint32_t major, uint32_t minor);
|
|
void mdp5_cfg_destroy(struct mdp5_cfg_handler *cfg_hnd);
|
|
|
|
#endif /* __MDP5_CFG_H__ */
|