* [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-05 7:36 ` Mark Yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark Yao @ 2017-02-05 7:36 UTC (permalink / raw)
To: David Airlie, Heiko Stuebner, dri-devel, linux-arm-kernel,
linux-rockchip, linux-kernel
Cc: Mark Yao
drm crtc already has mode_fixup callback to can do mode check, but
We actually want to valid display mode on connector getmode time,
mode_fixup can't do it.
So add a private mode_valid callback to rockchip crtc, connectors can
check mode with this mode_valid callback.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
4 files changed, 37 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index fb6226c..d10b15c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -39,6 +39,8 @@
struct rockchip_crtc_funcs {
int (*enable_vblank)(struct drm_crtc *crtc);
void (*disable_vblank)(struct drm_crtc *crtc);
+ enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
+ const struct drm_display_mode *mode);
};
struct rockchip_crtc_state {
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index fb5f001..256fe73 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
spin_unlock_irqrestore(&vop->irq_lock, flags);
}
+static enum drm_mode_status
+vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
+{
+ struct vop *vop = to_vop(crtc);
+ const struct vop_data *vop_data = vop->data;
+
+ if (mode->hdisplay > vop_data->max_output.width)
+ return MODE_BAD_HVALUE;
+ if (mode->vdisplay > vop_data->max_output.height)
+ return MODE_BAD_VVALUE;
+
+ return MODE_OK;
+}
+
static const struct rockchip_crtc_funcs private_crtc_funcs = {
.enable_vblank = vop_crtc_enable_vblank,
.disable_vblank = vop_crtc_disable_vblank,
+ .mode_valid = vop_crtc_mode_valid,
};
static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
index 1dbc526..9e9dba1 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
@@ -133,6 +133,11 @@ struct vop_win_data {
enum drm_plane_type type;
};
+struct vop_rect {
+ int width;
+ int height;
+};
+
struct vop_data {
const struct vop_reg_data *init_table;
unsigned int table_size;
@@ -140,6 +145,8 @@ struct vop_data {
const struct vop_intr *intr;
const struct vop_win_data *win;
unsigned int win_size;
+ struct vop_rect max_input;
+ struct vop_rect max_output;
};
/* interrupt define */
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 35c51f3..0c72361 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -132,6 +132,8 @@
};
static const struct vop_data rk3036_vop = {
+ .max_input = { 1920, 1080},
+ .max_output = { 1920, 1080},
.init_table = rk3036_vop_init_reg_table,
.table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
.ctrl = &rk3036_ctrl_data,
@@ -273,6 +275,13 @@
};
static const struct vop_data rk3288_vop = {
+ .max_input = { 4096, 8192},
+ /*
+ * TODO: rk3288 have two vop, big one support 3840x2160,
+ * little one only support 2560x1600.
+ * Now force use 3840x2160.
+ */
+ .max_output = { 3840, 2160},
.init_table = rk3288_init_reg_table,
.table_size = ARRAY_SIZE(rk3288_init_reg_table),
.intr = &rk3288_vop_intr,
@@ -339,6 +348,8 @@
};
static const struct vop_data rk3399_vop_big = {
+ .max_input = { 4096, 8192},
+ .max_output = { 4096, 2160},
.init_table = rk3399_init_reg_table,
.table_size = ARRAY_SIZE(rk3399_init_reg_table),
.intr = &rk3399_vop_intr,
@@ -358,6 +369,8 @@
};
static const struct vop_data rk3399_vop_lit = {
+ .max_input = { 4096, 8192},
+ .max_output = { 2560, 1600},
.init_table = rk3399_init_reg_table,
.table_size = ARRAY_SIZE(rk3399_init_reg_table),
.intr = &rk3399_vop_intr,
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-05 7:36 ` Mark Yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark Yao @ 2017-02-05 7:36 UTC (permalink / raw)
To: David Airlie, Heiko Stuebner, dri-devel, linux-arm-kernel,
linux-rockchip, linux-kernel
drm crtc already has mode_fixup callback to can do mode check, but
We actually want to valid display mode on connector getmode time,
mode_fixup can't do it.
So add a private mode_valid callback to rockchip crtc, connectors can
check mode with this mode_valid callback.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
4 files changed, 37 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index fb6226c..d10b15c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -39,6 +39,8 @@
struct rockchip_crtc_funcs {
int (*enable_vblank)(struct drm_crtc *crtc);
void (*disable_vblank)(struct drm_crtc *crtc);
+ enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
+ const struct drm_display_mode *mode);
};
struct rockchip_crtc_state {
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index fb5f001..256fe73 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
spin_unlock_irqrestore(&vop->irq_lock, flags);
}
+static enum drm_mode_status
+vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
+{
+ struct vop *vop = to_vop(crtc);
+ const struct vop_data *vop_data = vop->data;
+
+ if (mode->hdisplay > vop_data->max_output.width)
+ return MODE_BAD_HVALUE;
+ if (mode->vdisplay > vop_data->max_output.height)
+ return MODE_BAD_VVALUE;
+
+ return MODE_OK;
+}
+
static const struct rockchip_crtc_funcs private_crtc_funcs = {
.enable_vblank = vop_crtc_enable_vblank,
.disable_vblank = vop_crtc_disable_vblank,
+ .mode_valid = vop_crtc_mode_valid,
};
static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
index 1dbc526..9e9dba1 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
@@ -133,6 +133,11 @@ struct vop_win_data {
enum drm_plane_type type;
};
+struct vop_rect {
+ int width;
+ int height;
+};
+
struct vop_data {
const struct vop_reg_data *init_table;
unsigned int table_size;
@@ -140,6 +145,8 @@ struct vop_data {
const struct vop_intr *intr;
const struct vop_win_data *win;
unsigned int win_size;
+ struct vop_rect max_input;
+ struct vop_rect max_output;
};
/* interrupt define */
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 35c51f3..0c72361 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -132,6 +132,8 @@
};
static const struct vop_data rk3036_vop = {
+ .max_input = { 1920, 1080},
+ .max_output = { 1920, 1080},
.init_table = rk3036_vop_init_reg_table,
.table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
.ctrl = &rk3036_ctrl_data,
@@ -273,6 +275,13 @@
};
static const struct vop_data rk3288_vop = {
+ .max_input = { 4096, 8192},
+ /*
+ * TODO: rk3288 have two vop, big one support 3840x2160,
+ * little one only support 2560x1600.
+ * Now force use 3840x2160.
+ */
+ .max_output = { 3840, 2160},
.init_table = rk3288_init_reg_table,
.table_size = ARRAY_SIZE(rk3288_init_reg_table),
.intr = &rk3288_vop_intr,
@@ -339,6 +348,8 @@
};
static const struct vop_data rk3399_vop_big = {
+ .max_input = { 4096, 8192},
+ .max_output = { 4096, 2160},
.init_table = rk3399_init_reg_table,
.table_size = ARRAY_SIZE(rk3399_init_reg_table),
.intr = &rk3399_vop_intr,
@@ -358,6 +369,8 @@
};
static const struct vop_data rk3399_vop_lit = {
+ .max_input = { 4096, 8192},
+ .max_output = { 2560, 1600},
.init_table = rk3399_init_reg_table,
.table_size = ARRAY_SIZE(rk3399_init_reg_table),
.intr = &rk3399_vop_intr,
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-05 7:36 ` Mark Yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark Yao @ 2017-02-05 7:36 UTC (permalink / raw)
To: linux-arm-kernel
drm crtc already has mode_fixup callback to can do mode check, but
We actually want to valid display mode on connector getmode time,
mode_fixup can't do it.
So add a private mode_valid callback to rockchip crtc, connectors can
check mode with this mode_valid callback.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
4 files changed, 37 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index fb6226c..d10b15c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -39,6 +39,8 @@
struct rockchip_crtc_funcs {
int (*enable_vblank)(struct drm_crtc *crtc);
void (*disable_vblank)(struct drm_crtc *crtc);
+ enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
+ const struct drm_display_mode *mode);
};
struct rockchip_crtc_state {
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index fb5f001..256fe73 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
spin_unlock_irqrestore(&vop->irq_lock, flags);
}
+static enum drm_mode_status
+vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
+{
+ struct vop *vop = to_vop(crtc);
+ const struct vop_data *vop_data = vop->data;
+
+ if (mode->hdisplay > vop_data->max_output.width)
+ return MODE_BAD_HVALUE;
+ if (mode->vdisplay > vop_data->max_output.height)
+ return MODE_BAD_VVALUE;
+
+ return MODE_OK;
+}
+
static const struct rockchip_crtc_funcs private_crtc_funcs = {
.enable_vblank = vop_crtc_enable_vblank,
.disable_vblank = vop_crtc_disable_vblank,
+ .mode_valid = vop_crtc_mode_valid,
};
static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
index 1dbc526..9e9dba1 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
@@ -133,6 +133,11 @@ struct vop_win_data {
enum drm_plane_type type;
};
+struct vop_rect {
+ int width;
+ int height;
+};
+
struct vop_data {
const struct vop_reg_data *init_table;
unsigned int table_size;
@@ -140,6 +145,8 @@ struct vop_data {
const struct vop_intr *intr;
const struct vop_win_data *win;
unsigned int win_size;
+ struct vop_rect max_input;
+ struct vop_rect max_output;
};
/* interrupt define */
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 35c51f3..0c72361 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -132,6 +132,8 @@
};
static const struct vop_data rk3036_vop = {
+ .max_input = { 1920, 1080},
+ .max_output = { 1920, 1080},
.init_table = rk3036_vop_init_reg_table,
.table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
.ctrl = &rk3036_ctrl_data,
@@ -273,6 +275,13 @@
};
static const struct vop_data rk3288_vop = {
+ .max_input = { 4096, 8192},
+ /*
+ * TODO: rk3288 have two vop, big one support 3840x2160,
+ * little one only support 2560x1600.
+ * Now force use 3840x2160.
+ */
+ .max_output = { 3840, 2160},
.init_table = rk3288_init_reg_table,
.table_size = ARRAY_SIZE(rk3288_init_reg_table),
.intr = &rk3288_vop_intr,
@@ -339,6 +348,8 @@
};
static const struct vop_data rk3399_vop_big = {
+ .max_input = { 4096, 8192},
+ .max_output = { 4096, 2160},
.init_table = rk3399_init_reg_table,
.table_size = ARRAY_SIZE(rk3399_init_reg_table),
.intr = &rk3399_vop_intr,
@@ -358,6 +369,8 @@
};
static const struct vop_data rk3399_vop_lit = {
+ .max_input = { 4096, 8192},
+ .max_output = { 2560, 1600},
.init_table = rk3399_init_reg_table,
.table_size = ARRAY_SIZE(rk3399_init_reg_table),
.intr = &rk3399_vop_intr,
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] drm/rockchip: dw_hdmi: check display mode with crtc mode valid
2017-02-05 7:36 ` Mark Yao
(?)
@ 2017-02-05 7:36 ` Mark Yao
-1 siblings, 0 replies; 15+ messages in thread
From: Mark Yao @ 2017-02-05 7:36 UTC (permalink / raw)
To: David Airlie, Heiko Stuebner, dri-devel, linux-arm-kernel,
linux-rockchip, linux-kernel
Cc: Mark Yao
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 47 +++++++++++++++++++++++++++--
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index a6d4a02..64408bc 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -158,18 +158,59 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
struct drm_display_mode *mode)
{
const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
+ struct drm_device *dev = connector->dev;
+ struct drm_encoder *encoder = connector->encoder;
+ struct rockchip_drm_private *priv = dev->dev_private;
int pclk = mode->clock * 1000;
- bool valid = false;
+ enum drm_mode_status status = MODE_BAD;
+ struct drm_crtc *crtc;
int i;
for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
if (pclk == mpll_cfg[i].mpixelclock) {
- valid = true;
+ status = MODE_OK;
break;
}
}
- return (valid) ? MODE_OK : MODE_BAD;
+
+ if (status != MODE_OK)
+ return status;
+
+ if (!encoder) {
+ const struct drm_connector_helper_funcs *funcs;
+
+ funcs = connector->helper_private;
+ if (funcs->atomic_best_encoder)
+ encoder = funcs->atomic_best_encoder(connector,
+ connector->state);
+ else
+ encoder = funcs->best_encoder(connector);
+ }
+
+ if (!encoder || !encoder->possible_crtcs)
+ return MODE_BAD;
+ /*
+ * ensure all drm display mode can work, if someone want support more
+ * resolutions, please limit the possible_crtc, only connect to
+ * needed crtc.
+ */
+ drm_for_each_crtc(crtc, connector->dev) {
+ int pipe = drm_crtc_index(crtc);
+ const struct rockchip_crtc_funcs *funcs =
+ priv->crtc_funcs[pipe];
+
+ if (!(encoder->possible_crtcs & drm_crtc_mask(crtc)))
+ continue;
+ if (!funcs || !funcs->mode_valid)
+ continue;
+
+ status = funcs->mode_valid(crtc, mode);
+ if (status != MODE_OK)
+ return status;
+ }
+
+ return status;
}
static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = {
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] drm/rockchip: dw_hdmi: check display mode with crtc mode valid
@ 2017-02-05 7:36 ` Mark Yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark Yao @ 2017-02-05 7:36 UTC (permalink / raw)
To: David Airlie, Heiko Stuebner, dri-devel, linux-arm-kernel,
linux-rockchip, linux-kernel
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 47 +++++++++++++++++++++++++++--
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index a6d4a02..64408bc 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -158,18 +158,59 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
struct drm_display_mode *mode)
{
const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
+ struct drm_device *dev = connector->dev;
+ struct drm_encoder *encoder = connector->encoder;
+ struct rockchip_drm_private *priv = dev->dev_private;
int pclk = mode->clock * 1000;
- bool valid = false;
+ enum drm_mode_status status = MODE_BAD;
+ struct drm_crtc *crtc;
int i;
for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
if (pclk == mpll_cfg[i].mpixelclock) {
- valid = true;
+ status = MODE_OK;
break;
}
}
- return (valid) ? MODE_OK : MODE_BAD;
+
+ if (status != MODE_OK)
+ return status;
+
+ if (!encoder) {
+ const struct drm_connector_helper_funcs *funcs;
+
+ funcs = connector->helper_private;
+ if (funcs->atomic_best_encoder)
+ encoder = funcs->atomic_best_encoder(connector,
+ connector->state);
+ else
+ encoder = funcs->best_encoder(connector);
+ }
+
+ if (!encoder || !encoder->possible_crtcs)
+ return MODE_BAD;
+ /*
+ * ensure all drm display mode can work, if someone want support more
+ * resolutions, please limit the possible_crtc, only connect to
+ * needed crtc.
+ */
+ drm_for_each_crtc(crtc, connector->dev) {
+ int pipe = drm_crtc_index(crtc);
+ const struct rockchip_crtc_funcs *funcs =
+ priv->crtc_funcs[pipe];
+
+ if (!(encoder->possible_crtcs & drm_crtc_mask(crtc)))
+ continue;
+ if (!funcs || !funcs->mode_valid)
+ continue;
+
+ status = funcs->mode_valid(crtc, mode);
+ if (status != MODE_OK)
+ return status;
+ }
+
+ return status;
}
static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = {
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] drm/rockchip: dw_hdmi: check display mode with crtc mode valid
@ 2017-02-05 7:36 ` Mark Yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark Yao @ 2017-02-05 7:36 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 47 +++++++++++++++++++++++++++--
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index a6d4a02..64408bc 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -158,18 +158,59 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
struct drm_display_mode *mode)
{
const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
+ struct drm_device *dev = connector->dev;
+ struct drm_encoder *encoder = connector->encoder;
+ struct rockchip_drm_private *priv = dev->dev_private;
int pclk = mode->clock * 1000;
- bool valid = false;
+ enum drm_mode_status status = MODE_BAD;
+ struct drm_crtc *crtc;
int i;
for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
if (pclk == mpll_cfg[i].mpixelclock) {
- valid = true;
+ status = MODE_OK;
break;
}
}
- return (valid) ? MODE_OK : MODE_BAD;
+
+ if (status != MODE_OK)
+ return status;
+
+ if (!encoder) {
+ const struct drm_connector_helper_funcs *funcs;
+
+ funcs = connector->helper_private;
+ if (funcs->atomic_best_encoder)
+ encoder = funcs->atomic_best_encoder(connector,
+ connector->state);
+ else
+ encoder = funcs->best_encoder(connector);
+ }
+
+ if (!encoder || !encoder->possible_crtcs)
+ return MODE_BAD;
+ /*
+ * ensure all drm display mode can work, if someone want support more
+ * resolutions, please limit the possible_crtc, only connect to
+ * needed crtc.
+ */
+ drm_for_each_crtc(crtc, connector->dev) {
+ int pipe = drm_crtc_index(crtc);
+ const struct rockchip_crtc_funcs *funcs =
+ priv->crtc_funcs[pipe];
+
+ if (!(encoder->possible_crtcs & drm_crtc_mask(crtc)))
+ continue;
+ if (!funcs || !funcs->mode_valid)
+ continue;
+
+ status = funcs->mode_valid(crtc, mode);
+ if (status != MODE_OK)
+ return status;
+ }
+
+ return status;
}
static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = {
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: support mode_valid for crtc
2017-02-05 7:36 ` Mark Yao
(?)
@ 2017-02-07 16:14 ` Sean Paul
-1 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-02-07 16:14 UTC (permalink / raw)
To: Mark Yao
Cc: David Airlie, Heiko Stuebner, dri-devel, linux-arm-kernel,
linux-rockchip, linux-kernel
On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
> drm crtc already has mode_fixup callback to can do mode check, but
> We actually want to valid display mode on connector getmode time,
> mode_fixup can't do it.
>
> So add a private mode_valid callback to rockchip crtc, connectors can
> check mode with this mode_valid callback.
>
There are some nasty layer violations happening in this set. You should use
mode_fixup if the crtc has limitations on the mode being set.
Sean
> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
> 4 files changed, 37 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> index fb6226c..d10b15c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> @@ -39,6 +39,8 @@
> struct rockchip_crtc_funcs {
> int (*enable_vblank)(struct drm_crtc *crtc);
> void (*disable_vblank)(struct drm_crtc *crtc);
> + enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
> + const struct drm_display_mode *mode);
> };
>
> struct rockchip_crtc_state {
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index fb5f001..256fe73 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
> spin_unlock_irqrestore(&vop->irq_lock, flags);
> }
>
> +static enum drm_mode_status
> +vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
> +{
> + struct vop *vop = to_vop(crtc);
> + const struct vop_data *vop_data = vop->data;
> +
> + if (mode->hdisplay > vop_data->max_output.width)
> + return MODE_BAD_HVALUE;
> + if (mode->vdisplay > vop_data->max_output.height)
> + return MODE_BAD_VVALUE;
> +
> + return MODE_OK;
> +}
> +
> static const struct rockchip_crtc_funcs private_crtc_funcs = {
> .enable_vblank = vop_crtc_enable_vblank,
> .disable_vblank = vop_crtc_disable_vblank,
> + .mode_valid = vop_crtc_mode_valid,
> };
>
> static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> index 1dbc526..9e9dba1 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> @@ -133,6 +133,11 @@ struct vop_win_data {
> enum drm_plane_type type;
> };
>
> +struct vop_rect {
> + int width;
> + int height;
> +};
> +
> struct vop_data {
> const struct vop_reg_data *init_table;
> unsigned int table_size;
> @@ -140,6 +145,8 @@ struct vop_data {
> const struct vop_intr *intr;
> const struct vop_win_data *win;
> unsigned int win_size;
> + struct vop_rect max_input;
> + struct vop_rect max_output;
> };
>
> /* interrupt define */
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> index 35c51f3..0c72361 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> @@ -132,6 +132,8 @@
> };
>
> static const struct vop_data rk3036_vop = {
> + .max_input = { 1920, 1080},
> + .max_output = { 1920, 1080},
> .init_table = rk3036_vop_init_reg_table,
> .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
> .ctrl = &rk3036_ctrl_data,
> @@ -273,6 +275,13 @@
> };
>
> static const struct vop_data rk3288_vop = {
> + .max_input = { 4096, 8192},
> + /*
> + * TODO: rk3288 have two vop, big one support 3840x2160,
> + * little one only support 2560x1600.
> + * Now force use 3840x2160.
> + */
> + .max_output = { 3840, 2160},
> .init_table = rk3288_init_reg_table,
> .table_size = ARRAY_SIZE(rk3288_init_reg_table),
> .intr = &rk3288_vop_intr,
> @@ -339,6 +348,8 @@
> };
>
> static const struct vop_data rk3399_vop_big = {
> + .max_input = { 4096, 8192},
> + .max_output = { 4096, 2160},
> .init_table = rk3399_init_reg_table,
> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
> .intr = &rk3399_vop_intr,
> @@ -358,6 +369,8 @@
> };
>
> static const struct vop_data rk3399_vop_lit = {
> + .max_input = { 4096, 8192},
> + .max_output = { 2560, 1600},
> .init_table = rk3399_init_reg_table,
> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
> .intr = &rk3399_vop_intr,
> --
> 1.9.1
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-07 16:14 ` Sean Paul
0 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-02-07 16:14 UTC (permalink / raw)
To: Mark Yao; +Cc: linux-kernel, dri-devel, linux-rockchip, linux-arm-kernel
On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
> drm crtc already has mode_fixup callback to can do mode check, but
> We actually want to valid display mode on connector getmode time,
> mode_fixup can't do it.
>
> So add a private mode_valid callback to rockchip crtc, connectors can
> check mode with this mode_valid callback.
>
There are some nasty layer violations happening in this set. You should use
mode_fixup if the crtc has limitations on the mode being set.
Sean
> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
> 4 files changed, 37 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> index fb6226c..d10b15c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> @@ -39,6 +39,8 @@
> struct rockchip_crtc_funcs {
> int (*enable_vblank)(struct drm_crtc *crtc);
> void (*disable_vblank)(struct drm_crtc *crtc);
> + enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
> + const struct drm_display_mode *mode);
> };
>
> struct rockchip_crtc_state {
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index fb5f001..256fe73 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
> spin_unlock_irqrestore(&vop->irq_lock, flags);
> }
>
> +static enum drm_mode_status
> +vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
> +{
> + struct vop *vop = to_vop(crtc);
> + const struct vop_data *vop_data = vop->data;
> +
> + if (mode->hdisplay > vop_data->max_output.width)
> + return MODE_BAD_HVALUE;
> + if (mode->vdisplay > vop_data->max_output.height)
> + return MODE_BAD_VVALUE;
> +
> + return MODE_OK;
> +}
> +
> static const struct rockchip_crtc_funcs private_crtc_funcs = {
> .enable_vblank = vop_crtc_enable_vblank,
> .disable_vblank = vop_crtc_disable_vblank,
> + .mode_valid = vop_crtc_mode_valid,
> };
>
> static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> index 1dbc526..9e9dba1 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> @@ -133,6 +133,11 @@ struct vop_win_data {
> enum drm_plane_type type;
> };
>
> +struct vop_rect {
> + int width;
> + int height;
> +};
> +
> struct vop_data {
> const struct vop_reg_data *init_table;
> unsigned int table_size;
> @@ -140,6 +145,8 @@ struct vop_data {
> const struct vop_intr *intr;
> const struct vop_win_data *win;
> unsigned int win_size;
> + struct vop_rect max_input;
> + struct vop_rect max_output;
> };
>
> /* interrupt define */
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> index 35c51f3..0c72361 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> @@ -132,6 +132,8 @@
> };
>
> static const struct vop_data rk3036_vop = {
> + .max_input = { 1920, 1080},
> + .max_output = { 1920, 1080},
> .init_table = rk3036_vop_init_reg_table,
> .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
> .ctrl = &rk3036_ctrl_data,
> @@ -273,6 +275,13 @@
> };
>
> static const struct vop_data rk3288_vop = {
> + .max_input = { 4096, 8192},
> + /*
> + * TODO: rk3288 have two vop, big one support 3840x2160,
> + * little one only support 2560x1600.
> + * Now force use 3840x2160.
> + */
> + .max_output = { 3840, 2160},
> .init_table = rk3288_init_reg_table,
> .table_size = ARRAY_SIZE(rk3288_init_reg_table),
> .intr = &rk3288_vop_intr,
> @@ -339,6 +348,8 @@
> };
>
> static const struct vop_data rk3399_vop_big = {
> + .max_input = { 4096, 8192},
> + .max_output = { 4096, 2160},
> .init_table = rk3399_init_reg_table,
> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
> .intr = &rk3399_vop_intr,
> @@ -358,6 +369,8 @@
> };
>
> static const struct vop_data rk3399_vop_lit = {
> + .max_input = { 4096, 8192},
> + .max_output = { 2560, 1600},
> .init_table = rk3399_init_reg_table,
> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
> .intr = &rk3399_vop_intr,
> --
> 1.9.1
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-07 16:14 ` Sean Paul
0 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-02-07 16:14 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
> drm crtc already has mode_fixup callback to can do mode check, but
> We actually want to valid display mode on connector getmode time,
> mode_fixup can't do it.
>
> So add a private mode_valid callback to rockchip crtc, connectors can
> check mode with this mode_valid callback.
>
There are some nasty layer violations happening in this set. You should use
mode_fixup if the crtc has limitations on the mode being set.
Sean
> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
> 4 files changed, 37 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> index fb6226c..d10b15c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> @@ -39,6 +39,8 @@
> struct rockchip_crtc_funcs {
> int (*enable_vblank)(struct drm_crtc *crtc);
> void (*disable_vblank)(struct drm_crtc *crtc);
> + enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
> + const struct drm_display_mode *mode);
> };
>
> struct rockchip_crtc_state {
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index fb5f001..256fe73 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
> spin_unlock_irqrestore(&vop->irq_lock, flags);
> }
>
> +static enum drm_mode_status
> +vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
> +{
> + struct vop *vop = to_vop(crtc);
> + const struct vop_data *vop_data = vop->data;
> +
> + if (mode->hdisplay > vop_data->max_output.width)
> + return MODE_BAD_HVALUE;
> + if (mode->vdisplay > vop_data->max_output.height)
> + return MODE_BAD_VVALUE;
> +
> + return MODE_OK;
> +}
> +
> static const struct rockchip_crtc_funcs private_crtc_funcs = {
> .enable_vblank = vop_crtc_enable_vblank,
> .disable_vblank = vop_crtc_disable_vblank,
> + .mode_valid = vop_crtc_mode_valid,
> };
>
> static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> index 1dbc526..9e9dba1 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> @@ -133,6 +133,11 @@ struct vop_win_data {
> enum drm_plane_type type;
> };
>
> +struct vop_rect {
> + int width;
> + int height;
> +};
> +
> struct vop_data {
> const struct vop_reg_data *init_table;
> unsigned int table_size;
> @@ -140,6 +145,8 @@ struct vop_data {
> const struct vop_intr *intr;
> const struct vop_win_data *win;
> unsigned int win_size;
> + struct vop_rect max_input;
> + struct vop_rect max_output;
> };
>
> /* interrupt define */
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> index 35c51f3..0c72361 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> @@ -132,6 +132,8 @@
> };
>
> static const struct vop_data rk3036_vop = {
> + .max_input = { 1920, 1080},
> + .max_output = { 1920, 1080},
> .init_table = rk3036_vop_init_reg_table,
> .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
> .ctrl = &rk3036_ctrl_data,
> @@ -273,6 +275,13 @@
> };
>
> static const struct vop_data rk3288_vop = {
> + .max_input = { 4096, 8192},
> + /*
> + * TODO: rk3288 have two vop, big one support 3840x2160,
> + * little one only support 2560x1600.
> + * Now force use 3840x2160.
> + */
> + .max_output = { 3840, 2160},
> .init_table = rk3288_init_reg_table,
> .table_size = ARRAY_SIZE(rk3288_init_reg_table),
> .intr = &rk3288_vop_intr,
> @@ -339,6 +348,8 @@
> };
>
> static const struct vop_data rk3399_vop_big = {
> + .max_input = { 4096, 8192},
> + .max_output = { 4096, 2160},
> .init_table = rk3399_init_reg_table,
> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
> .intr = &rk3399_vop_intr,
> @@ -358,6 +369,8 @@
> };
>
> static const struct vop_data rk3399_vop_lit = {
> + .max_input = { 4096, 8192},
> + .max_output = { 2560, 1600},
> .init_table = rk3399_init_reg_table,
> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
> .intr = &rk3399_vop_intr,
> --
> 1.9.1
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: support mode_valid for crtc
2017-02-07 16:14 ` Sean Paul
(?)
@ 2017-02-08 0:45 ` Mark yao
-1 siblings, 0 replies; 15+ messages in thread
From: Mark yao @ 2017-02-08 0:45 UTC (permalink / raw)
To: Sean Paul
Cc: David Airlie, Heiko Stuebner, dri-devel, linux-arm-kernel,
linux-rockchip, linux-kernel
On 2017年02月08日 00:14, Sean Paul wrote:
> On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
>> drm crtc already has mode_fixup callback to can do mode check, but
>> We actually want to valid display mode on connector getmode time,
>> mode_fixup can't do it.
>>
>> So add a private mode_valid callback to rockchip crtc, connectors can
>> check mode with this mode_valid callback.
>>
> There are some nasty layer violations happening in this set. You should use
> mode_fixup if the crtc has limitations on the mode being set.
>
> Sean
Mode_fixup can also check crtc limitations, but it's secondly time to
check display mode.
mode_fixup only works on drm_setcrtc or atomic_commit check, when
userspace get a series of display modes,
They don't know which display mode is bad before drm_setcrtc or
atomic_commit check, they need try,
but drm_setcrtc or atomic_commit check not only for display mode check,
means that userspace didn't have a sure
method to verify display mode.
So I try to add the mode_valid callback to connector getmodes time,
verify display mode before send mode list to userspace.
then userspace would get a good display mode list.
>> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
>> ---
>> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
>> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
>> 4 files changed, 37 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> index fb6226c..d10b15c 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> @@ -39,6 +39,8 @@
>> struct rockchip_crtc_funcs {
>> int (*enable_vblank)(struct drm_crtc *crtc);
>> void (*disable_vblank)(struct drm_crtc *crtc);
>> + enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
>> + const struct drm_display_mode *mode);
>> };
>>
>> struct rockchip_crtc_state {
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> index fb5f001..256fe73 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> @@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
>> spin_unlock_irqrestore(&vop->irq_lock, flags);
>> }
>>
>> +static enum drm_mode_status
>> +vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
>> +{
>> + struct vop *vop = to_vop(crtc);
>> + const struct vop_data *vop_data = vop->data;
>> +
>> + if (mode->hdisplay > vop_data->max_output.width)
>> + return MODE_BAD_HVALUE;
>> + if (mode->vdisplay > vop_data->max_output.height)
>> + return MODE_BAD_VVALUE;
>> +
>> + return MODE_OK;
>> +}
>> +
>> static const struct rockchip_crtc_funcs private_crtc_funcs = {
>> .enable_vblank = vop_crtc_enable_vblank,
>> .disable_vblank = vop_crtc_disable_vblank,
>> + .mode_valid = vop_crtc_mode_valid,
>> };
>>
>> static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> index 1dbc526..9e9dba1 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> @@ -133,6 +133,11 @@ struct vop_win_data {
>> enum drm_plane_type type;
>> };
>>
>> +struct vop_rect {
>> + int width;
>> + int height;
>> +};
>> +
>> struct vop_data {
>> const struct vop_reg_data *init_table;
>> unsigned int table_size;
>> @@ -140,6 +145,8 @@ struct vop_data {
>> const struct vop_intr *intr;
>> const struct vop_win_data *win;
>> unsigned int win_size;
>> + struct vop_rect max_input;
>> + struct vop_rect max_output;
>> };
>>
>> /* interrupt define */
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> index 35c51f3..0c72361 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> @@ -132,6 +132,8 @@
>> };
>>
>> static const struct vop_data rk3036_vop = {
>> + .max_input = { 1920, 1080},
>> + .max_output = { 1920, 1080},
>> .init_table = rk3036_vop_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
>> .ctrl = &rk3036_ctrl_data,
>> @@ -273,6 +275,13 @@
>> };
>>
>> static const struct vop_data rk3288_vop = {
>> + .max_input = { 4096, 8192},
>> + /*
>> + * TODO: rk3288 have two vop, big one support 3840x2160,
>> + * little one only support 2560x1600.
>> + * Now force use 3840x2160.
>> + */
>> + .max_output = { 3840, 2160},
>> .init_table = rk3288_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3288_init_reg_table),
>> .intr = &rk3288_vop_intr,
>> @@ -339,6 +348,8 @@
>> };
>>
>> static const struct vop_data rk3399_vop_big = {
>> + .max_input = { 4096, 8192},
>> + .max_output = { 4096, 2160},
>> .init_table = rk3399_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
>> .intr = &rk3399_vop_intr,
>> @@ -358,6 +369,8 @@
>> };
>>
>> static const struct vop_data rk3399_vop_lit = {
>> + .max_input = { 4096, 8192},
>> + .max_output = { 2560, 1600},
>> .init_table = rk3399_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
>> .intr = &rk3399_vop_intr,
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Mark Yao
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-08 0:45 ` Mark yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark yao @ 2017-02-08 0:45 UTC (permalink / raw)
To: Sean Paul; +Cc: linux-kernel, dri-devel, linux-rockchip, linux-arm-kernel
On 2017年02月08日 00:14, Sean Paul wrote:
> On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
>> drm crtc already has mode_fixup callback to can do mode check, but
>> We actually want to valid display mode on connector getmode time,
>> mode_fixup can't do it.
>>
>> So add a private mode_valid callback to rockchip crtc, connectors can
>> check mode with this mode_valid callback.
>>
> There are some nasty layer violations happening in this set. You should use
> mode_fixup if the crtc has limitations on the mode being set.
>
> Sean
Mode_fixup can also check crtc limitations, but it's secondly time to
check display mode.
mode_fixup only works on drm_setcrtc or atomic_commit check, when
userspace get a series of display modes,
They don't know which display mode is bad before drm_setcrtc or
atomic_commit check, they need try,
but drm_setcrtc or atomic_commit check not only for display mode check,
means that userspace didn't have a sure
method to verify display mode.
So I try to add the mode_valid callback to connector getmodes time,
verify display mode before send mode list to userspace.
then userspace would get a good display mode list.
>> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
>> ---
>> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
>> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
>> 4 files changed, 37 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> index fb6226c..d10b15c 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> @@ -39,6 +39,8 @@
>> struct rockchip_crtc_funcs {
>> int (*enable_vblank)(struct drm_crtc *crtc);
>> void (*disable_vblank)(struct drm_crtc *crtc);
>> + enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
>> + const struct drm_display_mode *mode);
>> };
>>
>> struct rockchip_crtc_state {
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> index fb5f001..256fe73 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> @@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
>> spin_unlock_irqrestore(&vop->irq_lock, flags);
>> }
>>
>> +static enum drm_mode_status
>> +vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
>> +{
>> + struct vop *vop = to_vop(crtc);
>> + const struct vop_data *vop_data = vop->data;
>> +
>> + if (mode->hdisplay > vop_data->max_output.width)
>> + return MODE_BAD_HVALUE;
>> + if (mode->vdisplay > vop_data->max_output.height)
>> + return MODE_BAD_VVALUE;
>> +
>> + return MODE_OK;
>> +}
>> +
>> static const struct rockchip_crtc_funcs private_crtc_funcs = {
>> .enable_vblank = vop_crtc_enable_vblank,
>> .disable_vblank = vop_crtc_disable_vblank,
>> + .mode_valid = vop_crtc_mode_valid,
>> };
>>
>> static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> index 1dbc526..9e9dba1 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> @@ -133,6 +133,11 @@ struct vop_win_data {
>> enum drm_plane_type type;
>> };
>>
>> +struct vop_rect {
>> + int width;
>> + int height;
>> +};
>> +
>> struct vop_data {
>> const struct vop_reg_data *init_table;
>> unsigned int table_size;
>> @@ -140,6 +145,8 @@ struct vop_data {
>> const struct vop_intr *intr;
>> const struct vop_win_data *win;
>> unsigned int win_size;
>> + struct vop_rect max_input;
>> + struct vop_rect max_output;
>> };
>>
>> /* interrupt define */
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> index 35c51f3..0c72361 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> @@ -132,6 +132,8 @@
>> };
>>
>> static const struct vop_data rk3036_vop = {
>> + .max_input = { 1920, 1080},
>> + .max_output = { 1920, 1080},
>> .init_table = rk3036_vop_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
>> .ctrl = &rk3036_ctrl_data,
>> @@ -273,6 +275,13 @@
>> };
>>
>> static const struct vop_data rk3288_vop = {
>> + .max_input = { 4096, 8192},
>> + /*
>> + * TODO: rk3288 have two vop, big one support 3840x2160,
>> + * little one only support 2560x1600.
>> + * Now force use 3840x2160.
>> + */
>> + .max_output = { 3840, 2160},
>> .init_table = rk3288_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3288_init_reg_table),
>> .intr = &rk3288_vop_intr,
>> @@ -339,6 +348,8 @@
>> };
>>
>> static const struct vop_data rk3399_vop_big = {
>> + .max_input = { 4096, 8192},
>> + .max_output = { 4096, 2160},
>> .init_table = rk3399_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
>> .intr = &rk3399_vop_intr,
>> @@ -358,6 +369,8 @@
>> };
>>
>> static const struct vop_data rk3399_vop_lit = {
>> + .max_input = { 4096, 8192},
>> + .max_output = { 2560, 1600},
>> .init_table = rk3399_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
>> .intr = &rk3399_vop_intr,
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Mark Yao
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-08 0:45 ` Mark yao
0 siblings, 0 replies; 15+ messages in thread
From: Mark yao @ 2017-02-08 0:45 UTC (permalink / raw)
To: linux-arm-kernel
On 2017?02?08? 00:14, Sean Paul wrote:
> On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
>> drm crtc already has mode_fixup callback to can do mode check, but
>> We actually want to valid display mode on connector getmode time,
>> mode_fixup can't do it.
>>
>> So add a private mode_valid callback to rockchip crtc, connectors can
>> check mode with this mode_valid callback.
>>
> There are some nasty layer violations happening in this set. You should use
> mode_fixup if the crtc has limitations on the mode being set.
>
> Sean
Mode_fixup can also check crtc limitations, but it's secondly time to
check display mode.
mode_fixup only works on drm_setcrtc or atomic_commit check, when
userspace get a series of display modes,
They don't know which display mode is bad before drm_setcrtc or
atomic_commit check, they need try,
but drm_setcrtc or atomic_commit check not only for display mode check,
means that userspace didn't have a sure
method to verify display mode.
So I try to add the mode_valid callback to connector getmodes time,
verify display mode before send mode list to userspace.
then userspace would get a good display mode list.
>> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
>> ---
>> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 ++
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++
>> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++
>> 4 files changed, 37 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> index fb6226c..d10b15c 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>> @@ -39,6 +39,8 @@
>> struct rockchip_crtc_funcs {
>> int (*enable_vblank)(struct drm_crtc *crtc);
>> void (*disable_vblank)(struct drm_crtc *crtc);
>> + enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
>> + const struct drm_display_mode *mode);
>> };
>>
>> struct rockchip_crtc_state {
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> index fb5f001..256fe73 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> @@ -853,9 +853,24 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
>> spin_unlock_irqrestore(&vop->irq_lock, flags);
>> }
>>
>> +static enum drm_mode_status
>> +vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
>> +{
>> + struct vop *vop = to_vop(crtc);
>> + const struct vop_data *vop_data = vop->data;
>> +
>> + if (mode->hdisplay > vop_data->max_output.width)
>> + return MODE_BAD_HVALUE;
>> + if (mode->vdisplay > vop_data->max_output.height)
>> + return MODE_BAD_VVALUE;
>> +
>> + return MODE_OK;
>> +}
>> +
>> static const struct rockchip_crtc_funcs private_crtc_funcs = {
>> .enable_vblank = vop_crtc_enable_vblank,
>> .disable_vblank = vop_crtc_disable_vblank,
>> + .mode_valid = vop_crtc_mode_valid,
>> };
>>
>> static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> index 1dbc526..9e9dba1 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> @@ -133,6 +133,11 @@ struct vop_win_data {
>> enum drm_plane_type type;
>> };
>>
>> +struct vop_rect {
>> + int width;
>> + int height;
>> +};
>> +
>> struct vop_data {
>> const struct vop_reg_data *init_table;
>> unsigned int table_size;
>> @@ -140,6 +145,8 @@ struct vop_data {
>> const struct vop_intr *intr;
>> const struct vop_win_data *win;
>> unsigned int win_size;
>> + struct vop_rect max_input;
>> + struct vop_rect max_output;
>> };
>>
>> /* interrupt define */
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> index 35c51f3..0c72361 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> @@ -132,6 +132,8 @@
>> };
>>
>> static const struct vop_data rk3036_vop = {
>> + .max_input = { 1920, 1080},
>> + .max_output = { 1920, 1080},
>> .init_table = rk3036_vop_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table),
>> .ctrl = &rk3036_ctrl_data,
>> @@ -273,6 +275,13 @@
>> };
>>
>> static const struct vop_data rk3288_vop = {
>> + .max_input = { 4096, 8192},
>> + /*
>> + * TODO: rk3288 have two vop, big one support 3840x2160,
>> + * little one only support 2560x1600.
>> + * Now force use 3840x2160.
>> + */
>> + .max_output = { 3840, 2160},
>> .init_table = rk3288_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3288_init_reg_table),
>> .intr = &rk3288_vop_intr,
>> @@ -339,6 +348,8 @@
>> };
>>
>> static const struct vop_data rk3399_vop_big = {
>> + .max_input = { 4096, 8192},
>> + .max_output = { 4096, 2160},
>> .init_table = rk3399_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
>> .intr = &rk3399_vop_intr,
>> @@ -358,6 +369,8 @@
>> };
>>
>> static const struct vop_data rk3399_vop_lit = {
>> + .max_input = { 4096, 8192},
>> + .max_output = { 2560, 1600},
>> .init_table = rk3399_init_reg_table,
>> .table_size = ARRAY_SIZE(rk3399_init_reg_table),
>> .intr = &rk3399_vop_intr,
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
?ark Yao
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: support mode_valid for crtc
2017-02-08 0:45 ` Mark yao
(?)
@ 2017-02-08 7:34 ` Daniel Vetter
-1 siblings, 0 replies; 15+ messages in thread
From: Daniel Vetter @ 2017-02-08 7:34 UTC (permalink / raw)
To: Mark yao
Cc: Sean Paul, Linux Kernel Mailing List, dri-devel,
open list:ARM/Rockchip SoC...,
linux-arm-kernel
On Wed, Feb 8, 2017 at 1:45 AM, Mark yao <mark.yao@rock-chips.com> wrote:
> On 2017年02月08日 00:14, Sean Paul wrote:
>>
>> On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
>>>
>>> drm crtc already has mode_fixup callback to can do mode check, but
>>> We actually want to valid display mode on connector getmode time,
>>> mode_fixup can't do it.
>>>
>>> So add a private mode_valid callback to rockchip crtc, connectors can
>>> check mode with this mode_valid callback.
>>>
>> There are some nasty layer violations happening in this set. You should
>> use
>> mode_fixup if the crtc has limitations on the mode being set.
>>
>> Sean
>
> Mode_fixup can also check crtc limitations, but it's secondly time to check
> display mode.
>
> mode_fixup only works on drm_setcrtc or atomic_commit check, when userspace
> get a series of display modes,
> They don't know which display mode is bad before drm_setcrtc or
> atomic_commit check, they need try,
> but drm_setcrtc or atomic_commit check not only for display mode check,
> means that userspace didn't have a sure
> method to verify display mode.
>
> So I try to add the mode_valid callback to connector getmodes time, verify
> display mode before send mode list to userspace.
> then userspace would get a good display mode list.
You need both, the kerneldoc of these hooks explains in detail why.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-08 7:34 ` Daniel Vetter
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Vetter @ 2017-02-08 7:34 UTC (permalink / raw)
To: Mark yao
Cc: linux-arm-kernel, open list:ARM/Rockchip SoC...,
Linux Kernel Mailing List, dri-devel
On Wed, Feb 8, 2017 at 1:45 AM, Mark yao <mark.yao@rock-chips.com> wrote:
> On 2017年02月08日 00:14, Sean Paul wrote:
>>
>> On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
>>>
>>> drm crtc already has mode_fixup callback to can do mode check, but
>>> We actually want to valid display mode on connector getmode time,
>>> mode_fixup can't do it.
>>>
>>> So add a private mode_valid callback to rockchip crtc, connectors can
>>> check mode with this mode_valid callback.
>>>
>> There are some nasty layer violations happening in this set. You should
>> use
>> mode_fixup if the crtc has limitations on the mode being set.
>>
>> Sean
>
> Mode_fixup can also check crtc limitations, but it's secondly time to check
> display mode.
>
> mode_fixup only works on drm_setcrtc or atomic_commit check, when userspace
> get a series of display modes,
> They don't know which display mode is bad before drm_setcrtc or
> atomic_commit check, they need try,
> but drm_setcrtc or atomic_commit check not only for display mode check,
> means that userspace didn't have a sure
> method to verify display mode.
>
> So I try to add the mode_valid callback to connector getmodes time, verify
> display mode before send mode list to userspace.
> then userspace would get a good display mode list.
You need both, the kerneldoc of these hooks explains in detail why.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/2] drm/rockchip: support mode_valid for crtc
@ 2017-02-08 7:34 ` Daniel Vetter
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Vetter @ 2017-02-08 7:34 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Feb 8, 2017 at 1:45 AM, Mark yao <mark.yao@rock-chips.com> wrote:
> On 2017?02?08? 00:14, Sean Paul wrote:
>>
>> On Sun, Feb 05, 2017 at 03:36:36PM +0800, Mark Yao wrote:
>>>
>>> drm crtc already has mode_fixup callback to can do mode check, but
>>> We actually want to valid display mode on connector getmode time,
>>> mode_fixup can't do it.
>>>
>>> So add a private mode_valid callback to rockchip crtc, connectors can
>>> check mode with this mode_valid callback.
>>>
>> There are some nasty layer violations happening in this set. You should
>> use
>> mode_fixup if the crtc has limitations on the mode being set.
>>
>> Sean
>
> Mode_fixup can also check crtc limitations, but it's secondly time to check
> display mode.
>
> mode_fixup only works on drm_setcrtc or atomic_commit check, when userspace
> get a series of display modes,
> They don't know which display mode is bad before drm_setcrtc or
> atomic_commit check, they need try,
> but drm_setcrtc or atomic_commit check not only for display mode check,
> means that userspace didn't have a sure
> method to verify display mode.
>
> So I try to add the mode_valid callback to connector getmodes time, verify
> display mode before send mode list to userspace.
> then userspace would get a good display mode list.
You need both, the kerneldoc of these hooks explains in detail why.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-02-08 7:34 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-05 7:36 [PATCH 1/2] drm/rockchip: support mode_valid for crtc Mark Yao
2017-02-05 7:36 ` Mark Yao
2017-02-05 7:36 ` Mark Yao
2017-02-05 7:36 ` [PATCH 2/2] drm/rockchip: dw_hdmi: check display mode with crtc mode valid Mark Yao
2017-02-05 7:36 ` Mark Yao
2017-02-05 7:36 ` Mark Yao
2017-02-07 16:14 ` [PATCH 1/2] drm/rockchip: support mode_valid for crtc Sean Paul
2017-02-07 16:14 ` Sean Paul
2017-02-07 16:14 ` Sean Paul
2017-02-08 0:45 ` Mark yao
2017-02-08 0:45 ` Mark yao
2017-02-08 0:45 ` Mark yao
2017-02-08 7:34 ` Daniel Vetter
2017-02-08 7:34 ` Daniel Vetter
2017-02-08 7:34 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.