drm/tilcdc: a cleanup and a fix
Subsystems (3)
v2 cover drm/tilcdc: a cleanup and a fix
No functional changes since the first version. I'll send a pull request about these soon.
The minor changes:
- "drm/tilcdc: Check drm_fb_cma_get_gem_obj() return value"
- Add comment and improve commit description
- "drm/tilcdc: Remove obsolete crtc_mode_valid() hack"
- Improve indentation and add:
Jyri Sarha (2):
drm/tilcdc: Check drm_fb_cma_get_gem_obj() return value drm/tilcdc: Remove obsolete crtc_mode_valid() hack
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 30 ++++---- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 - drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 - drivers/gpu/drm/tilcdc/tilcdc_external.c | 88 +++--------------------- drivers/gpu/drm/tilcdc/tilcdc_external.h | 1 - drivers/gpu/drm/tilcdc/tilcdc_panel.c | 9 --- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 9 --- 7 files changed, 21 insertions(+), 119 deletions(-)
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/2 drm/tilcdc: Remove obsolete crtc_mode_valid() hack
Earlier there were no mode_valid() helper for crtc and tilcdc had a hack to over come this limitation. But now the mode_valid() helper is there (has been since v4.13), so it is about time to get rid of that hack.
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 28 +++----- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 - drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 - drivers/gpu/drm/tilcdc/tilcdc_external.c | 88 +++--------------------- drivers/gpu/drm/tilcdc/tilcdc_external.h | 1 - drivers/gpu/drm/tilcdc/tilcdc_panel.c | 9 --- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 9 --- 7 files changed, 19 insertions(+), 119 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +11 -17
@@ -659,9 +659,6 @@ static bool tilcdc_crtc_mode_fixup(struct drm_crtc *crtc,static int tilcdc_crtc_atomic_check (struct drm_crtc *crtc,struct drm_crtc_state *state) { -struct drm_display_mode *mode = &state->mode; -int ret; -/* If we are not active we don't care */ if (!state->active)return 0 ;
@@ -673,12 +670,6 @@ static int tilcdc_crtc_atomic_check(struct drm_crtc *crtc,return -EINVAL ; } - ret =tilcdc_crtc_mode_valid (crtc, mode); -if (ret) { -dev_dbg (crtc->dev->dev,"Mode \"%s\" not valid" , mode->name); -return -EINVAL ; - } -return 0 ; }
@@ -730,13 +721,6 @@ static const struct drm_crtc_funcs tilcdc_crtc_funcs = { .disable_vblank = tilcdc_crtc_disable_vblank, }; -static const struct drm_crtc_helper_funcs tilcdc_crtc_helper_funcs = { - .mode_fixup = tilcdc_crtc_mode_fixup, - .atomic_check = tilcdc_crtc_atomic_check, - .atomic_enable = tilcdc_crtc_atomic_enable, - .atomic_disable = tilcdc_crtc_atomic_disable, -}; -int tilcdc_crtc_max_width (struct drm_crtc *crtc) {struct drm_device *dev = crtc->dev;
@@ -751,7 +735,9 @@ int tilcdc_crtc_max_width(struct drm_crtc *crtc)return max_width; } -int tilcdc_crtc_mode_valid (struct drm_crtc *crtc,struct drm_display_mode *mode) +static enum drm_mode_status +tilcdc_crtc_mode_valid (struct drm_crtc *crtc, +const struct drm_display_mode *mode) {struct tilcdc_drm_private *priv = crtc->dev->dev_private;unsigned int bandwidth;
@@ -839,6 +825,14 @@ int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode)return MODE_OK ; } +static const struct drm_crtc_helper_funcs tilcdc_crtc_helper_funcs = { + .mode_valid = tilcdc_crtc_mode_valid, + .mode_fixup = tilcdc_crtc_mode_fixup, + .atomic_check = tilcdc_crtc_atomic_check, + .atomic_enable = tilcdc_crtc_atomic_enable, + .atomic_disable = tilcdc_crtc_atomic_disable, +}; +void tilcdc_crtc_set_panel_info (struct drm_crtc *crtc,const struct tilcdc_panel_info *info) {
drivers/gpu/drm/tilcdc/tilcdc_drv.c +0 -1
@@ -192,7 +192,6 @@ static void tilcdc_fini(struct drm_device *dev)drm_kms_helper_poll_fini (dev);drm_irq_uninstall (dev);drm_mode_config_cleanup (dev); -tilcdc_remove_external_device (dev);#ifdef CONFIG_CPU_FREQ if (priv->freq_transition.notifier_call)
drivers/gpu/drm/tilcdc/tilcdc_drv.h +0 -2
@@ -86,7 +86,6 @@ struct tilcdc_drm_private {struct drm_encoder *external_encoder;struct drm_connector *external_connector; -const struct drm_connector_helper_funcs *connector_funcs;bool is_registered;bool is_componentized;
@@ -168,7 +167,6 @@ void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc, const struct tilcdc_panel_info *info);void tilcdc_crtc_set_simulate_vesa_sync (struct drm_crtc *crtc,bool simulate_vesa_sync); -int tilcdc_crtc_mode_valid (struct drm_crtc *crtc,struct drm_display_mode *mode);int tilcdc_crtc_max_width (struct drm_crtc *crtc);void tilcdc_crtc_shutdown (struct drm_crtc *crtc); int tilcdc_crtc_update_fb(struct drm_crtc *crtc,
drivers/gpu/drm/tilcdc/tilcdc_external.c +8 -80
127 lines not on this page · raw message
drivers/gpu/drm/tilcdc/tilcdc_external.h +0 -1
@@ -19,7 +19,6 @@#define __TILCDC_EXTERNAL_H__int tilcdc_add_component_encoder (struct drm_device *dev); -void tilcdc_remove_external_device (struct drm_device *dev);int tilcdc_get_external_components (struct device *dev,struct component_match **match);int tilcdc_attach_external_device (struct drm_device *ddev);
drivers/gpu/drm/tilcdc/tilcdc_panel.c +0 -9
@@ -170,14 +170,6 @@ static int panel_connector_get_modes(struct drm_connector *connector)return i; } -static int panel_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) -{ -struct tilcdc_drm_private *priv = connector->dev->dev_private; -/* our only constraints are what the crtc can generate: */ -return tilcdc_crtc_mode_valid (priv->crtc, mode); -} -static struct drm_encoder *panel_connector_best_encoder (struct drm_connector *connector) {
@@ -195,7 +187,6 @@ static const struct drm_connector_funcs panel_connector_funcs = {static const struct drm_connector_helper_funcs panel_connector_helper_funcs = { .get_modes = panel_connector_get_modes, - .mode_valid = panel_connector_mode_valid, .best_encoder = panel_connector_best_encoder, };
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +0 -9
@@ -183,14 +183,6 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)return ret; } -static int tfp410_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) -{ -struct tilcdc_drm_private *priv = connector->dev->dev_private; -/* our only constraints are what the crtc can generate: */ -return tilcdc_crtc_mode_valid (priv->crtc, mode); -} -static struct drm_encoder *tfp410_connector_best_encoder (struct drm_connector *connector) {
@@ -209,7 +201,6 @@ static const struct drm_connector_funcs tfp410_connector_funcs = {static const struct drm_connector_helper_funcs tfp410_connector_helper_funcs = { .get_modes = tfp410_connector_get_modes, - .mode_valid = tfp410_connector_mode_valid, .best_encoder = tfp410_connector_best_encoder, };
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/2 drm/tilcdc: Check drm_fb_cma_get_gem_obj() return value
In reply to Jyri SarhaClockwork, a static code analysis SW, complains about drm_fb_cma_get_gem_obj() possibly returning NULL. This should never happen with the frame-buffers used by tilcdc. However, returning null is still a part of the drm_fb_cma_get_gem_obj() API, so lets make Clockwork quiet by adding a simple check with WARN.
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +2 -0
@@ -75,6 +75,8 @@ static void set_scanout(struct drm_crtc *crtc, struct drm_framebuffer *fb)u64 dma_base_and_ceiling; gem =drm_fb_cma_get_gem_obj (fb,0 ); +if (WARN_ON (!gem))/* Make Clockwork quiet. Should never happen. */ +return ; start = gem->paddr + fb->offsets[0 ] + crtc->y * fb->pitches[0] +
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel