Skip to content

Commit

Permalink
drm/vc4: hdmi: Move vc4_hdmi_supports_scrambling() around
Browse files Browse the repository at this point in the history
We'll need it earlier in the driver, so let's move it next to the other
scrambling-related helpers.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220829134731.213478-7-maxime@cerno.tech
  • Loading branch information
mripard committed Sep 13, 2022
1 parent 165ba1a commit d0133e7
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions drivers/gpu/drm/vc4/vc4_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,23 @@ static unsigned long long
vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode,
unsigned int bpc, enum vc4_hdmi_output_format fmt);

static bool vc4_hdmi_supports_scrambling(struct drm_encoder *encoder)
{
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
struct drm_display_info *display = &vc4_hdmi->connector.display_info;

lockdep_assert_held(&vc4_hdmi->mutex);

if (!display->is_hdmi)
return false;

if (!display->hdmi.scdc.supported ||
!display->hdmi.scdc.scrambling.supported)
return false;

return true;
}

static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode,
unsigned int bpc,
enum vc4_hdmi_output_format fmt)
Expand Down Expand Up @@ -739,23 +756,6 @@ static void vc4_hdmi_set_infoframes(struct drm_encoder *encoder)
vc4_hdmi_set_hdr_infoframe(encoder);
}

static bool vc4_hdmi_supports_scrambling(struct drm_encoder *encoder)
{
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
struct drm_display_info *display = &vc4_hdmi->connector.display_info;

lockdep_assert_held(&vc4_hdmi->mutex);

if (!display->is_hdmi)
return false;

if (!display->hdmi.scdc.supported ||
!display->hdmi.scdc.scrambling.supported)
return false;

return true;
}

#define SCRAMBLING_POLLING_DELAY_MS 1000

static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder)
Expand Down

0 comments on commit d0133e7

Please sign in to comment.