dri-devel July 2018

dri-devel@lists.freedesktop.org

277 participants
1883 discussions

[PATCH 1/1] atmel_lcdfb: support native-mode display-timings
by Sam Ravnborg 14 Jul '18

14 Jul '18

>From 8aded81852666b591624001ec02aa4dc0d8f4cfb Mon Sep 17 00:00:00 2001 From: Sam Ravnborg <sam(a)ravnborg.org> Date: Sat, 14 Jul 2018 22:17:18 +0200 Subject: [PATCH 1/1] atmel_lcdfb: support native-mode display-timings When a device tree set a display-timing using native-mode then according to the bindings doc this should: native-mode: The native mode for the display, in case multiple modes are provided. When omitted, assume the first node is the native. The atmel_lcdfb used the last timing subnode and did not respect the timing mode specified with native-mode. Introduce use of of_get_videomode() which allowed a nice simplification of the code while also added support for native-mode. As a nice side-effect this fixes a memory leak where the data used for timings and the display_np was not freed. Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> Cc: Nicolas Ferre <nicolas.ferre(a)microchip.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Cc: Alexandre Belloni <alexandre.belloni(a)bootlin.com> --- Tested on a proprietary board utilizing an at91sam9263. Problem was found because I uses the bootloader to set the native-mode depending on the mounted display. Please note - I may have missed some magic around selecting the correct videomode. The patch was to some extend based on what was done in the mxsfb driver. I am away a few days after sunday, but decided to send out the patch in order to collect potential review feedback. Sam drivers/video/fbdev/atmel_lcdfb.c | 43 ++++++++------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c index 076d24afbd72..4ed55e6bbb84 100644 --- a/drivers/video/fbdev/atmel_lcdfb.c +++ b/drivers/video/fbdev/atmel_lcdfb.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <video/of_videomode.h> #include <video/of_display_timing.h> #include <linux/regulator/consumer.h> #include <video/videomode.h> @@ -1028,11 +1029,11 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) struct device *dev = &sinfo->pdev->dev; struct device_node *np =dev->of_node; struct device_node *display_np; - struct device_node *timings_np; - struct display_timings *timings; struct atmel_lcdfb_power_ctrl_gpio *og; bool is_gpio_power = false; + struct fb_videomode fb_vm; struct gpio_desc *gpiod; + struct videomode vm; int ret = -ENOENT; int i; @@ -1105,44 +1106,18 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) pdata->lcdcon_is_backlight = of_property_read_bool(display_np, "atmel,lcdcon-backlight"); pdata->lcdcon_pol_negative = of_property_read_bool(display_np, "atmel,lcdcon-backlight-inverted"); - timings = of_get_display_timings(display_np); - if (!timings) { - dev_err(dev, "failed to get display timings\n"); - ret = -EINVAL; + ret = of_get_videomode(display_np, &vm, OF_USE_NATIVE_MODE); + if (ret) { + dev_err(dev, "failed to get videomode from DT\n"); goto put_display_node; } - timings_np = of_get_child_by_name(display_np, "display-timings"); - if (!timings_np) { - dev_err(dev, "failed to find display-timings node\n"); - ret = -ENODEV; + ret = fb_videomode_from_videomode(&vm, &fb_vm); + if (ret < 0) goto put_display_node; - } - for (i = 0; i < of_get_child_count(timings_np); i++) { - struct videomode vm; - struct fb_videomode fb_vm; - - ret = videomode_from_timings(timings, &vm, i); - if (ret < 0) - goto put_timings_node; - ret = fb_videomode_from_videomode(&vm, &fb_vm); - if (ret < 0) - goto put_timings_node; - - fb_add_videomode(&fb_vm, &info->modelist); - } - - /* - * FIXME: Make sure we are not referencing any fields in display_np - * and timings_np and drop our references to them before returning to - * avoid leaking the nodes on probe deferral and driver unbind. - */ - - return 0; + fb_add_videomode(&fb_vm, &info->modelist); -put_timings_node: - of_node_put(timings_np); put_display_node: of_node_put(display_np); return ret; -- 2.12.0

1 0

[radeon-alex:drm-next-4.19-wip 93/102] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:1854:9: warning: missing braces around initializer
by kbuild test robot 13 Jul '18

13 Jul '18

tree: git://people.freedesktop.org/~agd5f/linux.git drm-next-4.19-wip head: 638d758f0bb28342123d87dbd8a4190a55e74771 commit: 522e6b434a61f8be910560969386a2b3ce113c1b [93/102] drm/amd/display: Initialize data structure for DalMpVisualConfirm. config: x86_64-randconfig-g0-07132339 (attached as .config) compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 reproduce: git checkout 522e6b434a61f8be910560969386a2b3ce113c1b # save the attached .config to linux build tree make ARCH=x86_64 All warnings (new ones prefixed by >>): drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c: In function 'dcn10_update_mpcc': >> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:1854:9: warning: missing braces around initializer [-Wmissing-braces] struct mpcc_blnd_cfg blnd_cfg = {0}; ^ drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:1854:9: warning: (near initialization for 'blnd_cfg.black_color') [-Wmissing-braces] Cyclomatic Complexity 3 include/linux/string.h:memset Cyclomatic Complexity 4 include/linux/string.h:memcmp Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_from_int Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_neg Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_abs Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_lt Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_floor Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:dm_read_reg_func Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:dm_write_reg_func Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:bios_golden_init Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:false_optc_underflow_wa Cyclomatic Complexity 8 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:patch_address_for_sbs_tb_stereo Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_update_plane_addr Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:program_gamut_remap Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:program_csc_matrix Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_program_output_csc Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:is_lower_pipe_tree_visible Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:is_upper_pipe_tree_visible Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:is_pipe_tree_visible Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_get_surface_visual_confirm_color Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:update_scaler Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:find_top_pipe_for_stream Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:set_drr Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:get_position Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:set_static_screen_control Cyclomatic Complexity 7 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_config_stereo_parameters Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_setup_stereo Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_dummy_display_power_gating Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_update_pending_status Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_set_cursor_position Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_set_cursor_attribute Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:log_mpc_crc Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_sub Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:get_hubp_by_inst Cyclomatic Complexity 19 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_hw_wa_force_recovery Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/include/fixed31_32.h:dc_fixpt_mul_int Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:fixed_point_to_int_frac Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:enable_power_gating_plane Cyclomatic Complexity 10 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:hubp_pg_control Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:undo_DEGVIDCN10_253_wa Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:apply_DEGVIDCN10_253_wa Cyclomatic Complexity 10 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dpp_pg_control Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:power_on_plane Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:plane_atomic_power_down Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:plane_atomic_disable Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_disable_plane Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:mmhub_read_vm_system_aperture_settings Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:mmhub_read_vm_context0_settings Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_program_pte_vm Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:disable_vga Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:set_hdr_multiplier Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_pplib_apply_display_requirements Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:ready_shared_resources Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:optimize_shared_resources Cyclomatic Complexity 8 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_blank_pixel_data Cyclomatic Complexity 9 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_enable_stream_timing Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:wait_for_reset_trigger_to_occur Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_enable_per_frame_crtc_position_reset Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_enable_timing_synchronization Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_set_output_transfer_func Cyclomatic Complexity 12 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_set_input_transfer_func Cyclomatic Complexity 3 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_update_dchub Cyclomatic Complexity 9 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:reset_back_end_for_pipe Cyclomatic Complexity 7 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:reset_hw_ctx_wrap Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:print_microsec Cyclomatic Complexity 13 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_log_hubp_states Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_log_hubbub_state Cyclomatic Complexity 21 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_log_hw_state Cyclomatic Complexity 7 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_verify_allow_pstate_change_high Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:hwss1_plane_atomic_disconnect Cyclomatic Complexity 19 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_init_hw Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_enable_plane Cyclomatic Complexity 6 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_wait_for_mpcc_disconnect Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_set_bandwidth Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_pipe_control_lock Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:is_rgb_cspace Cyclomatic Complexity 11 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_update_mpcc Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:build_prescale_params Cyclomatic Complexity 2 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:update_dpp Cyclomatic Complexity 12 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:update_dchubp_dpp Cyclomatic Complexity 4 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_program_pipe Cyclomatic Complexity 5 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:program_all_pipe_in_tree Cyclomatic Complexity 17 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_apply_ctx_for_surface Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:dcn10_hw_sequencer_construct Cyclomatic Complexity 1 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c:_GLOBAL__sub_I_65535_0_print_microsec vim +1854 drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.c 1850 1851 static void dcn10_update_mpcc(struct dc *dc, struct pipe_ctx *pipe_ctx) 1852 { 1853 struct hubp *hubp = pipe_ctx->plane_res.hubp; > 1854 struct mpcc_blnd_cfg blnd_cfg = {0}; 1855 bool per_pixel_alpha = pipe_ctx->plane_state->per_pixel_alpha && pipe_ctx->bottom_pipe; 1856 int mpcc_id; 1857 struct mpcc *new_mpcc; 1858 struct mpc *mpc = dc->res_pool->mpc; 1859 struct mpc_tree *mpc_tree_params = &(pipe_ctx->stream_res.opp->mpc_tree_params); 1860 1861 1862 1863 /* TODO: proper fix once fpga works */ 1864 1865 if (dc->debug.surface_visual_confirm) 1866 dcn10_get_surface_visual_confirm_color( 1867 pipe_ctx, &blnd_cfg.black_color); 1868 else 1869 color_space_to_black_color( 1870 dc, pipe_ctx->stream->output_color_space, 1871 &blnd_cfg.black_color); 1872 1873 if (per_pixel_alpha) 1874 blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA; 1875 else 1876 blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_GLOBAL_ALPHA; 1877 1878 blnd_cfg.overlap_only = false; 1879 blnd_cfg.global_alpha = 0xff; 1880 blnd_cfg.global_gain = 0xff; 1881 1882 /* DCN1.0 has output CM before MPC which seems to screw with 1883 * pre-multiplied alpha. 1884 */ 1885 blnd_cfg.pre_multiplied_alpha = is_rgb_cspace( 1886 pipe_ctx->stream->output_color_space) 1887 && per_pixel_alpha; 1888 1889 1890 /* 1891 * TODO: remove hack 1892 * Note: currently there is a bug in init_hw such that 1893 * on resume from hibernate, BIOS sets up MPCC0, and 1894 * we do mpcc_remove but the mpcc cannot go to idle 1895 * after remove. This cause us to pick mpcc1 here, 1896 * which causes a pstate hang for yet unknown reason. 1897 */ 1898 mpcc_id = hubp->inst; 1899 1900 /* If there is no full update, don't need to touch MPC tree*/ 1901 if (!pipe_ctx->plane_state->update_flags.bits.full_update) { 1902 mpc->funcs->update_blending(mpc, &blnd_cfg, mpcc_id); 1903 return; 1904 } 1905 1906 /* check if this MPCC is already being used */ 1907 new_mpcc = mpc->funcs->get_mpcc_for_dpp(mpc_tree_params, mpcc_id); 1908 /* remove MPCC if being used */ 1909 if (new_mpcc != NULL) 1910 mpc->funcs->remove_mpcc(mpc, mpc_tree_params, new_mpcc); 1911 else 1912 if (dc->debug.sanity_checks) 1913 mpc->funcs->assert_mpcc_idle_before_connect( 1914 dc->res_pool->mpc, mpcc_id); 1915 1916 /* Call MPC to insert new plane */ 1917 new_mpcc = mpc->funcs->insert_plane(dc->res_pool->mpc, 1918 mpc_tree_params, 1919 &blnd_cfg, 1920 NULL, 1921 NULL, 1922 hubp->inst, 1923 mpcc_id); 1924 1925 ASSERT(new_mpcc != NULL); 1926 1927 hubp->opp_id = pipe_ctx->stream_res.opp->inst; 1928 hubp->mpcc_id = mpcc_id; 1929 } 1930 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

