aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
| * | drm/amdgpu: remove amdgpu_ring_from_fenceChristian König2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | Not used any more. Signed-off-by: Christian König <christian.koenig@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amdgpu: stop using the ring index in the SAChristian König2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ring index will always collide as hash into the fence list, so use the context number instead. That can still cause collisions, but they are less likely than using ring indices. Signed-off-by: Christian König <christian.koenig@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amdgpu: stop waiting on UVD messages before mapping themChristian König2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | amdgpu_bo_kmap() now always waits for moves to finish. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amdgpu: always wait before kmap a BOChristian König2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a BO is currently moving we otherwise would blindly access the new location without checking. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: refactor SI tiling table initializationJosh Poimboeuf2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | Simplify the control flow of si_tiling_mode_table_init() similar to how it was done in gfx_v7_0.c and gfx_v8_0.c. Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: refactor CIK tiling table initializationJosh Poimboeuf2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the control flow of cik_tiling_mode_table_init() similar to how it was done in gfx_v7_0.c and gfx_v8_0.c. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amdgpu: allow write access to mapped userptrsChristian König2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | With the updated MMU notifier we should also be able to handle the writeback case correctly. Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amd/powerplay: use pp_endian.h for TongaAlex Deucher2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | Drop local versions of these macros. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amd/powerplay: use pp_endian.h for FijiAlex Deucher2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | Drop local versions of these macros. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amd/powerplay: add a common pp endian headerAlex Deucher2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | To replace the duplicated versions of this in all asic variants. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/amd/powerplay: mv avfs status to smumgr.hrezhu2016-03-14
| | | | | | | | | | | | | | | Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: rework fbdev handling on chips with no connectorsAlex Deucher2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all the logic to radeon_fb.c and add checks to functions called frome elsewhere. bug: https://bugzilla.kernel.org/show_bug.cgi?id=112781 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
* | | drm/sti: restore mode_fixup callbackArnd Bergmann2016-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8a2fa38fddd3 removed the mode_fixup because it was empty, but 652353e6e561 modified it to call drm_mode_set_crtcinfo() instead. Both commits are correct, but the merge of the two kept the nonempty version without the reference to it, as shown by the gcc warning: drm/sti/sti_crtc.c:54:13: error: 'sti_crtc_mode_fixup' defined but not used This restores the callback pointer to fix the merge. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reverts: 8a2fa38fddd3 ("drm/sti: removed optional dummy crtc mode_fixup function.") Fixes: 652353e6e561 ("drm/sti: set CRTC modesetting parameters") Fixes: cf481068cdd4 ("Merge branch '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next") Acked-by: Vincent ABRIOU <vincent.abriou@st.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | | Merge branch '2016-02-26-st-drm-next' of ↵Dave Airlie2016-03-16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next Here are sti patches for drm-next. It brings: - The support of the atomic_check for the planes and minor fixes for planes - The support of the vendor specific infoframe for HDMI and the support of 2 HDMI properties related to the connector - The support of the DVO solving panel detection issue and timing issue. - The support of debugfs for connectors, encoders, crtcs and planes. * '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjamin.gaignard/kernel: (36 commits) drm/sti: use u32 to store DMA addresses drm: sti: remove sti_gem_prime_export hack drm/sti: add debugfs fps_show/fps_get mechanism for planes drm/sti: add debugfs entries for TVOUT encoders drm/sti: add debugfs entries for MIXER crtc drm/sti: add debugfs entries for VID plane drm/sti: add debugfs entries for HQVDP plane drm/sti: add debugfs entries for GDP planes drm/sti: add debugfs entries for CURSOR plane drm/sti: add debugfs entries for HDA connector drm/sti: add debugfs entries for DVO connector drm/sti: add debugfs entries for HDMI connector drm/sti: add hdmi_mode property for HDMI connector drm/sti: add colorspace property to the HDMI connector drm/sti: add HDMI vendor specific infoframe drm/sti: reset infoframe transmission when HDMI is stopped drm/sti: HDMI infoframe transmission mode not take into account drm/sti: reset HD DACS when HDA connector is created drm/sti: fix dvo data_enable signal drm/sti: adjust delay for DVO ...
| * | | drm/sti: use u32 to store DMA addressesArnd Bergmann2016-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The STi drm driver correctly warns about invalid format strings when built with 64-bit dma_addr_t: sti_hqvdp.c: In function 'sti_hqvdp_vtg_cb': sti_hqvdp.c:605:119: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] sti_hqvdp.c: In function 'sti_hqvdp_atomic_update': sti_hqvdp.c:931:118: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] This could be changed to using the %pad format string, but that does not work when printing an rvalue, so instead I'm changing the type in the sti_hqvdp structure to u32, which is what gets written into the registers anyway. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm: sti: remove sti_gem_prime_export hackBenjamin Gaignard2016-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to "drm: prime: Honour O_RDWR during prime-handle-to-fd" commit we don't need to hack flags anymore. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| * | | drm/sti: add debugfs fps_show/fps_get mechanism for planesVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display fps on demand for each used plane: cat /sys/kernel/debug/dri/0/fps_get Display fps in live in the console for each used plane: echo 255 > /sys/kernel/debug/dri/0/fps_show Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for TVOUT encodersVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for MIXER crtcVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for VID planeVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for HQVDP planeVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for GDP planesVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for CURSOR planeVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for HDA connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for DVO connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add debugfs entries for HDMI connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add hdmi_mode property for HDMI connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configures the framer of the HDMI connection. By default starts in HDMI mode and can be swtich to DVI. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add colorspace property to the HDMI connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the value of the colorspace of the HDMI infoframe configurable. HDMI colorspace could be: RGB, YUV422 or YUV444 Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: add HDMI vendor specific infoframeVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor specific infoframe is mandatory for 4K2K resolution. Without this, the HDMI protocol compliance fails. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: reset infoframe transmission when HDMI is stoppedVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear all infoframe registers when the HDMI link is stopped. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: HDMI infoframe transmission mode not take into accountVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the infoframe transmission mode according to the type of the infoframe. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: reset HD DACS when HDA connector is createdVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the HD DACS are disabled when the HDA connector is created. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: fix dvo data_enable signalBich Hemon2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify AWG algorithm in order to handle more than 1023 lines Signed-off-by: Bich Hemon <bich.hemon@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: adjust delay for DVOBich Hemon2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify delay to display last pixel column on DVO Signed-off-by: Bich Hemon <bich.hemon@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: add missing encoder cleanup for DVO connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: fix panel detection for DVO connectorVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DVO connector is tag as disconnect because of a wrong management of the panel detection. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: do not clip RGB/YUV component value at connector sideVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the clipping mode for hdmi, dvo and hda connectors. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: adapt YUV colorspace in display pipelineBich Hemon2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use BT601 for SD/ED resolution and BT709 for HD resolution Signed-off-by: Bich Hemon <bich.hemon@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: implement atomic_check for the planesVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Atomic update should never fail. Thus all checks must be done in the atomic_check function for each plane (gdp, hqvdp and cursor). Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: force cursor CLUT fetchFabien Dessenne2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may happen that the cursor is displayed with wrong colors which can be explained by a CLUT wrongly fetched at the first display. Fetching the CLUT at each commit (=move) ensures that the right colors are used, at least from the first cursor move. Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: GDP cropping fails when we remove 2 pixels horizontallyVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GDP source width should be equal to the destination width to get rid of this issue. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: fallback for GDP scalingBich Hemon2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a GDP gets a scale request (which it does not support), it accepts it but crops or clamps and outputs a warning message. Signed-off-by: Bich Hemon <bich.hemon@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: GDP planes only support RGB formatsBich Hemon2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only RGB formats supported by GDP planes Signed-off-by: Bich Hemon <bich.hemon@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: clarify the skip frame/field messageFabien Dessenne2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a frame or a field is skipped, output a Warning message instead of an Error message. Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: awg_utils code cleanupBich Hemon2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data_en is a local variable that doesn't need to be set as awg_generate_instr can be called directly with the requested value. Signed-off-by: Bich Hemon <bich.hemon@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: update VTG timing programmingVincent Abriou2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update eases to understand the VTG programming. It also sets a VTG output id for each supported connectors. Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
| * | | drm/sti: set DRIVER_ATOMIC for stibenjamin.gaignard@linaro.org2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sti now support of atomic modesetting so set the flag to enable it. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: fix cursor coordinatesbenjamin.gaignard@linaro.org2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix x/y typo while setting cursor coordinates Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: set CRTC modesetting parametersbenjamin.gaignard@linaro.org2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CRTC modesetting parameters to avoid warnings in atomic mode. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| * | | drm/sti: fix potential crash in gdpbenjamin.gaignard@linaro.org2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases last_close() could be called before sti_gdp_disable() and make kernel crash because mixer structure has been destroy. Let's gdp keep a reference on vtg to fix that (like it is already done in HQVDP) Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Vincent Abriou <vincent.abriou@st.com>