Skip to content

BCM270X_DT: Flip the polarity of the CM3's HDMI HPD. #1869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 8, 2017
Merged

BCM270X_DT: Flip the polarity of the CM3's HDMI HPD. #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a3a97
drm/vc4: Don't wait for vblank when updating the cursor
Electron752 Feb 24, 2017
7d19e0b
panel-raspberrypi-touchscreen: Round up clk rate to fix DSI panel.
anholt Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,12 @@ static const struct drm_display_mode rpi_touchscreen_modes[] = {
#define HBP 46
#define HFP ((PIXEL_CLOCK / (VTOTAL * VREFRESH)) - (HACT + HSW + HBP))

.clock = PIXEL_CLOCK / 1000,
/* Round up the pixel clock a bit (10khz), so that the
* "don't run things faster than the requested clock
* rate" rule of the clk driver doesn't reject the
* divide-by-3 mode due to rounding error.
*/
.clock = PIXEL_CLOCK / 1000 + 10,
.hdisplay = HACT,
.hsync_start = HACT + HFP,
.hsync_end = HACT + HFP + HSW,
Expand Down
12 changes: 6 additions & 6 deletions drivers/gpu/drm/vc4/vc4_plane.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include "vc4_drv.h"
#include "vc4_regs.h"
#include "drm_atomic.h"
#include "drm_atomic_helper.h"
#include "drm_fb_cma_helper.h"
#include "drm_plane_helper.h"
Expand Down Expand Up @@ -769,12 +770,6 @@ vc4_update_plane(struct drm_plane *plane,
if (!plane_state)
goto out;

/* If we're changing the cursor contents, do that in the
* normal vblank-synced atomic path.
*/
if (fb != plane_state->fb)
goto out;

/* No configuring new scaling in the fast path. */
if (crtc_w != plane_state->crtc_w ||
crtc_h != plane_state->crtc_h ||
Expand All @@ -783,6 +778,11 @@ vc4_update_plane(struct drm_plane *plane,
goto out;
}

if (fb != plane_state->fb) {
drm_atomic_set_fb_for_plane(plane->state, fb);
vc4_plane_async_set_fb(plane, fb);
}

/* Set the cursor's position on the screen. This is the
* expected change from the drm_mode_cursor_universal()
* helper.
Expand Down