BUG: mode_fixup() documentation misleading?
by Russell King - ARM Linux 13 Jul '18

13 Jul '18

The mode fixup code has a nice, logical explanation of what it should do, but unfortunately it doesn't reflect reality. For bridges: * @mode_fixup: * * This callback is used to validate and adjust a mode. The paramater * mode is the display mode that should be fed to the next element in * the display chain, either the final &drm_connector or the next * &drm_bridge. The parameter adjusted_mode is the input mode the bridge * requires. It can be modified by this callback and does not need to * match mode. See also &drm_crtc_state.adjusted_mode for more details. but the bridge code actually does: bool drm_bridge_mode_fixup(struct drm_bridge *bridge, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { ... if (bridge->funcs->mode_fixup) ret = bridge->funcs->mode_fixup(bridge, mode, adjusted_mode); ret = ret && drm_bridge_mode_fixup(bridge->next, mode, adjusted_mode); } which means 'mode' and 'adjusted_mode' parameters are the same for each bridge in the chain. Moreover, the encoder doc says similar: * @mode_fixup: * * This callback is used to validate and adjust a mode. The parameter * mode is the display mode that should be fed to the next element in * the display chain, either the final &drm_connector or a &drm_bridge. * The parameter adjusted_mode is the input mode the encoder requires. but the code in mode_fixup() in the atomic helper does: ret = drm_bridge_mode_fixup(encoder->bridge, &new_crtc_state->mode, &new_crtc_state->adjusted_mode); ... ret = funcs->mode_fixup(encoder, &new_crtc_state->mode, &new_crtc_state->adjusted_mode); In other words, 'mode' is _always_ the requested mode, and 'adjusted_mode' is the currently adjusted mode in fixup order. Now, as to the fixup order, it is not as these comments suggest. The first to be called is the bridge allegedly attached to the output of the encoder. Then the bridge attached to the first bridge, etc. Finally, the encoder gets called. So the order for a whole chain is: crtc -> encoder -> bridge 1 -> bridge 2 -> bridge 3 -> connector 5 4 1 2 3 What this means is that bridge 1 gets first dibs on applying adjustments to 'adjusted_mode', then bridge 2, then bridge 3, then the encoder, and finally the crtc... which is quite an odd ordering. I don't have a real issue here, just an observation that the comments do not match the code. Someone who knows how this is supposed to work may wish to consider either fixing the code to do what the comments say, or fixing the comments to reflect what the code actually does. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 13.8Mbps down 630kbps up According to speedtest.net: 13Mbps down 490kbps up

1 0

[PULL] drm-intel-next
by Rodrigo Vivi 13 Jul '18

13 Jul '18

Hi Dave, This is probably the last pull request for 4.19 from our side. Please remind about the gvt-fixes vs gvt-next conflict that I mentioned yesterday on drm-intel-fixes pull request. Here goes drm-intel-next-2018-07-12: On GVT there's the addition of vGPU huge page support for guest, with one BXT fix and gvt dependency handling. On Display side there's: - More PSR clean up and fixes (Rodrigo, DK and Tarun) - GMBUS improvements for HDCP2.2 compliance (Ram) - Fix strncpy truncation on intel_tv (Dominique) - Cleanup modesetting on load-error path (Chris) On GEM side: - Gem init hw fix (Michal) - More selftests fixes (Michal, Chris) - Execlists optimizations (Chris) - Introduce i915_address_space.mutex (Chris) - Stolen memory support for Ice Lake (Paulo) - Unwind HW init after GVT setup failure (Chris) - Other fixes for gpu parking, gem_suspend, and handcheck reset (Chris) drm-intel-next-2018-07-09: Higlights here goes to many PSR fixes and improvements; to the Ice lake work with power well support and begin of DSI support addition. Also there were many improvements on execlists and interrupts for minimal latency on command submission; and many fixes on selftests, mostly caught by our CI. General driver: - Clean-up on aux irq (Lucas) - Mark expected switch fall-through for dealing with static analysis tools (Gustavo) Gem: - Different fixes for GuC (Chris, Anusha, Michal) - Avoid self-relocation BIAS if no relocation (Chris) - Improve debugging cases in on EINVAL return and vma allocation (Chris) - Fixes and improvements on context destroying and freeing (Chris) - Wait for engines to idle before retiring (Chris) - Many improvements on execlists and interrupts for minimal latency on command submission (Chris) - Many fixes in selftests, specially on cases highlighted on CI (Chris) - Other fixes and improvements around GGTT (Chris) - Prevent background reaping of active objects (Chris) Display: - Parallel modeset cleanup to fix driver reset (Chris) - Get AUX power domain for DP main link (Imre) - Clean-up on PSR unused func pointers (Rodrigo) - Many PSR/PSR2 fixes and improvements (DK, Jose, Tarun) - Add a PSR1 live status (Vathsala) - Replace old drm_*_{un/reference} with put,get functions (Thomas) - FBC fixes (Maarten) - Abstract and document the usage of picking macros (Jani) - Remove unnecessary check for unsupported modifiers for NV12. (DK) - Interrupt fixes for display (Ville) - Clean up on sdvo code (Ville) - Clean up on current DSI code (Jani) - Remove support for legacy debugfs crc interface (Maarten) - Simplify get_encoder_power_domains (Imre) Icelake: - MG PLL fixes (Imre) - Add hw workaround for alpha blending (Vandita) - Add power well support (Imre) - Add Interrupt Support (Anusha) - Start to add support for DSI on Ice Lake (Madhav) Thanks, Rodrigo. The following changes since commit e1cacec9d50d7299893eeab2d895189f3db625da: drm/i915: Update DRIVER_DATE to 20180620 (2018-06-20 14:10:48 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2018-07-12 for you to fetch changes up to f7cf1a1829f9ff776fb5504c9c5ffa0e9d2baf79: drm/i915: Update DRIVER_DATE to 20180712 (2018-07-12 23:54:26 -0700) ---------------------------------------------------------------- On GVT there's the addition of vGPU huge page support for guest, with one BXT fix and gvt dependency handling. On Display side there's: - More PSR clean up and fixes (Rodrigo, DK and Tarun) - GMBUS improvements for HDCP2.2 compliance (Ram) - Fix strncpy truncation on intel_tv (Dominique) - Cleanup modesetting on load-error path (Chris) On GEM side: - Gem init hw fix (Michal) - More selftests fixes (Michal, Chris) - Execlists optimizations (Chris) - Introduce i915_address_space.mutex (Chris) - Stolen memory support for Ice Lake (Paulo) - Unwind HW init after GVT setup failure (Chris) - Other fixes for gpu parking, gem_suspend, and handcheck reset (Chris) ---------------------------------------------------------------- Anusha Srivatsa (2): drm/i915/guc: Remove USES_GUC_SUBMISSION for ads programming drm/i915/icp: Add Interrupt Support Changbin Du (14): drm/i915/gvt: Add new 64K entry type drm/i915/gvt: Add PTE IPS bit operations drm/i915/gvt: Handle MMIO GEN8_GAMW_ECO_DEV_RW_IA for 64K GTT drm/i915/gvt: Detect 64K gtt entry by IPS bit of PDE drm/i915/gvt: Add software PTE flag to mark special 64K splited entry drm/i915/gvt: Add GTT clear_pse operation drm/i915/gvt: Split ppgtt_alloc_spt into two parts drm/i915/gvt: Make PTE iterator 64K entry aware drm/i915/gvt: Add 64K huge gtt support drm/i915/kvmgt: Support setting dma map for huge pages drm/i915/gvt: Add 2M huge gtt support drm/i915/gvt: Handle special sequence on PDE IPS bit drm/i915/gvt: Fix error handling in ppgtt_populate_spt_by_guest_entry drm/i915: Enable platform support for vGPU huge gtt pages Chris Wilson (78): drm/i915: Disable bh around call to tasklet drm/i915: Ignore applying the self-relocation BIAS if no relocations drm/i915: Redefine EINVAL for debugging drm/i915: Defer modeset cleanup to a secondary task drm/i915/execlists: Check for ce->state before destroy drm/i915: Context objects can never be active when freed drm/i915: Wait for engines to idle before retiring drm/i915: Show vma allocator stack when in doubt drm/i915: Reduce spinlock hold time during notify_ring() interrupt drm/i915: Only trigger missed-seqno checking next to boundary drm/i915: Move the irq_counter inside the spinlock drm/i915: Only signal from interrupt when requested drm/i915: Drop posting reads to flush master interrupts drm/i915/execlists: Pull submit after dequeue under timeline lock drm/i915/execlists: Pull CSB reset under the timeline.lock drm/i915/execlists: Process one CSB update at a time drm/i915/execlists: Unify CSB access pointers drm/i915/execlists: Reset CSB write pointer after reset drm/i915/execlists: Stop storing the CSB read pointer in the mmio register drm/i915/execlists: Trust the CSB drm/i915/execlists: Direct submission of new requests (avoid tasklet/ksoftirqd) drm/i915/selftests: Mark up write into scratch vma drm/i915/selftests: Attach the fence to the object when making busy drm/i915: Try GGTT mmapping whole object as partial drm/i915/selftests: Release the struct_mutex to free the objects drm/i915/selftests: Drop struct_mutex around lowlevel pggtt allocation drm/i915/gtt: Pull global wc page stash under its own locking drm/i915: Remove defunct i915->vm_list drm/i915/selftests: Use full release for local ppgtt allocation drm/i915/selftests: Replace open-coded i915_address_space_init() drm/i915/selftests: Fixup recursive MI_BB_START for gen3 drm/i915/selftests: Detect unknown swizzling correctly drm/i915/selftests: Fail hangcheck testing if the GPU is wedged drm/i915: Squelch very verbose error logging drm/i915/selftests: Destroy partial tiling vma after use drm/i915/selftests: Skip using the GPU if wedged drm/i915/selftests: Skip making an object busy if the GPU is wedged drm/i915/selftests: Skip all request selftests when wedged drm/i915/selftests: Skip workaround tests when wedged drm/i915/selftests: Skip live eviction tests when wedged drm/i915/selftests: Skip huge pages live tests if wedged drm/i915/selftests: Skip over live context testing when wedged drm/i915: Record logical context support in driver caps drm/i915/selftests: Skip live context execution test without logical contexts drm/i915/selftests: Skip live_execlists if the GPU is terminally wedged drm/i915: Flush the WCB following a WC write drm/i915/gtt: Suppress warnings for dma_map_page drm/i915/gtt: Control cache domain of dma_map_page() directly drm/i915/selftests: Limit live_gtt allocation test to fit within RAM drm/i915/selftests: Replace magic 1<<22 with MI_USE_GGTT/MI_MEM_VIRTUAL drm/i915/selftests: Fixup missing MI_MEM_VIRTUAL for live_hangcheck drm/i915: Refactor export_fence() after i915_vma_move_to_active() drm/i915: Export i915_request_skip() drm/i915: Start returning an error from i915_vma_move_to_active() drm/i915: Move i915_vma_move_to_active() to i915_vma.c drm/i915: Track vma activity per fence.context, not per engine drm/i915: Track the last-active inside the i915_vma drm/i915/selftests: Provide full mb() around clflush drm/i915/selftests: Avoid warning if runtime pm is disabled drm/i915: Replace nested subclassing with explicit subclasses drm/i915/selftests: Magic numbers for old Y-tiling drm/i915: Provide a timeout to i915_gem_wait_for_idle() drm/i915: Provide a timeout to i915_gem_wait_for_idle() on setup drm/i915/selftests: Replace wait-on-timeout with explicit timeout drm/i915/selftests: Prevent background reaping of active objects drm/i915: Remove function details from device error messages drm/i915/selftests: Constrain mock_gtt tests to fit within RAM drm/i915/selftests: Filter out both physical address swizzles drm/i915: Only reset hangcheck at the start of an activity cycle drm/i915: Tidy i915_gem_suspend() drm/i915: Flush the residual parking on emergency shutdown drm/i915: Cleanup modesetting on load-error path drm/i915: Unwind HW init after GVT setup failure drm/i915: Introduce i915_address_space.mutex drm/i915/selftests: Add a safety net to live_workarounds drm/i915/execlists: Switch to rb_root_cached drm/i915: Silence warning for no vlv powercontext drm/i915/guc: Skip cleaning up the doorbells on error-before-allocate Colin Xu (1): drm/i915/gvt: Handle EDP_PSR_IMR and EDP_PSR_IIR for BXT. Dhinakaran Pandiyan (4): drm/i915/psr: Fix race in intel_psr_work() drm/i915/psr: Warn for erroneous enabling of both PSR1 and PSR2. drm/i915: Remove unnecessary check for unsupported modifiers for NV12 drm/i915/psr: Split sink status into a separate debugfs node Dominique Martinet (1): drm/i915/tv: fix strncpy truncation warning Gustavo A. R. Silva (1): drm/i915: Mark expected switch fall-throughs Hang Yuan (1): drm/i915/gvt: declare gvt as i915's soft dependency Imre Deak (5): drm/i915/icl: Fix MG PLL setup when refclk is 38.4MHz drm/i915/icl: Do read-modify-write as needed during MG PLL programming drm/i915/ddi: Get AUX power domain for DP main link too drm/i915/icl: Add power well support drm/i915/ddi: Simplify get_encoder_power_domains() Jani Nikula (4): drm/i915: abstract and document register picking macros drm/i915/dsi: rename the current DSI files based on first platform drm/i915/dsi: use vlv and bxt prefixes for the global DSI functions drm/i915/dsi: update some of the platform based checks José Roberto de Souza (5): drm/i915/psr: Remove intel_crtc_state parameter from disable_source() drm/i915/psr: Begin to handle PSR/PSR2 errors set by sink drm/i915/psr: Handle PSR errors drm/i915/psr: Avoid PSR exit max time timeout drm/i915/psr: Enable CRC check in the static frame on the sink side Lucas De Marchi (1): drm/i915: remove check for aux irq Maarten Lankhorst (3): drm/i915: Block enabling FBC until flips have been completed drm/i915: Remove delayed FBC activation. drm/i915: Remove support for legacy debugfs crc interface Madhav Chauhan (7): drm/i915/icl: Define register for DSI PLL drm/i915/icl: Program DSI Escape clock Divider drm/i915/icl: Define DSI mode ctl register drm/i915/icl: Enable DSI IO power drm/i915/icl: Define PORT_CL_DW_10 register drm/i915/icl: Power down unused DSI lanes drm/i915/icl: Define AUX lane registers for Port A/B Michal Wajdeczko (3): drm/i915/guc: Use intel_guc_init_misc to hide GuC internals drm/i915/uc: Fetch GuC/HuC firmwares from guc/huc specific init drm/i915/guc: Print CTL params passed to Guc Michał Winiarski (2): drm/i915: Tidy error handling in i915_gem_init_hw drm/i915/selftests: Fixup GuC FW negative test Paulo Zanoni (2): x86/gpu: reserve ICL's graphics stolen memory drm/i915: use the ICL stolen memory Ramalingam C (2): drm/i915/gmbus: Increase the Bytes per Rd/Wr Op drm/i915/gmbus: Enable burst read Rodrigo Vivi (6): drm/i915/psr: Kill useless function pointers. drm/i915: Update DRIVER_DATE to 20180709 Merge tag 'gvt-next-2018-07-11' of https://github.com/intel/gvt-linux into drm-intel-next-queued drm/i915/psr: Remove useless function calls. drm/i915/psr: Remove few mod parameters option. drm/i915: Update DRIVER_DATE to 20180712 Tarun Vyas (3): drm/i915/psr: Lockless version of psr_wait_for_idle drm/i915: Wait for PSR exit before checking for vblank evasion drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update Thomas Zimmermann (5): drm/i915: Replace drm_connector_{un/reference} with put,get functions drm/i915: Replace drm_gem_object_{un/reference} with {put,get} functions drm/i915: Replace __drm_gem_object_unreference with __drm_gem_object_put drm/i915: Replace drm_gem_object_unreference_unlocked with put function drm/i915: Replace drm_dev_unref with drm_dev_put Vandita Kulkarni (1): drm/i915: Enable hw workaround to bypass alpha Vathsala Nagaraju (1): drm/i915/psr: Add psr1 live status Ville Syrjälä (4): drm/i915: Fix hotplug irq ack on i965/g4x drm/i915: Fix pre-ILK error interrupt ack drm/i915: Unmask and enable master error interrupt on gen2/3 drm/i915: Remove pointless if-else from sdvo code arch/x86/kernel/early-quirks.c | 18 + drivers/gpu/drm/i915/Kconfig.debug | 12 + drivers/gpu/drm/i915/Makefile | 7 +- drivers/gpu/drm/i915/gvt/gtt.c | 423 +++++++++++++--- drivers/gpu/drm/i915/gvt/gtt.h | 9 + drivers/gpu/drm/i915/gvt/gvt.c | 4 + drivers/gpu/drm/i915/gvt/handlers.c | 39 +- drivers/gpu/drm/i915/gvt/hypercall.h | 2 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 126 +++-- drivers/gpu/drm/i915/gvt/mpt.h | 7 +- drivers/gpu/drm/i915/gvt/scheduler.c | 6 +- drivers/gpu/drm/i915/gvt/vgpu.c | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 139 +++--- drivers/gpu/drm/i915/i915_drv.c | 31 +- drivers/gpu/drm/i915/i915_drv.h | 54 +- drivers/gpu/drm/i915/i915_gem.c | 190 +++---- drivers/gpu/drm/i915/i915_gem.h | 5 + drivers/gpu/drm/i915/i915_gem_context.c | 8 +- drivers/gpu/drm/i915/i915_gem_evict.c | 3 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 95 +--- drivers/gpu/drm/i915/i915_gem_gtt.c | 238 +++++---- drivers/gpu/drm/i915/i915_gem_gtt.h | 13 +- drivers/gpu/drm/i915/i915_gem_object.h | 13 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 23 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 39 +- drivers/gpu/drm/i915/i915_gpu_error.c | 14 +- drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- drivers/gpu/drm/i915/i915_irq.c | 418 ++++++++++++---- drivers/gpu/drm/i915/i915_params.c | 2 +- drivers/gpu/drm/i915/i915_perf.c | 4 +- drivers/gpu/drm/i915/i915_reg.h | 241 ++++++++- drivers/gpu/drm/i915/i915_request.c | 35 +- drivers/gpu/drm/i915/i915_request.h | 3 + drivers/gpu/drm/i915/i915_timeline.h | 2 + drivers/gpu/drm/i915/i915_vma.c | 258 ++++++++-- drivers/gpu/drm/i915/i915_vma.h | 43 +- drivers/gpu/drm/i915/icl_dsi.c | 127 +++++ drivers/gpu/drm/i915/intel_breadcrumbs.c | 11 +- drivers/gpu/drm/i915/intel_cdclk.c | 5 + drivers/gpu/drm/i915/intel_ddi.c | 54 +- drivers/gpu/drm/i915/intel_device_info.c | 2 + drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_display.c | 72 ++- drivers/gpu/drm/i915/intel_display.h | 4 + drivers/gpu/drm/i915/intel_dp.c | 31 +- drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 109 +++- drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 + drivers/gpu/drm/i915/intel_drv.h | 13 +- drivers/gpu/drm/i915/intel_dsi.h | 34 +- drivers/gpu/drm/i915/intel_dsi_vbt.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 41 +- drivers/gpu/drm/i915/intel_fbc.c | 129 +---- drivers/gpu/drm/i915/intel_guc.c | 53 +- drivers/gpu/drm/i915/intel_guc.h | 5 +- drivers/gpu/drm/i915/intel_guc_submission.c | 20 +- drivers/gpu/drm/i915/intel_gvt.c | 3 + drivers/gpu/drm/i915/intel_huc.c | 8 + drivers/gpu/drm/i915/intel_huc.h | 6 + drivers/gpu/drm/i915/intel_i2c.c | 70 ++- drivers/gpu/drm/i915/intel_lrc.c | 548 ++++++++++----------- drivers/gpu/drm/i915/intel_pipe_crc.c | 445 ----------------- drivers/gpu/drm/i915/intel_pm.c | 8 +- drivers/gpu/drm/i915/intel_psr.c | 238 +++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 9 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 45 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 331 ++++++++++++- drivers/gpu/drm/i915/intel_sdvo.c | 11 +- drivers/gpu/drm/i915/intel_sprite.c | 20 +- drivers/gpu/drm/i915/intel_tv.c | 3 +- drivers/gpu/drm/i915/intel_uc.c | 34 +- drivers/gpu/drm/i915/selftests/huge_pages.c | 24 +- .../gpu/drm/i915/selftests/i915_gem_coherency.c | 43 +- drivers/gpu/drm/i915/selftests/i915_gem_context.c | 38 +- drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 5 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 66 ++- drivers/gpu/drm/i915/selftests/i915_gem_object.c | 56 ++- drivers/gpu/drm/i915/selftests/i915_request.c | 23 +- drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- drivers/gpu/drm/i915/selftests/igt_flush_test.c | 55 +-- drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 +++ drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 2 +- drivers/gpu/drm/i915/selftests/intel_guc.c | 10 +- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 20 +- drivers/gpu/drm/i915/selftests/intel_lrc.c | 14 +- drivers/gpu/drm/i915/selftests/intel_workarounds.c | 20 +- drivers/gpu/drm/i915/selftests/mock_engine.c | 2 + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +- drivers/gpu/drm/i915/selftests/mock_gtt.c | 11 +- drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} | 109 ++-- .../drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} | 98 +--- include/drm/i915_drm.h | 4 +- 94 files changed, 3588 insertions(+), 2102 deletions(-) create mode 100644 drivers/gpu/drm/i915/icl_dsi.c create mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h rename drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (97%) rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (84%)

1 0

[PATCH] drm/udl: Replace drm_dev_unref with drm_dev_put
by Thomas Zimmermann 13 Jul '18

13 Jul '18

This patch unifies the naming of DRM functions for reference counting of struct drm_device. The resulting code is more aligned with the rest of the Linux kernel interfaces. Signed-off-by: Thomas Zimmermann <tzimmermann(a)suse.de> --- drivers/gpu/drm/udl/udl_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 9ef515df724b..a63e3011e971 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c @@ -94,7 +94,7 @@ static int udl_usb_probe(struct usb_interface *interface, return 0; err_free: - drm_dev_unref(dev); + drm_dev_put(dev); return r; } -- 2.18.0

1 0

[PATCH] drm/msm: rework vblank event handling in dpu_crtc
by Rajesh Yadav 13 Jul '18

13 Jul '18

The vblank on/off calls were missing in dpu_crtc leading to "driver forgot to call drm_crtc_vblank_off()" warning while entering suspend state. Also handle the state update completion event for a crtc being disabled in current atomic commit. This patch depends on https://www.spinics.net/lists/dri-devel/msg182402.html Signed-off-by: Rajesh Yadav <ryadav(a)codeaurora.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index d171282..24715e4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1617,6 +1617,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) struct drm_encoder *encoder; struct msm_drm_private *priv; int ret; + unsigned long flags; if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) { DPU_ERROR("invalid crtc\n"); @@ -1632,6 +1633,9 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) if (dpu_kms_is_suspend_state(crtc->dev)) _dpu_crtc_set_suspend(crtc, true); + /* Disable/save vblank irq handling */ + drm_crtc_vblank_off(crtc); + mutex_lock(&dpu_crtc->crtc_lock); /* wait for frame_event_done completion */ @@ -1669,7 +1673,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) dpu_power_handle_unregister_event(dpu_crtc->phandle, dpu_crtc->power_event); - memset(dpu_crtc->mixers, 0, sizeof(dpu_crtc->mixers)); dpu_crtc->num_mixers = 0; dpu_crtc->mixers_swapped = false; @@ -1679,6 +1682,13 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) cstate->bw_split_vote = false; mutex_unlock(&dpu_crtc->crtc_lock); + + if (crtc->state->event && !crtc->state->active) { + spin_lock_irqsave(&crtc->dev->event_lock, flags); + drm_crtc_send_vblank_event(crtc, crtc->state->event); + crtc->state->event = NULL; + spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + } } static void dpu_crtc_enable(struct drm_crtc *crtc, @@ -1718,6 +1728,9 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, mutex_unlock(&dpu_crtc->crtc_lock); + /* Enable/restore vblank irq handling */ + drm_crtc_vblank_on(crtc); + dpu_crtc->power_event = dpu_power_handle_register_event( dpu_crtc->phandle, DPU_POWER_EVENT_POST_ENABLE | DPU_POWER_EVENT_POST_DISABLE | -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

2 1

[pull] amdgpu drm-fixes-4.18
by Alex Deucher 13 Jul '18

13 Jul '18

Hi Dave, A few more fixes for 4.18. Two display fixes and a fix to avoid a segfault if the GPU does not power up properly on resume. These are on top of my pull from earlier this week. The following changes since commit 9d4a0d4cdc8b5904ec7c9b9e04bab3e9e60d7a74: drm/amdgpu: Verify root PD is mapped into kernel address space (v4) (2018-07-10 15:36:22 -0500) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-4.18 for you to fetch changes up to 02ce6ce2e1d07e31e8314c761a2caa087ea094ce: drm/amdgpu/pp/smu7: use a local variable for toc indexing (2018-07-13 11:42:45 -0500) ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/pp/smu7: use a local variable for toc indexing David Francis (1): amd/dc/dce100: On dce100, set clocks to 0 on suspend Harry Wentland (1): drm/amd/display: Convert 10kHz clks from PPLib into kHz for Vega .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 5 +++-- .../drm/amd/display/dc/dce100/dce100_resource.c | 19 +++++++++++++++--- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 23 +++++++++++----------- 3 files changed, 31 insertions(+), 16 deletions(-)

1 0

[PATCH v2 0/2] drm/nouveau: Fix connector memory corruption issues
by Lyude Paul 13 Jul '18

13 Jul '18

This fixes some nasty issues I found in nouveau that were being caused looping through connectors using racy legacy methods, along with some caused by making incorrect assumptions about the drm_connector structs in nouveau's connector list. Most of these memory corruption issues could be reproduced by using an MST hub with nouveau. Next version of https://patchwork.freedesktop.org/series/46498/ Lyude Paul (2): drm/nouveau: Use drm_connector_list_iter_* for iterating connectors drm/nouveau: Avoid looping through fake MST connectors drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 ++-- drivers/gpu/drm/nouveau/nouveau_connector.c | 9 ++++-- drivers/gpu/drm/nouveau/nouveau_connector.h | 36 ++++++++++++++++++--- drivers/gpu/drm/nouveau/nouveau_display.c | 10 ++++-- 4 files changed, 51 insertions(+), 10 deletions(-) -- 2.17.1

1 2

[PATCH 0/2] drm/nouveau: Fix connector memory corruption issues
by Lyude Paul 13 Jul '18

13 Jul '18

This fixes some nasty issues I found in nouveau that were being caused looping through connectors using racy legacy methods, along with some caused by making incorrect assumptions about the drm_connector structs in nouveau's connector list. Most of these memory corruption issues could be reproduced by using an MST hub with nouveau. Cc: Karol Herbst <karolherbst(a)gmail.com> Cc: stable(a)vger.kernel.org Lyude Paul (2): drm/nouveau: Use drm_connector_list_iter_* for iterating ues connectors drm/nouveau: Avoid looping through fake MST connectors drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 ++-- drivers/gpu/drm/nouveau/nouveau_connector.c | 9 ++++-- drivers/gpu/drm/nouveau/nouveau_connector.h | 36 ++++++++++++++++++--- drivers/gpu/drm/nouveau/nouveau_display.c | 10 ++++-- 4 files changed, 51 insertions(+), 10 deletions(-) -- 2.17.1

2 3

[PATCH 00/15] bunch of kerneldocs polish and related cleanup
by Daniel Vetter 13 Jul '18

13 Jul '18

Hi all, For anything somewhat complicated the in-line kerneldoc comments for struct members are much, much better. But we still have plenty of old-style stuff around, tricking people into writing way too short docs that don't explain stuff. This series moves drm_connector|crtc|plane(_state) over to inline comments comopletely. Plus some related cleanups. Review and comments very much welcome! Cheers, Daniel Daniel Vetter (15): drm: move drv test macros out of drmP.h drm: Drop drmP.h from drm_connector.c drm/doc: switch drm_connector_state to inline comments drm/doc: polish for sturct drm_connector drm: drop _mode_ from update_edit_property() drm: drop _mode_ from drm_mode_connector_attach_encoder drm: drop _mode_ from remaining connector functions drm: Switch drm_plane_state to inline kerneldoc style drm: switch drm_plane to inline comments drm: drop drmP.h include from drm_plane.c drm/doc: move struct drm_crtc to in-line comments drm/doc: Group the fb gem helpers better drm/doc: Includ drm_of.c helpers drm/doc: use inline kerneldoc style for drm_crtc_state drm: drop drmP.h include from drm_crtc.c Documentation/gpu/drm-kms-helpers.rst | 17 +- Documentation/gpu/drm-kms.rst | 13 +- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +- drivers/gpu/drm/arc/arcpgu_sim.c | 2 +- drivers/gpu/drm/ast/ast_mode.c | 6 +- drivers/gpu/drm/bochs/bochs_kms.c | 2 +- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +- drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +- .../drm/bridge/analogix/analogix_dp_core.c | 6 +- drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 +- .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +- drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +- drivers/gpu/drm/bridge/panel.c | 2 +- drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- drivers/gpu/drm/bridge/sii902x.c | 4 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +- drivers/gpu/drm/bridge/tc358767.c | 4 +- drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_connector.c | 60 +++-- drivers/gpu/drm/drm_crtc.c | 5 +- drivers/gpu/drm/drm_crtc_internal.h | 14 +- drivers/gpu/drm/drm_debugfs.c | 4 +- drivers/gpu/drm/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/drm_internal.h | 5 + drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/drm_mode_object.c | 3 +- drivers/gpu/drm/drm_modes.c | 6 +- drivers/gpu/drm/drm_of.c | 9 +- drivers/gpu/drm/drm_plane.c | 11 +- drivers/gpu/drm/drm_probe_helper.c | 6 +- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/drm_writeback.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +- drivers/gpu/drm/gma500/gma_display.c | 2 +- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +- drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 3 +- drivers/gpu/drm/i915/intel_dp.c | 6 +- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_modes.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 5 +- drivers/gpu/drm/imx/imx-tve.c | 4 +- drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- .../drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +- drivers/gpu/drm/msm/edp/edp_connector.c | 4 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +- drivers/gpu/drm/omapdrm/omap_connector.c | 4 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 6 +- drivers/gpu/drm/radeon/radeon_encoders.c | 2 +- drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 2 +- drivers/gpu/drm/sti/sti_hda.c | 2 +- drivers/gpu/drm/sti/sti_hdmi.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- drivers/gpu/drm/tegra/dsi.c | 2 +- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/output.c | 2 +- drivers/gpu/drm/tegra/rgb.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 4 +- drivers/gpu/drm/udl/udl_connector.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +- drivers/gpu/drm/vc4/vc4_vec.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- drivers/gpu/drm/vkms/vkms_output.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- drivers/gpu/drm/zte/zx_hdmi.c | 4 +- drivers/gpu/drm/zte/zx_tvenc.c | 2 +- drivers/gpu/drm/zte/zx_vga.c | 4 +- drivers/staging/vboxvideo/vbox_mode.c | 4 +- include/drm/drmP.h | 19 -- include/drm/drm_color_mgmt.h | 1 + include/drm/drm_connector.h | 221 ++++++++++------ include/drm/drm_crtc.h | 240 ++++++++++++++---- include/drm/drm_drv.h | 29 +++ include/drm/drm_modes.h | 2 +- include/drm/drm_modeset_helper_vtables.h | 2 +- include/drm/drm_plane.h | 176 +++++++++---- include/drm/drm_property.h | 2 + 126 files changed, 742 insertions(+), 434 deletions(-) -- 2.18.0

4 32

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2018